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

[gnunet]

Author: grothoff
Date: 2010-08-21 23:58:51 +0200 (Sat, 21 Aug 2010)
New Revision: 12704

Modified:
   gnunet/src/transport/gnunet-nat-client.c
   gnunet/src/transport/gnunet-nat-server.c
Log:
stuff

Modified: gnunet/src/transport/gnunet-nat-client.c
===================================================================
--- gnunet/src/transport/gnunet-nat-client.c    2010-08-21 21:54:02 UTC (rev 
12703)
+++ gnunet/src/transport/gnunet-nat-client.c    2010-08-21 21:58:51 UTC (rev 
12704)
@@ -275,7 +275,7 @@
   udp_pkt.src_port = htons(NAT_TRAV_PORT);
   udp_pkt.dst_port = htons(NAT_TRAV_PORT);
   udp_pkt.length = htons (port);
-  udp_pkt.crc = htons (port);
+  udp_pkt.crc = 0;
   memcpy(&packet[off], 
         &udp_pkt,
         sizeof(struct udp_header));

Modified: gnunet/src/transport/gnunet-nat-server.c
===================================================================
--- gnunet/src/transport/gnunet-nat-server.c    2010-08-21 21:54:02 UTC (rev 
12703)
+++ gnunet/src/transport/gnunet-nat-server.c    2010-08-21 21:58:51 UTC (rev 
12704)
@@ -385,6 +385,9 @@
       return;
     }
   /* skip 2nd IP header */
+  memcpy (&ip_pkt,
+         &buf[off], 
+         sizeof (struct ip_header));
   off += sizeof (struct ip_header);
 
   switch (ip_pkt.proto)
@@ -415,7 +418,6 @@
       memcpy (&udp_pkt,
              &buf[off],
              sizeof (struct udp_header));
-      port = ntohs (udp_pkt.crc);
       port = ntohs (udp_pkt.length);
       break;
     default: