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

[gnunet]

Author: grothoff
Date: 2010-02-04 15:15:59 +0100 (Thu, 04 Feb 2010)
New Revision: 10211

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

Modified: gnunet/src/transport/gnunet-nat-client.c
===================================================================
--- gnunet/src/transport/gnunet-nat-client.c    2010-02-04 11:20:56 UTC (rev 
10210)
+++ gnunet/src/transport/gnunet-nat-client.c    2010-02-04 14:15:59 UTC (rev 
10211)
@@ -121,7 +121,9 @@
 
 static struct in_addr dummy;
  
+static struct in_addr target;
 
+
 /**
  * create a random port number that is not totally
  * unlikely to be chosen by the nat box.
@@ -403,6 +405,7 @@
     }
   else
     {
+      send_icmp (my_ip, &target, reply_magic, my_magic);
       printf ("%s:%u\n",
              inet_ntop (AF_INET,
                         &sip,
@@ -479,7 +482,6 @@
 int
 main (int argc, char *const *argv)
 {
-  struct in_addr target;
   struct in_addr external;
   unsigned int i;  
   unsigned int pos;

Modified: gnunet/src/transport/gnunet-nat-server.c
===================================================================
--- gnunet/src/transport/gnunet-nat-server.c    2010-02-04 11:20:56 UTC (rev 
10210)
+++ gnunet/src/transport/gnunet-nat-server.c    2010-02-04 14:15:59 UTC (rev 
10211)
@@ -376,8 +376,8 @@
       return;
     }
   memcpy(&sip, &ip_pkt.src_ip, sizeof (sip));
-  my_magic = ntohs (udp_pkt.checksum_aka_my_magic);
-  reply_magic = ntohs (udp_pkt.mlen_aka_reply_port_magic);
+  reply_magic = ntohs (udp_pkt.checksum_aka_my_magic);
+  my_magic = ntohs (udp_pkt.mlen_aka_reply_port_magic);
   fprintf (stderr,
           "Received ICMP from `%s' with hints %u and %u\n",
           inet_ntop (AF_INET,