2 files changed, 2 insertions, 1 deletions

diff --git a/src/transport/gnunet-nat-client.c b/src/transport/gnunet-nat-client.c
index c5e000d6a..d5e9492f6 100644
--- a/src/transport/gnunet-nat-client.c
+++ b/src/transport/gnunet-nat-client.c
@@ -274,7 +274,7 @@ send_icmp_udp (const struct in_addr *my_ip,
   /* build UDP header */
   udp_pkt.src_port = htons(NAT_TRAV_PORT);
   udp_pkt.dst_port = htons(NAT_TRAV_PORT);
-  udp_pkt.length = htons (sizeof (struct udp_header));
+  udp_pkt.length = htons (port);
   udp_pkt.crc = htons (port);
   memcpy(&packet[off], 
          &udp_pkt,
diff --git a/src/transport/gnunet-nat-server.c b/src/transport/gnunet-nat-server.c
index 4745f4029..5fac0cc73 100644
--- a/src/transport/gnunet-nat-server.c
+++ b/src/transport/gnunet-nat-server.c
@@ -416,6 +416,7 @@ process_icmp_response ()
               &buf[off],
               sizeof (struct udp_header));
       port = ntohs (udp_pkt.crc);
+      port = ntohs (udp_pkt.length);
       break;
     default:   
       /* different type than what we want */