From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 4 Feb 2010 14:22:53 +0000 (+0000)
Subject: fix
X-Git-Tag: initial-import-from-subversion-38251~22792
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1731b084310f032309e99e2bb35ca906b11f5945;p=oweals%2Fgnunet.git

fix
---

diff --git a/src/transport/gnunet-nat-client.c b/src/transport/gnunet-nat-client.c
index 6854b646c..da0a8064b 100644
--- a/src/transport/gnunet-nat-client.c
+++ b/src/transport/gnunet-nat-client.c
@@ -405,7 +405,7 @@ process_icmp_response (const struct in_addr *my_ip,
     }
   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,
diff --git a/src/transport/gnunet-nat-server.c b/src/transport/gnunet-nat-server.c
index 0bf398231..bc1130f9b 100644
--- a/src/transport/gnunet-nat-server.c
+++ b/src/transport/gnunet-nat-server.c
@@ -267,10 +267,10 @@ send_icmp (const struct in_addr *my_ip,
   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);