aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/credential/credential_misc.c2
-rw-r--r--src/credential/plugin_gnsrecord_credential.c4
-rw-r--r--src/nat/gnunet-helper-nat-client-windows.c14
-rw-r--r--src/nat/gnunet-helper-nat-server-windows.c26
-rw-r--r--src/transport/gnunet-transport-wlan-sender.c4
-rw-r--r--src/transport/plugin_transport_wlan.c2
-rw-r--r--src/util/os_installation.c2
-rw-r--r--src/util/os_network.c14
8 files changed, 34 insertions, 34 deletions
diff --git a/src/credential/credential_misc.c b/src/credential/credential_misc.c
index be6d124a6..bc8a28912 100644
--- a/src/credential/credential_misc.c
+++ b/src/credential/credential_misc.c
@@ -77,7 +77,7 @@ GNUNET_CREDENTIAL_credential_from_string(const char* s)
77 struct GNUNET_CRYPTO_EcdsaSignature *sig; 77 struct GNUNET_CRYPTO_EcdsaSignature *sig;
78 struct GNUNET_TIME_Absolute etime_abs; 78 struct GNUNET_TIME_Absolute etime_abs;
79 79
80 if (5 != SSCANF(s, 80 if (5 != sscanf(s,
81 "%52s.%253s -> %52s | %s | %" SCNu64, 81 "%52s.%253s -> %52s | %s | %" SCNu64,
82 issuer_pkey, 82 issuer_pkey,
83 name, 83 name,
diff --git a/src/credential/plugin_gnsrecord_credential.c b/src/credential/plugin_gnsrecord_credential.c
index 9207aa7ad..134153c13 100644
--- a/src/credential/plugin_gnsrecord_credential.c
+++ b/src/credential/plugin_gnsrecord_credential.c
@@ -162,7 +162,7 @@ credential_string_to_value(void *cls, uint32_t type, const char *s,
162 *data_size = sizeof(struct GNUNET_CREDENTIAL_DelegationRecord); 162 *data_size = sizeof(struct GNUNET_CREDENTIAL_DelegationRecord);
163 while (NULL != token) 163 while (NULL != token)
164 { 164 {
165 matches = SSCANF(token, "%s %s", subject_pkey, attr_str); 165 matches = sscanf(token, "%s %s", subject_pkey, attr_str);
166 if (0 == matches) 166 if (0 == matches)
167 { 167 {
168 GNUNET_log(GNUNET_ERROR_TYPE_ERROR, 168 GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
@@ -195,7 +195,7 @@ credential_string_to_value(void *cls, uint32_t type, const char *s,
195 memset(set, 0, sizeof(struct GNUNET_CREDENTIAL_DelegationSet) * entries); 195 memset(set, 0, sizeof(struct GNUNET_CREDENTIAL_DelegationSet) * entries);
196 for (i = 0; i < entries; i++) 196 for (i = 0; i < entries; i++)
197 { 197 {
198 matches = SSCANF(token, "%s %s", subject_pkey, attr_str); 198 matches = sscanf(token, "%s %s", subject_pkey, attr_str);
199 GNUNET_CRYPTO_ecdsa_public_key_from_string( 199 GNUNET_CRYPTO_ecdsa_public_key_from_string(
200 subject_pkey, strlen(subject_pkey), &set[i].subject_key); 200 subject_pkey, strlen(subject_pkey), &set[i].subject_key);
201 if (2 == matches) 201 if (2 == matches)
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));
diff --git a/src/transport/gnunet-transport-wlan-sender.c b/src/transport/gnunet-transport-wlan-sender.c
index c3485ac47..be8bcdda0 100644
--- a/src/transport/gnunet-transport-wlan-sender.c
+++ b/src/transport/gnunet-transport-wlan-sender.c
@@ -123,7 +123,7 @@ main(int argc, char *argv[])
123 "e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n"); 123 "e.g. mon0 11-22-33-44-55-66 12-34-56-78-90-ab\n");
124 return 1; 124 return 1;
125 } 125 }
126 if (6 != SSCANF(argv[2], 126 if (6 != sscanf(argv[2],
127 "%x-%x-%x-%x-%x-%x", 127 "%x-%x-%x-%x-%x-%x",
128 &temp[0], 128 &temp[0],
129 &temp[1], 129 &temp[1],
@@ -139,7 +139,7 @@ main(int argc, char *argv[])
139 } 139 }
140 for (i = 0; i < 6; i++) 140 for (i = 0; i < 6; i++)
141 outmac.mac[i] = temp[i]; 141 outmac.mac[i] = temp[i];
142 if (6 != SSCANF(argv[3], 142 if (6 != sscanf(argv[3],
143 "%x-%x-%x-%x-%x-%x", 143 "%x-%x-%x-%x-%x-%x",
144 &temp[0], 144 &temp[0],
145 &temp[1], 145 &temp[1],
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index a6d44ecb5..6cdf240c3 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -2111,7 +2111,7 @@ wlan_plugin_string_to_address(void *cls,
2111 return GNUNET_SYSERR; 2111 return GNUNET_SYSERR;
2112 } 2112 }
2113 2113
2114 if (8 != SSCANF(addr, 2114 if (8 != sscanf(addr,
2115 "%4s.%u.%X:%X:%X:%X:%X:%X", 2115 "%4s.%u.%X:%X:%X:%X:%X:%X",
2116 plugin, &options, 2116 plugin, &options,
2117 &a[0], &a[1], &a[2], 2117 &a[0], &a[1], &a[2],
diff --git a/src/util/os_installation.c b/src/util/os_installation.c
index 656468707..8d9c6e622 100644
--- a/src/util/os_installation.c
+++ b/src/util/os_installation.c
@@ -156,7 +156,7 @@ get_path_from_proc_maps()
156 return NULL; 156 return NULL;
157 while (NULL != fgets(line, sizeof(line), f)) 157 while (NULL != fgets(line, sizeof(line), f))
158 { 158 {
159 if ((1 == SSCANF(line, 159 if ((1 == sscanf(line,
160 "%*x-%*x %*c%*c%*c%*c %*x %*2x:%*2x %*u%*[ ]%1023s", 160 "%*x-%*x %*c%*c%*c%*c %*x %*2x:%*2x %*u%*[ ]%1023s",
161 dir)) && 161 dir)) &&
162 (NULL != (lgu = strstr(dir, current_pd->libname)))) 162 (NULL != (lgu = strstr(dir, current_pd->libname))))
diff --git a/src/util/os_network.c b/src/util/os_network.c
index 6bf9d1846..4df37b9e5 100644
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -109,7 +109,7 @@ try_ifconfig(GNUNET_OS_NetworkInterfaceProcessor proc,
109 } 109 }
110 if (!isspace(line[0])) 110 if (!isspace(line[0]))
111 { 111 {
112 have_ifc = (1 == SSCANF(line, "%11s", ifc)) ? GNUNET_YES : GNUNET_NO; 112 have_ifc = (1 == sscanf(line, "%11s", ifc)) ? GNUNET_YES : GNUNET_NO;
113 /* would end with ':' on OSX, fix it! */ 113 /* would end with ':' on OSX, fix it! */
114 if (ifc[strlen(ifc) - 1] == ':') 114 if (ifc[strlen(ifc) - 1] == ':')
115 ifc[strlen(ifc) - 1] = '\0'; 115 ifc[strlen(ifc) - 1] = '\0';
@@ -137,12 +137,12 @@ try_ifconfig(GNUNET_OS_NetworkInterfaceProcessor proc,
137 prefixlen = 0; 137 prefixlen = 0;
138 138
139 if ( /* Linux */ 139 if ( /* Linux */
140 (3 == SSCANF(start, "inet addr:%127s Bcast:%127s Mask:%127s", addrstr, bcstr, netmaskstr)) || 140 (3 == sscanf(start, "inet addr:%127s Bcast:%127s Mask:%127s", addrstr, bcstr, netmaskstr)) ||
141 (2 == SSCANF(start, "inet addr:%127s Mask:%127s", addrstr, netmaskstr)) || 141 (2 == sscanf(start, "inet addr:%127s Mask:%127s", addrstr, netmaskstr)) ||
142 (2 == SSCANF(start, "inet6 addr:%127s %d", addrstr, &prefixlen)) || 142 (2 == sscanf(start, "inet6 addr:%127s %d", addrstr, &prefixlen)) ||
143 /* Solaris, OS X */ 143 /* Solaris, OS X */
144 (1 == SSCANF(start, "inet %127s", addrstr)) || 144 (1 == sscanf(start, "inet %127s", addrstr)) ||
145 (1 == SSCANF(start, "inet6 %127s", addrstr))) 145 (1 == sscanf(start, "inet6 %127s", addrstr)))
146 { 146 {
147 /* IPv4 */ 147 /* IPv4 */
148 if (1 == inet_pton(AF_INET, addrstr, &v4)) 148 if (1 == inet_pton(AF_INET, addrstr, &v4))
@@ -294,7 +294,7 @@ try_ip(GNUNET_OS_NetworkInterfaceProcessor proc,
294 memset(ifname, 0, 64); 294 memset(ifname, 0, 64);
295 memset(afstr, 0, 6); 295 memset(afstr, 0, 6);
296 memset(addrstr, 0, 128); 296 memset(addrstr, 0, 128);
297 if (4 != SSCANF(line, 297 if (4 != sscanf(line,
298 "%*u: %63s %5s %127s %6u", 298 "%*u: %63s %5s %127s %6u",
299 ifname, 299 ifname,
300 afstr, 300 afstr,