X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Fnat%2Fgnunet-helper-nat-client-windows.c;h=b949374f3445bb6b7026de3f0a6b9db71c70c01b;hb=79266195ab614b5b3e4a168b93fef1cf43d6400a;hp=b28b285840e77040f3748c063bd7dd5fa0c665a8;hpb=ad68ae150f17cf6e0b2c605c9331cf0aedfce1d0;p=oweals%2Fgnunet.git diff --git a/src/nat/gnunet-helper-nat-client-windows.c b/src/nat/gnunet-helper-nat-client-windows.c index b28b28584..b949374f3 100644 --- a/src/nat/gnunet-helper-nat-client-windows.c +++ b/src/nat/gnunet-helper-nat-client-windows.c @@ -168,7 +168,7 @@ struct udp_header }; /** - * Will this binary be run in permissions testing mode? + * Will this binary be run in permissions testing mode? */ static boolean privilege_testing = FALSE; @@ -468,10 +468,12 @@ main (int argc, char *const *argv) struct in_addr target; WSADATA wsaData; unsigned int p; - + if (argc > 1 && 0 != strcmp (argv[1], "-d")){ privilege_testing = TRUE; - fprintf (stderr, "DEBUG: Running binary in privilege testing mode.", argv[0]); + fprintf (stderr, + "%s", + "DEBUG: Running binary in privilege testing mode."); argv++; argc--; } @@ -479,30 +481,39 @@ main (int argc, char *const *argv) if (argc != 4) { fprintf (stderr, - "This program must be started with our IP, the targets external IP, and our port as arguments.\n"); + "%s", + "This program must be started with our IP, the targets external IP, and our port as arguments.\n"); return 1; } if ((1 != inet_pton (AF_INET, argv[1], &external)) || (1 != inet_pton (AF_INET, argv[2], &target))) { - fprintf (stderr, "Error parsing IPv4 address: %s\n", strerror (errno)); + fprintf (stderr, + "Error parsing IPv4 address: %s\n", + strerror (errno)); return 1; } if ((1 != sscanf (argv[3], "%u", &p)) || (0 == p) || (0xFFFF < p)) { - fprintf (stderr, "Error parsing port value `%s'\n", argv[3]); + fprintf (stderr, + "Error parsing port value `%s'\n", + argv[3]); return 1; } port = (uint16_t) p; if (0 != WSAStartup (MAKEWORD (2, 1), &wsaData)) { - fprintf (stderr, "Failed to find Winsock 2.1 or better.\n"); + fprintf (stderr, + "%s", + "Failed to find Winsock 2.1 or better.\n"); return 2; } if (1 != inet_pton (AF_INET, DUMMY_IP, &dummy)) { - fprintf (stderr, "Internal error converting dummy IP to binary.\n"); + fprintf (stderr, + "%s", + "Internal error converting dummy IP to binary.\n"); return 2; } if (-1 == (rawsock = make_raw_socket ())) @@ -511,7 +522,7 @@ main (int argc, char *const *argv) send_icmp (&external, &target); send_icmp_udp (&external, &target); } - closesocket (rawsock); + closesocket (rawsock); WSACleanup (); return 0; }