[GNUnet-SVN] r12644 - gnunet/src/transport

[gnunet]

Author: nevans
Date: 2010-08-18 21:23:06 +0200 (Wed, 18 Aug 2010)
New Revision: 12644

Modified:
   gnunet/src/transport/gnunet-nat-client-windows.c
Log:
yes, windows still sucks

Modified: gnunet/src/transport/gnunet-nat-client-windows.c
===================================================================
--- gnunet/src/transport/gnunet-nat-client-windows.c    2010-08-18 19:16:02 UTC 
(rev 12643)
+++ gnunet/src/transport/gnunet-nat-client-windows.c    2010-08-18 19:23:06 UTC 
(rev 12644)
@@ -375,19 +375,6 @@
 
   /* ip header: send to (known) ip address */
   off = 0;
-
-  dst.sin_family = AF_INET;
-  //dst.sin_addr = *other;
-  dst.sin_addr = dummy;
-
-  err = sendto(rawsock,
-               packet,
-               off - 20, 0,
-               (struct sockaddr*)&dst,
-               sizeof(dst)); /* or sizeof 'struct sockaddr'? */
-
-  fprintf(stderr, "Sent %d bytes (wanted %d)\n", err, off);
-
   memset(&ip_pkt, 0, sizeof(ip_pkt));
   ip_pkt.vers_ihl = 0x45;
   ip_pkt.tos = 0;
@@ -404,8 +391,18 @@
   memcpy (packet, &ip_pkt, sizeof (struct ip_packet));
   off += sizeof (ip_pkt);
   memset (&dst, 0, sizeof (dst));
+  dst.sin_family = AF_INET;
+  //dst.sin_addr = *other;
+  dst.sin_addr = dummy;
 
+  err = sendto(rawsock,
+               packet,
+               off - 20, 0,
+               (struct sockaddr*)&dst,
+               sizeof(dst)); /* or sizeof 'struct sockaddr'? */
 
+  fprintf(stderr, "Sent %d bytes (wanted %d)\n", err, off);
+
   /* icmp reply: time exceeded */
   icmp_pkt = (struct icmp_packet*) &packet[off];
   memset(icmp_pkt, 0, sizeof(struct icmp_packet));
@@ -440,8 +437,8 @@
                                              sizeof (struct icmp_packet) + 
sizeof(struct ip_packet) + sizeof(struct icmp_echo_packet)));
 
   err = sendto(rawsock, 
-              packet, 
-              off, 0, 
+              packet[20],
+              off - 20, 0,
               (struct sockaddr*)&dst, 
               sizeof(dst)); /* or sizeof 'struct sockaddr'? */