fix

diff --git a/src/transport/gnunet-nat-client.c b/src/transport/gnunet-nat-client.c
index 6854b646ca952acd0611c7bcc2c56bf9d81f42e2..da0a8064b05b55747599a02fb8b1c882ebb9848e 100644 (file)
--- 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 0bf39823108db4dfb12169053910bcea57531b0f..bc1130f9b236c60fe173a11f98abfd74344c3cb8 100644 (file)
--- 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);