diff options
| author | Jose <jose@zeroc.com> | 2019-06-21 10:09:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-21 10:09:24 +0200 |
| commit | 90a33da9a747d3003134462e288cfe928109391c (patch) | |
| tree | 451e77c0913528e5a582ff06d09dd8909f66c377 /csharp/src | |
| parent | Incorrect documentation for C++ generated structs Fixes #350 (diff) | |
| download | ice-90a33da9a747d3003134462e288cfe928109391c.tar.bz2 ice-90a33da9a747d3003134462e288cfe928109391c.tar.xz ice-90a33da9a747d3003134462e288cfe928109391c.zip | |
Remove unsafe code from IceInternal.Network class, Close #354
Diffstat (limited to 'csharp/src')
| -rw-r--r-- | csharp/src/Ice/Network.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/csharp/src/Ice/Network.cs b/csharp/src/Ice/Network.cs index 6f32f4c4ef3..bcd2200ab4b 100644 --- a/csharp/src/Ice/Network.cs +++ b/csharp/src/Ice/Network.cs @@ -526,7 +526,7 @@ namespace IceInternal #if NETSTANDARD2_0 [DllImport("libc", SetLastError = true)] - private static extern int setsockopt(int socket, int level, int name, IntPtr value, uint len); + private static extern int setsockopt(int socket, int level, int name, ref int value, uint len); private const int SOL_SOCKET_MACOS= 0xffff; private const int SO_REUSEADDR_MACOS = 0x0004; @@ -534,7 +534,7 @@ namespace IceInternal private const int SO_REUSEADDR_LINUX = 0x0002; #endif - public static unsafe IPEndPoint doBind(Socket socket, EndPoint addr) + public static IPEndPoint doBind(Socket socket, EndPoint addr) { try { @@ -549,11 +549,11 @@ namespace IceInternal var fd = socket.Handle.ToInt32(); if(AssemblyUtil.isLinux) { - err = setsockopt(fd, SOL_SOCKET_LINUX, SO_REUSEADDR_LINUX, (IntPtr)(&value), sizeof(int)); + err = setsockopt(fd, SOL_SOCKET_LINUX, SO_REUSEADDR_LINUX, ref value, sizeof(int)); } else if(AssemblyUtil.isMacOS) { - err = setsockopt(fd, SOL_SOCKET_MACOS, SO_REUSEADDR_MACOS, (IntPtr)(&value), sizeof(int)); + err = setsockopt(fd, SOL_SOCKET_MACOS, SO_REUSEADDR_MACOS, ref value, sizeof(int)); } if(err != 0) { |