fixing: assertion failed at transport_api_new.c:1277

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

diff --git a/src/transport/gnunet-nat-server-windows.c b/src/transport/gnunet-nat-server-windows.c
index f882641e9ac06abc74f43de59ef4d8b00007a8bd..8cfad2ff297db6971d11f3c96d8bd070963232a2 100644 (file)
--- a/src/transport/gnunet-nat-server-windows.c
+++ b/src/transport/gnunet-nat-server-windows.c
@@ -65,6 +65,11 @@
  */
 #define DUMMY_IP "192.0.2.86"
 
+/**
+ * Default Port
+ */
+#define NAT_TRAV_PORT 22225
+
 /**
  * TTL to use for our outgoing messages.
  */
@@ -256,7 +261,7 @@ static void
 send_icmp_echo (const struct in_addr *my_ip)
 {
   char packet[sizeof (struct ip_header) + sizeof (struct icmp_echo_header)];
-  struct icmp_ttl_exceeded_header icmp_echo;
+  struct icmp_echo_header icmp_echo;
   struct ip_header ip_pkt;
   struct sockaddr_in dst;
   size_t off;
@@ -355,7 +360,7 @@ process_icmp_response ()
   ssize_t have;
   struct in_addr source_ip;
   struct ip_header ip_pkt;
-  struct icmp_ttl_exceeded_header icmp_pkt;
+  struct icmp_ttl_exceeded_header icmp_ttl;
   struct icmp_echo_header icmp_echo;
   struct udp_header udp_pkt;
   size_t off;
@@ -370,7 +375,6 @@ process_icmp_response ()
               strerror (errno));
       return;
     }
-  have_port = 0;
 #if VERBOSE
   fprintf (stderr,
            "Received message of %u bytes\n",
@@ -528,7 +532,7 @@ make_raw_socket ()
 
 
 /**
- * Create a UDP socket for writinging.
+ * Create a UDP socket for writing.
  *
  * @param my_ip source address (our ip address)
  * @return INVALID_SOCKET on error
@@ -552,7 +556,7 @@ make_udp_socket (const struct in_addr *my_ip)
   addr.sin_addr = *my_ip;
   addr.sin_port = htons (NAT_TRAV_PORT);
   if (0 != bind (ret,
-                &addr,
+                (struct sockaddr *)&addr,
                 sizeof(addr)))
     {
       fprintf (stderr,
@@ -575,6 +579,7 @@ main (int argc,
   WSADATA wsaData;
   unsigned int alt;
 
+  alt = 0;
   if (2 != argc)
     {
       fprintf (stderr,