aboutsummaryrefslogtreecommitdiff
path: root/src/nat
diff options
context:
space:
mode:
authorng0 <ng0@n0.is>2019-09-09 09:55:18 +0000
committerng0 <ng0@n0.is>2019-09-09 09:55:18 +0000
commitc03c7227ba8ac9acc8992c2166a72bea383c09d6 (patch)
tree63d7e420f1d5cea38830a09c591aa851e345c060 /src/nat
parenta4543a4105ca6cea2bd558aed8d2e87981d535ea (diff)
downloadgnunet-c03c7227ba8ac9acc8992c2166a72bea383c09d6.tar.gz
gnunet-c03c7227ba8ac9acc8992c2166a72bea383c09d6.zip
plibc removal: sscanf, win32 socket corrections
Diffstat (limited to 'src/nat')
-rw-r--r--src/nat/gnunet-helper-nat-client-windows.c14
-rw-r--r--src/nat/gnunet-helper-nat-server-windows.c26
2 files changed, 20 insertions, 20 deletions
diff --git a/src/nat/gnunet-helper-nat-client-windows.c b/src/nat/gnunet-helper-nat-client-windows.c
index 2dac5d48e..1be31ae42 100644
--- a/src/nat/gnunet-helper-nat-client-windows.c
+++ b/src/nat/gnunet-helper-nat-client-windows.c
@@ -22,7 +22,7 @@
22 * @file src/nat/gnunet-helper-nat-client-windows.c 22 * @file src/nat/gnunet-helper-nat-client-windows.c
23 * @brief Tool to help bypass NATs using ICMP method; must run as 23 * @brief Tool to help bypass NATs using ICMP method; must run as
24 * administrator on W32 24 * administrator on W32
25 * This code is forx W32. 25 * This code is for W32.
26 * @author Nathan Evans 26 * @author Nathan Evans
27 * 27 *
28 * This program will send ONE ICMP message using RAW sockets 28 * This program will send ONE ICMP message using RAW sockets
@@ -172,7 +172,7 @@ static boolean privilege_testing = FALSE;
172/** 172/**
173 * Socket we use to send our ICMP packets. 173 * Socket we use to send our ICMP packets.
174 */ 174 */
175static SOCKET rawsock; 175static _win_socket rawsock;
176 176
177/** 177/**
178 * Target "dummy" address. 178 * Target "dummy" address.
@@ -426,21 +426,21 @@ send_icmp(const struct in_addr *my_ip, const struct in_addr *other)
426 * 426 *
427 * @return INVALID_SOCKET on error 427 * @return INVALID_SOCKET on error
428 */ 428 */
429static SOCKET 429static _win_socket
430make_raw_socket() 430make_raw_socket()
431{ 431{
432 DWORD bOptVal = TRUE; 432 DWORD bOptVal = TRUE;
433 int bOptLen = sizeof(bOptVal); 433 int bOptLen = sizeof(bOptVal);
434 SOCKET ret; 434 _win_socket ret;
435 435
436 ret = socket(AF_INET, SOCK_RAW, IPPROTO_RAW); 436 ret = _win_socket(AF_INET, SOCK_RAW, IPPROTO_RAW);
437 if (INVALID_SOCKET == ret) 437 if (INVALID_SOCKET == ret)
438 { 438 {
439 fprintf(stderr, "Error opening RAW socket: %s\n", strerror(errno)); 439 fprintf(stderr, "Error opening RAW socket: %s\n", strerror(errno));
440 return INVALID_SOCKET; 440 return INVALID_SOCKET;
441 } 441 }
442 if (0 != 442 if (0 !=
443 setsockopt(ret, SOL_SOCKET, SO_BROADCAST, (char *)&bOptVal, bOptLen)) 443 _win_setsockopt(ret, SOL_SOCKET, SO_BROADCAST, (char *)&bOptVal, bOptLen))
444 { 444 {
445 fprintf(stderr, "Error setting SO_BROADCAST to ON: %s\n", 445 fprintf(stderr, "Error setting SO_BROADCAST to ON: %s\n",
446 strerror(errno)); 446 strerror(errno));
@@ -448,7 +448,7 @@ make_raw_socket()
448 return INVALID_SOCKET; 448 return INVALID_SOCKET;
449 } 449 }
450 450
451 if (0 != setsockopt(ret, IPPROTO_IP, IP_HDRINCL, (char *)&bOptVal, bOptLen)) 451 if (0 != _win_setsockopt(ret, IPPROTO_IP, IP_HDRINCL, (char *)&bOptVal, bOptLen))
452 { 452 {
453 fprintf(stderr, "Error setting IP_HDRINCL to ON: %s\n", strerror(errno)); 453 fprintf(stderr, "Error setting IP_HDRINCL to ON: %s\n", strerror(errno));
454 closesocket(rawsock); 454 closesocket(rawsock);
diff --git a/src/nat/gnunet-helper-nat-server-windows.c b/src/nat/gnunet-helper-nat-server-windows.c
index 13a4d8e6f..688dde165 100644
--- a/src/nat/gnunet-helper-nat-server-windows.c
+++ b/src/nat/gnunet-helper-nat-server-windows.c
@@ -192,17 +192,17 @@ static boolean privilege_testing = FALSE;
192/** 192/**
193 * Socket we use to receive "fake" ICMP replies. 193 * Socket we use to receive "fake" ICMP replies.
194 */ 194 */
195static SOCKET icmpsock; 195static _win_socket icmpsock;
196 196
197/** 197/**
198 * Socket we use to send our ICMP requests. 198 * Socket we use to send our ICMP requests.
199 */ 199 */
200static SOCKET rawsock; 200static _win_socket rawsock;
201 201
202/** 202/**
203 * Socket we use to send our UDP requests. 203 * Socket we use to send our UDP requests.
204 */ 204 */
205static SOCKET udpsock; 205static _win_socket udpsock;
206 206
207/** 207/**
208 * Target "dummy" address. 208 * Target "dummy" address.
@@ -438,12 +438,12 @@ process_icmp_response()
438 * 438 *
439 * @return INVALID_SOCKET on error 439 * @return INVALID_SOCKET on error
440 */ 440 */
441static SOCKET 441static _win_socket
442make_icmp_socket() 442make_icmp_socket()
443{ 443{
444 SOCKET ret; 444 _win_socket ret;
445 445
446 ret = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); 446 ret = _win_socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
447 if (INVALID_SOCKET == ret) 447 if (INVALID_SOCKET == ret)
448 { 448 {
449 fprintf(stderr, "Error opening RAW socket: %s\n", strerror(errno)); 449 fprintf(stderr, "Error opening RAW socket: %s\n", strerror(errno));
@@ -458,13 +458,13 @@ make_icmp_socket()
458 * 458 *
459 * @return INVALID_SOCKET on error 459 * @return INVALID_SOCKET on error
460 */ 460 */
461static SOCKET 461static _win_socket
462make_raw_socket() 462make_raw_socket()
463{ 463{
464 DWORD bOptVal = TRUE; 464 DWORD bOptVal = TRUE;
465 int bOptLen = sizeof(bOptVal); 465 int bOptLen = sizeof(bOptVal);
466 466
467 rawsock = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP); 467 rawsock = _win_socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
468 if (INVALID_SOCKET == rawsock) 468 if (INVALID_SOCKET == rawsock)
469 { 469 {
470 fprintf(stderr, "Error opening RAW socket: %s\n", strerror(errno)); 470 fprintf(stderr, "Error opening RAW socket: %s\n", strerror(errno));
@@ -472,7 +472,7 @@ make_raw_socket()
472 } 472 }
473 473
474 if (0 != 474 if (0 !=
475 setsockopt(rawsock, SOL_SOCKET, SO_BROADCAST, (char *)&bOptVal, 475 _win_setsockopt(rawsock, SOL_SOCKET, SO_BROADCAST, (char *)&bOptVal,
476 bOptLen)) 476 bOptLen))
477 { 477 {
478 fprintf(stderr, "Error setting SO_BROADCAST to ON: %s\n", 478 fprintf(stderr, "Error setting SO_BROADCAST to ON: %s\n",
@@ -481,7 +481,7 @@ make_raw_socket()
481 return INVALID_SOCKET; 481 return INVALID_SOCKET;
482 } 482 }
483 if (0 != 483 if (0 !=
484 setsockopt(rawsock, IPPROTO_IP, IP_HDRINCL, (char *)&bOptVal, bOptLen)) 484 _win_setsockopt(rawsock, IPPROTO_IP, IP_HDRINCL, (char *)&bOptVal, bOptLen))
485 { 485 {
486 fprintf(stderr, "Error setting IP_HDRINCL to ON: %s\n", strerror(errno)); 486 fprintf(stderr, "Error setting IP_HDRINCL to ON: %s\n", strerror(errno));
487 closesocket(rawsock); 487 closesocket(rawsock);
@@ -497,13 +497,13 @@ make_raw_socket()
497 * @param my_ip source address (our ip address) 497 * @param my_ip source address (our ip address)
498 * @return INVALID_SOCKET on error 498 * @return INVALID_SOCKET on error
499 */ 499 */
500static SOCKET 500static _win_socket
501make_udp_socket(const struct in_addr *my_ip) 501make_udp_socket(const struct in_addr *my_ip)
502{ 502{
503 SOCKET ret; 503 _win_socket ret;
504 struct sockaddr_in addr; 504 struct sockaddr_in addr;
505 505
506 ret = socket(AF_INET, SOCK_DGRAM, 0); 506 ret = _win_socket(AF_INET, SOCK_DGRAM, 0);
507 if (INVALID_SOCKET == ret) 507 if (INVALID_SOCKET == ret)
508 { 508 {
509 fprintf(stderr, "Error opening UDP socket: %s\n", strerror(errno)); 509 fprintf(stderr, "Error opening UDP socket: %s\n", strerror(errno));