diff options
author | ng0 <ng0@n0.is> | 2019-09-09 10:19:12 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-09 10:19:12 +0000 |
commit | 0a715a462813496e7a1a03fd072a34eeb3c9e412 (patch) | |
tree | fa48004ea229b826fb44c6fa79370772564a3d2f /src/util | |
parent | e01a66487e6338c490fb62cf0abca96fa3e5738d (diff) | |
download | gnunet-0a715a462813496e7a1a03fd072a34eeb3c9e412.tar.gz gnunet-0a715a462813496e7a1a03fd072a34eeb3c9e412.zip |
plibc: win32 related, socket
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/network.c | 10 | ||||
-rw-r--r-- | src/util/service.c | 2 | ||||
-rw-r--r-- | src/util/win.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/util/network.c b/src/util/network.c index 9eff6b96e..7a1d27f0e 100644 --- a/src/util/network.c +++ b/src/util/network.c | |||
@@ -47,7 +47,7 @@ struct GNUNET_NETWORK_Handle { | |||
47 | #ifndef MINGW | 47 | #ifndef MINGW |
48 | int fd; | 48 | int fd; |
49 | #else | 49 | #else |
50 | SOCKET fd; | 50 | _win_socket fd; |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | /** | 53 | /** |
@@ -1608,7 +1608,7 @@ struct _select_params { | |||
1608 | /** | 1608 | /** |
1609 | * FIXME. | 1609 | * FIXME. |
1610 | */ | 1610 | */ |
1611 | SOCKET wakeup_socket; | 1611 | _win_socket wakeup_socket; |
1612 | 1612 | ||
1613 | /** | 1613 | /** |
1614 | * Set to return value from select. | 1614 | * Set to return value from select. |
@@ -1660,9 +1660,9 @@ static HANDLE select_finished_event; | |||
1660 | 1660 | ||
1661 | static HANDLE select_standby_event; | 1661 | static HANDLE select_standby_event; |
1662 | 1662 | ||
1663 | static SOCKET select_wakeup_socket = -1; | 1663 | static _win_socket select_wakeup_socket = -1; |
1664 | 1664 | ||
1665 | static SOCKET select_send_socket = -1; | 1665 | static _win_socket select_send_socket = -1; |
1666 | 1666 | ||
1667 | static struct timeval select_timeout; | 1667 | static struct timeval select_timeout; |
1668 | 1668 | ||
@@ -1675,7 +1675,7 @@ static struct timeval select_timeout; | |||
1675 | static void | 1675 | static void |
1676 | initialize_select_thread() | 1676 | initialize_select_thread() |
1677 | { | 1677 | { |
1678 | SOCKET select_listening_socket = -1; | 1678 | _win_socket select_listening_socket = -1; |
1679 | struct sockaddr_in s_in; | 1679 | struct sockaddr_in s_in; |
1680 | int alen; | 1680 | int alen; |
1681 | int res; | 1681 | int res; |
diff --git a/src/util/service.c b/src/util/service.c index 089d3ef35..75094e028 100644 --- a/src/util/service.c +++ b/src/util/service.c | |||
@@ -1400,7 +1400,7 @@ receive_sockets_from_parent(struct GNUNET_SERVICE_Handle *sh) | |||
1400 | { | 1400 | { |
1401 | WSAPROTOCOL_INFOA pi; | 1401 | WSAPROTOCOL_INFOA pi; |
1402 | uint64_t size; | 1402 | uint64_t size; |
1403 | SOCKET s; | 1403 | _win_socket s; |
1404 | 1404 | ||
1405 | ret = ReadFile(lsocks_pipe, &size, sizeof(size), &rd, NULL); | 1405 | ret = ReadFile(lsocks_pipe, &size, sizeof(size), &rd, NULL); |
1406 | if ((0 == ret) || (sizeof(size) != rd) || (sizeof(pi) != size)) | 1406 | if ((0 == ret) || (sizeof(size) != rd) || (sizeof(pi) != size)) |
diff --git a/src/util/win.c b/src/util/win.c index 39b276a6c..a2b0d08da 100644 --- a/src/util/win.c +++ b/src/util/win.c | |||
@@ -218,7 +218,7 @@ _IP_ADAPTER_ADDRESSES_DEFINE(_VISTA, _IP_ADAPTER_ADDRESSES_ADD_VISTA) | |||
218 | _IP_ADAPTER_ADDRESSES_DEFINE(_2008_OR_VISTASP1, _IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1) | 218 | _IP_ADAPTER_ADDRESSES_DEFINE(_2008_OR_VISTASP1, _IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1) |
219 | 219 | ||
220 | static int | 220 | static int |
221 | EnumNICs_IPv6_get_ifs_count(SOCKET s) | 221 | EnumNICs_IPv6_get_ifs_count(_win_socket s) |
222 | { | 222 | { |
223 | DWORD dwret = 0, err; | 223 | DWORD dwret = 0, err; |
224 | int iret; | 224 | int iret; |
@@ -234,7 +234,7 @@ EnumNICs_IPv6_get_ifs_count(SOCKET s) | |||
234 | } | 234 | } |
235 | 235 | ||
236 | static int | 236 | static int |
237 | EnumNICs_IPv6_get_ifs(SOCKET s, SOCKET_ADDRESS_LIST *inf, int size) | 237 | EnumNICs_IPv6_get_ifs(_win_socket s, SOCKET_ADDRESS_LIST *inf, int size) |
238 | { | 238 | { |
239 | int iret; | 239 | int iret; |
240 | DWORD dwret = 0; | 240 | DWORD dwret = 0; |
@@ -303,8 +303,8 @@ int | |||
303 | EnumNICs2(INTERFACE_INFO **ifs4, int *ifs4_len, SOCKET_ADDRESS_LIST **ifs6) | 303 | EnumNICs2(INTERFACE_INFO **ifs4, int *ifs4_len, SOCKET_ADDRESS_LIST **ifs6) |
304 | { | 304 | { |
305 | int result = 0; | 305 | int result = 0; |
306 | SOCKET s4; | 306 | _win_socket s4; |
307 | SOCKET s6; | 307 | _win_socket s6; |
308 | int ifs4len = 0; | 308 | int ifs4len = 0; |
309 | int ifs6len = 0; | 309 | int ifs6len = 0; |
310 | INTERFACE_INFO *interfaces4 = NULL; | 310 | INTERFACE_INFO *interfaces4 = NULL; |