diff options
author | ng0 <ng0@n0.is> | 2019-09-09 10:04:40 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-09 10:04:40 +0000 |
commit | e01a66487e6338c490fb62cf0abca96fa3e5738d (patch) | |
tree | 61692b65aee2abeb8096c81fe875f1c940d77162 /src | |
parent | c03c7227ba8ac9acc8992c2166a72bea383c09d6 (diff) | |
download | gnunet-e01a66487e6338c490fb62cf0abca96fa3e5738d.tar.gz gnunet-e01a66487e6338c490fb62cf0abca96fa3e5738d.zip |
plibc removal: gns/w32nsp.c: sockets.
Diffstat (limited to 'src')
-rw-r--r-- | src/gns/w32nsp.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gns/w32nsp.c b/src/gns/w32nsp.c index 5178cb822..3de4452f0 100644 --- a/src/gns/w32nsp.c +++ b/src/gns/w32nsp.c | |||
@@ -81,7 +81,7 @@ | |||
81 | static CRITICAL_SECTION records_cs; | 81 | static CRITICAL_SECTION records_cs; |
82 | 82 | ||
83 | struct record { | 83 | struct record { |
84 | SOCKET s; | 84 | _win_socket s; |
85 | DWORD flags; | 85 | DWORD flags; |
86 | uint8_t state; | 86 | uint8_t state; |
87 | char *buf; | 87 | char *buf; |
@@ -112,7 +112,7 @@ resize_records() | |||
112 | } | 112 | } |
113 | 113 | ||
114 | static int | 114 | static int |
115 | add_record(SOCKET s, const wchar_t *name, DWORD flags) | 115 | add_record(_win_socket s, const wchar_t *name, DWORD flags) |
116 | { | 116 | { |
117 | int res = 1; | 117 | int res = 1; |
118 | int i; | 118 | int i; |
@@ -162,14 +162,14 @@ typedef struct _NSP_ROUTINE_XP { | |||
162 | LPNSPIOCTL NSPIoctl; | 162 | LPNSPIOCTL NSPIoctl; |
163 | } NSP_ROUTINE_XP; | 163 | } NSP_ROUTINE_XP; |
164 | 164 | ||
165 | static SOCKET | 165 | static _win_socket |
166 | connect_to_dns_resolver() | 166 | connect_to_dns_resolver() |
167 | { | 167 | { |
168 | struct sockaddr_in addr; | 168 | struct sockaddr_in addr; |
169 | SOCKET r; | 169 | _win_socket r; |
170 | int ret; | 170 | int ret; |
171 | 171 | ||
172 | r = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); | 172 | r = _win_socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); |
173 | if (INVALID_SOCKET == r) | 173 | if (INVALID_SOCKET == r) |
174 | { | 174 | { |
175 | SetLastError(16004); | 175 | SetLastError(16004); |
@@ -180,7 +180,7 @@ connect_to_dns_resolver() | |||
180 | addr.sin_port = htons(5353); /* TCP 5353 is not registered; UDP 5353 is */ | 180 | addr.sin_port = htons(5353); /* TCP 5353 is not registered; UDP 5353 is */ |
181 | addr.sin_addr.s_addr = inet_addr("127.0.0.1"); | 181 | addr.sin_addr.s_addr = inet_addr("127.0.0.1"); |
182 | 182 | ||
183 | ret = connect(r, (struct sockaddr *)&addr, sizeof(addr)); | 183 | ret = _win_connect(r, (struct sockaddr *)&addr, sizeof(addr)); |
184 | if (SOCKET_ERROR == ret) | 184 | if (SOCKET_ERROR == ret) |
185 | { | 185 | { |
186 | DWORD err = GetLastError(); | 186 | DWORD err = GetLastError(); |
@@ -195,7 +195,7 @@ connect_to_dns_resolver() | |||
195 | static int | 195 | static int |
196 | send_name_to_ip_request(LPWSAQUERYSETW lpqsRestrictions, | 196 | send_name_to_ip_request(LPWSAQUERYSETW lpqsRestrictions, |
197 | LPWSASERVICECLASSINFOW lpServiceClassInfo, DWORD dwControlFlags, | 197 | LPWSASERVICECLASSINFOW lpServiceClassInfo, DWORD dwControlFlags, |
198 | SOCKET *resolver) | 198 | _win_socket *resolver) |
199 | { | 199 | { |
200 | struct GNUNET_W32RESOLVER_GetMessage *msg; | 200 | struct GNUNET_W32RESOLVER_GetMessage *msg; |
201 | int af4 = 0; | 201 | int af4 = 0; |
@@ -399,7 +399,7 @@ GNUNET_W32NSP_LookupServiceNext(HANDLE hLookup, DWORD dwControlFlags, | |||
399 | //EnterCriticalSection (&records_cs); | 399 | //EnterCriticalSection (&records_cs); |
400 | for (i = 0; i < records_len; i++) | 400 | for (i = 0; i < records_len; i++) |
401 | { | 401 | { |
402 | if (records[i].s == (SOCKET)hLookup) | 402 | if (records[i].s == (_win_socket)hLookup) |
403 | { | 403 | { |
404 | rec = i; | 404 | rec = i; |
405 | break; | 405 | break; |
@@ -446,13 +446,13 @@ GNUNET_W32NSP_LookupServiceNext(HANDLE hLookup, DWORD dwControlFlags, | |||
446 | #if VERBOSE | 446 | #if VERBOSE |
447 | { | 447 | { |
448 | unsigned long have; | 448 | unsigned long have; |
449 | int ior = ioctlsocket((SOCKET)hLookup, FIONREAD, &have); | 449 | int ior = ioctlsocket((_win_socket)hLookup, FIONREAD, &have); |
450 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a header from %p, %lu bytes available\n", to_receive, hLookup, have); | 450 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a header from %p, %lu bytes available\n", to_receive, hLookup, have); |
451 | } | 451 | } |
452 | #endif | 452 | #endif |
453 | while (to_receive > 0) | 453 | while (to_receive > 0) |
454 | { | 454 | { |
455 | t = recv((SOCKET)hLookup, &((char *)&header)[rc], to_receive, 0); | 455 | t = recv((_win_socket)hLookup, &((char *)&header)[rc], to_receive, 0); |
456 | if (t > 0) | 456 | if (t > 0) |
457 | { | 457 | { |
458 | rc += t; | 458 | rc += t; |
@@ -464,7 +464,7 @@ GNUNET_W32NSP_LookupServiceNext(HANDLE hLookup, DWORD dwControlFlags, | |||
464 | #if VERBOSE | 464 | #if VERBOSE |
465 | { | 465 | { |
466 | unsigned long have; | 466 | unsigned long have; |
467 | int ior = ioctlsocket((SOCKET)hLookup, FIONREAD, &have); | 467 | int ior = ioctlsocket((_win_socket)hLookup, FIONREAD, &have); |
468 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a header from %p, %lu bytes available\n", rc, hLookup, have); | 468 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a header from %p, %lu bytes available\n", rc, hLookup, have); |
469 | } | 469 | } |
470 | #endif | 470 | #endif |
@@ -520,14 +520,14 @@ GNUNET_W32NSP_LookupServiceNext(HANDLE hLookup, DWORD dwControlFlags, | |||
520 | #if VERBOSE | 520 | #if VERBOSE |
521 | { | 521 | { |
522 | unsigned long have; | 522 | unsigned long have; |
523 | int ior = ioctlsocket((SOCKET)hLookup, FIONREAD, &have); | 523 | int ior = ioctlsocket((_win_socket)hLookup, FIONREAD, &have); |
524 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a body from %p, %lu bytes available\n", to_receive, hLookup, have); | 524 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: reading %d bytes as a body from %p, %lu bytes available\n", to_receive, hLookup, have); |
525 | } | 525 | } |
526 | #endif | 526 | #endif |
527 | while (to_receive > 0) | 527 | while (to_receive > 0) |
528 | { | 528 | { |
529 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: recv (%d)\n", to_receive); | 529 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: recv (%d)\n", to_receive); |
530 | t = recv((SOCKET)hLookup, &((char *)&((struct GNUNET_MessageHeader *)buf)[1])[rc], to_receive, 0); | 530 | t = recv((_win_socket)hLookup, &((char *)&((struct GNUNET_MessageHeader *)buf)[1])[rc], to_receive, 0); |
531 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: recv returned %d\n", t); | 531 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: recv returned %d\n", t); |
532 | if (t > 0) | 532 | if (t > 0) |
533 | { | 533 | { |
@@ -540,7 +540,7 @@ GNUNET_W32NSP_LookupServiceNext(HANDLE hLookup, DWORD dwControlFlags, | |||
540 | #if VERBOSE | 540 | #if VERBOSE |
541 | { | 541 | { |
542 | unsigned long have; | 542 | unsigned long have; |
543 | int ior = ioctlsocket((SOCKET)hLookup, FIONREAD, &have); | 543 | int ior = ioctlsocket((_win_socket)hLookup, FIONREAD, &have); |
544 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a body from %p, %lu bytes available\n", rc, hLookup, have); | 544 | DEBUGLOG("GNUNET_W32NSP_LookupServiceNext: read %d bytes as a body from %p, %lu bytes available\n", rc, hLookup, have); |
545 | } | 545 | } |
546 | #endif | 546 | #endif |
@@ -591,7 +591,7 @@ GNUNET_W32NSP_LookupServiceEnd(HANDLE hLookup) | |||
591 | //EnterCriticalSection (&records_cs); | 591 | //EnterCriticalSection (&records_cs); |
592 | for (i = 0; i < records_len; i++) | 592 | for (i = 0; i < records_len; i++) |
593 | { | 593 | { |
594 | if (records[i].s == (SOCKET)hLookup) | 594 | if (records[i].s == (_win_socket)hLookup) |
595 | { | 595 | { |
596 | rec = i; | 596 | rec = i; |
597 | break; | 597 | break; |