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

[gnunet]

Author: grothoff
Date: 2010-02-04 15:22:53 +0100 (Thu, 04 Feb 2010)
New Revision: 10213

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

Modified: gnunet/src/transport/gnunet-nat-client.c
===================================================================
--- gnunet/src/transport/gnunet-nat-client.c    2010-02-04 14:18:21 UTC (rev 
10212)
+++ gnunet/src/transport/gnunet-nat-client.c    2010-02-04 14:22:53 UTC (rev 
10213)
@@ -405,7 +405,7 @@
     }
   else
     {
-      send_icmp (my_ip, &target, reply_magic, my_magic);
+      send_icmp (my_ip, &target, my_magic, reply_magic);
       printf ("%s:%u\n",
              inet_ntop (AF_INET,
                         &sip,

Modified: gnunet/src/transport/gnunet-nat-server.c
===================================================================
--- gnunet/src/transport/gnunet-nat-server.c    2010-02-04 14:18:21 UTC (rev 
10212)
+++ gnunet/src/transport/gnunet-nat-server.c    2010-02-04 14:22:53 UTC (rev 
10213)
@@ -267,10 +267,10 @@
   off += sizeof (ip_pkt);
   
   memset(&udp_pkt, 0, sizeof (udp_pkt));
-  udp_pkt.source_port = htons (target_port_number);
+  udp_pkt.source_port = htons (target_port_number); /* this one will be 
re-written by NAT */
   udp_pkt.dst_port = htons (NAT_TRAV_PORT);
   udp_pkt.mlen_aka_reply_port_magic = htons (source_port_number);
-  udp_pkt.checksum_aka_my_magic = htons (target_port_number);
+  udp_pkt.checksum_aka_my_magic = htons (target_port_number); /* this one 
should be bounced back to me as 'reply_port_magic' */
   memcpy (&packet[off], &udp_pkt, sizeof (udp_pkt));
   off += sizeof (udp_pkt);