From 719b06a5b79ae504632338a939c7b7739517d25b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 20 Aug 2010 13:59:58 +0000 Subject: [PATCH] more code cleanup --- src/transport/gnunet-nat-client-windows.c | 29 +++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/transport/gnunet-nat-client-windows.c b/src/transport/gnunet-nat-client-windows.c index 0c920cc2a..cc0b9aafe 100644 --- a/src/transport/gnunet-nat-client-windows.c +++ b/src/transport/gnunet-nat-client-windows.c @@ -171,7 +171,7 @@ static SOCKET rawsock; */ static struct in_addr dummy; -static uint32_t port; +static uint16_t port; @@ -224,20 +224,6 @@ calc_checksum(const uint16_t *data, } -static void -make_echo (const struct in_addr *src_ip, - struct icmp_echo_packet *echo, uint32_t num) -{ - memset(echo, 0, sizeof(struct icmp_echo_packet)); - echo->type = ICMP_ECHO; - echo->code = 0; - echo->reserved = 0; - echo->checksum = 0; - echo->data = htons(num); - echo->checksum = htons(calc_checksum((uint16_t*)echo, - sizeof (struct icmp_echo_packet))); -} - /** * Send an ICMP message to the target. * @@ -304,11 +290,11 @@ send_icmp_udp (const struct in_addr *my_ip, off += sizeof(ip_pkt); /* build UDP header */ - udp_pkt.src_port = htons(NAT_TRAV_PORT); /* FIXME: does this port matter? */ + udp_pkt.src_port = htons(NAT_TRAV_PORT); udp_pkt.dst_port = htons(NAT_TRAV_PORT); memset(&udp_pkt.length, 0, sizeof(uint32_t)); - udp_pkt.length = htonl(port); + udp_pkt.length = htons (port); memcpy(&packet[off], &udp_pkt, sizeof(udp_pkt)); off += sizeof(udp_pkt); @@ -406,7 +392,14 @@ send_icmp (const struct in_addr *my_ip, memcpy (&packet[off], &ip_pkt, sizeof (struct ip_packet)); off += sizeof (struct ip_packet); - make_echo (other, &icmp_echo, port); + icmp_echo.type = ICMP_ECHO; + icmp_echo.code = 0; + icmp_echo.reserved = 0; + icmp_echo.checksum = 0; + icmp_echo.data = htons(port); + icmp_echo.checksum = htons(calc_checksum((uint16_t*) &icmp_echo, + sizeof (struct icmp_echo_packet))); + memcpy (&packet[off], &icmp_echo, sizeof(struct icmp_echo_packet)); off += sizeof (struct icmp_echo_packet); -- 2.25.1