[GNUnet-SVN] r33068 - gnunet/src/nat

[gnunet]

Author: grothoff
Date: 2014-04-14 18:21:43 +0200 (Mon, 14 Apr 2014)
New Revision: 33068

Modified:
   gnunet/src/nat/gnunet-helper-nat-server.c
Log:
-grab source IP from outer IP header, not from inner IP header

Modified: gnunet/src/nat/gnunet-helper-nat-server.c
===================================================================
--- gnunet/src/nat/gnunet-helper-nat-server.c   2014-04-14 14:46:37 UTC (rev 
33067)
+++ gnunet/src/nat/gnunet-helper-nat-server.c   2014-04-14 16:21:43 UTC (rev 
33068)
@@ -372,6 +372,9 @@
     /* different type than what we want */
     return;
   }
+  /* grab source IP of 1st IP header */
+  source_ip.s_addr = ip_pkt.src_ip;
+
   /* skip 2nd IP header */
   memcpy (&ip_pkt, &buf[off], sizeof (struct ip_header));
   off += sizeof (struct ip_header);
@@ -408,7 +411,6 @@
     return;
   }
 
-  source_ip.s_addr = ip_pkt.src_ip;
   if (port == 0)
     fprintf (stdout, "%s\n",
              inet_ntop (AF_INET, &source_ip, buf, sizeof (buf)));