checkpoint save

[oweals/gnunet.git] / src / nat / gnunet-helper-nat-server-windows.c

diff --git a/src/nat/gnunet-helper-nat-server-windows.c b/src/nat/gnunet-helper-nat-server-windows.c
index 727a7be67f1866d299e1eaf73af8cfdf5976a1e6..d970ffd70c873133eddcc001f8af741d9460ea01 100644 (file)
--- a/src/nat/gnunet-helper-nat-server-windows.c
+++ b/src/nat/gnunet-helper-nat-server-windows.c
@@ -42,7 +42,7 @@
  */
 #define _GNU_SOURCE
 
-
+#define FD_SETSIZE 1024
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #include <sys/time.h>
@@ -70,6 +70,11 @@
  */
 #define NAT_TRAV_PORT 22225
 
+/**
+ * Must match packet ID used by gnunet-helper-nat-client.c
+ */
+#define PACKET_ID 256
+
 /**
  * TTL to use for our outgoing messages.
  */
@@ -265,15 +270,15 @@ send_icmp_echo (const struct in_addr *my_ip)
   ip_pkt.vers_ihl = 0x45;
   ip_pkt.tos = 0;
   ip_pkt.pkt_len = htons (sizeof (packet));
-  ip_pkt.id = htons (256);
+  ip_pkt.id = htons (PACKET_ID);
   ip_pkt.flags_frag_offset = 0;
   ip_pkt.ttl = IPDEFTTL;
   ip_pkt.proto = IPPROTO_ICMP;
   ip_pkt.checksum = 0;
   ip_pkt.src_ip = my_ip->s_addr;
   ip_pkt.dst_ip = dummy.s_addr;
-  ip_pkt.checksum = htons (calc_checksum ((uint16_t *) & ip_pkt,
-                                          sizeof (struct ip_header)));
+  ip_pkt.checksum =
+      htons (calc_checksum ((uint16_t *) & ip_pkt, sizeof (struct ip_header)));
   memcpy (&packet[off], &ip_pkt, sizeof (struct ip_header));
   off += sizeof (struct ip_header);
 
@@ -281,16 +286,17 @@ send_icmp_echo (const struct in_addr *my_ip)
   icmp_echo.code = 0;
   icmp_echo.reserved = 0;
   icmp_echo.checksum = 0;
-  icmp_echo.checksum = htons (calc_checksum ((uint16_t *) & icmp_echo,
-                                             sizeof (struct icmp_echo_header)));
+  icmp_echo.checksum =
+      htons (calc_checksum
+             ((uint16_t *) & icmp_echo, sizeof (struct icmp_echo_header)));
   memcpy (&packet[off], &icmp_echo, sizeof (struct icmp_echo_header));
   off += sizeof (struct icmp_echo_header);
 
   memset (&dst, 0, sizeof (dst));
   dst.sin_family = AF_INET;
   dst.sin_addr = dummy;
-  err = sendto (rawsock,
-                packet, off, 0, (struct sockaddr *) &dst, sizeof (dst));
+  err =
+      sendto (rawsock, packet, off, 0, (struct sockaddr *) &dst, sizeof (dst));
   if (err < 0)
   {
 #if VERBOSE
@@ -383,9 +389,10 @@ process_icmp_response ()
   switch (ip_pkt.proto)
   {
   case IPPROTO_ICMP:
-    if (have != (sizeof (struct ip_header) * 2 +
-                 sizeof (struct icmp_ttl_exceeded_header) +
-                 sizeof (struct icmp_echo_header)))
+    if (have !=
+        (sizeof (struct ip_header) * 2 +
+         sizeof (struct icmp_ttl_exceeded_header) +
+         sizeof (struct icmp_echo_header)))
     {
       /* malformed */
       return;
@@ -395,9 +402,9 @@ process_icmp_response ()
     port = (uint16_t) ntohl (icmp_echo.reserved);
     break;
   case IPPROTO_UDP:
-    if (have != (sizeof (struct ip_header) * 2 +
-                 sizeof (struct icmp_ttl_exceeded_header) +
-                 sizeof (struct udp_header)))
+    if (have !=
+        (sizeof (struct ip_header) * 2 +
+         sizeof (struct icmp_ttl_exceeded_header) + sizeof (struct udp_header)))
     {
       /* malformed */
       return;
@@ -412,8 +419,8 @@ process_icmp_response ()
   }
 
   ssize = sizeof (buf);
-  WSAAddressToString ((LPSOCKADDR) & source_ip,
-                      sizeof (source_ip), NULL, buf, &ssize);
+  WSAAddressToString ((LPSOCKADDR) & source_ip, sizeof (source_ip), NULL, buf,
+                      &ssize);
   if (port == 0)
     fprintf (stdout, "%s\n", buf);
   else
@@ -460,16 +467,17 @@ make_raw_socket ()
     return INVALID_SOCKET;
   }
 
-  if (0 != setsockopt (rawsock,
-                       SOL_SOCKET, SO_BROADCAST, (char *) &bOptVal, bOptLen))
+  if (0 !=
+      setsockopt (rawsock, SOL_SOCKET, SO_BROADCAST, (char *) &bOptVal,
+                  bOptLen))
   {
-    fprintf (stderr,
-             "Error setting SO_BROADCAST to ON: %s\n", strerror (errno));
+    fprintf (stderr, "Error setting SO_BROADCAST to ON: %s\n",
+             strerror (errno));
     closesocket (rawsock);
     return INVALID_SOCKET;
   }
-  if (0 != setsockopt (rawsock,
-                       IPPROTO_IP, IP_HDRINCL, (char *) &bOptVal, bOptLen))
+  if (0 !=
+      setsockopt (rawsock, IPPROTO_IP, IP_HDRINCL, (char *) &bOptVal, bOptLen))
   {
     fprintf (stderr, "Error setting IP_HDRINCL to ON: %s\n", strerror (errno));
     closesocket (rawsock);
@@ -503,9 +511,8 @@ make_udp_socket (const struct in_addr *my_ip)
   addr.sin_port = htons (NAT_TRAV_PORT);
   if (0 != bind (ret, (struct sockaddr *) &addr, sizeof (addr)))
   {
-    fprintf (stderr,
-             "Error binding UDP socket to port %u: %s\n",
-             NAT_TRAV_PORT, strerror (errno));
+    fprintf (stderr, "Error binding UDP socket to port %u: %s\n", NAT_TRAV_PORT,
+             strerror (errno));
     /* likely problematic, but not certain, try to continue */
   }
   return ret;
@@ -530,9 +537,8 @@ main (int argc, char *const *argv)
   }
   if (1 != inet_pton (AF_INET, argv[1], &external))
   {
-    fprintf (stderr,
-             "Error parsing IPv4 address: %s, error %s\n",
-             argv[1], strerror (errno));
+    fprintf (stderr, "Error parsing IPv4 address: %s, error %s\n", argv[1],
+             strerror (errno));
     return 1;
   }
   if (1 != inet_pton (AF_INET, DUMMY_IP, &dummy))