aboutsummaryrefslogtreecommitdiff
path: root/src/transport/gnunet-nat-client-windows.c
diff options
context:
space:
mode:
authorNathan S. Evans <evans@in.tum.de>2010-08-18 16:24:20 +0000
committerNathan S. Evans <evans@in.tum.de>2010-08-18 16:24:20 +0000
commit5001b39903e226b2386e6542c6c01f61ed86e7f3 (patch)
treebe6fd7e821b15a7b6983de61a883530282447011 /src/transport/gnunet-nat-client-windows.c
parent7bdfe16fa3d24c7102d3e3d35165b7539df571d6 (diff)
downloadgnunet-5001b39903e226b2386e6542c6c01f61ed86e7f3.tar.gz
gnunet-5001b39903e226b2386e6542c6c01f61ed86e7f3.zip
windoze suckssss
Diffstat (limited to 'src/transport/gnunet-nat-client-windows.c')
-rw-r--r--src/transport/gnunet-nat-client-windows.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/transport/gnunet-nat-client-windows.c b/src/transport/gnunet-nat-client-windows.c
index 5b35de4da..febe33193 100644
--- a/src/transport/gnunet-nat-client-windows.c
+++ b/src/transport/gnunet-nat-client-windows.c
@@ -201,7 +201,6 @@ static void
201send_icmp_echo (const struct in_addr *my_ip) 201send_icmp_echo (const struct in_addr *my_ip)
202{ 202{
203 struct icmp_packet icmp_echo; 203 struct icmp_packet icmp_echo;
204 struct icmp_echo_packet icmp_echo_pkt;
205 struct sockaddr_in dst; 204 struct sockaddr_in dst;
206 size_t off; 205 size_t off;
207 int err; 206 int err;
@@ -224,9 +223,9 @@ send_icmp_echo (const struct in_addr *my_ip)
224 ip_pkt.checksum = htons(calc_checksum((uint16_t*)&ip_pkt, sizeof (ip_pkt))); 223 ip_pkt.checksum = htons(calc_checksum((uint16_t*)&ip_pkt, sizeof (ip_pkt)));
225 memcpy (packet, &ip_pkt, sizeof (ip_pkt)); 224 memcpy (packet, &ip_pkt, sizeof (ip_pkt));
226 off += sizeof (ip_pkt); 225 off += sizeof (ip_pkt);
227 make_echo (my_ip, &icmp_echo_pkt, port); 226 make_echo2 (my_ip, &icmp_echo);
228 memcpy (&packet[off], &icmp_echo_pkt, sizeof (icmp_echo_pkt)); 227 memcpy (&packet[off], &icmp_echo, sizeof (icmp_echo));
229 off += sizeof (icmp_echo_pkt); 228 off += sizeof (icmp_echo);
230 229
231 memset (&dst, 0, sizeof (dst)); 230 memset (&dst, 0, sizeof (dst));
232 dst.sin_family = AF_INET; 231 dst.sin_family = AF_INET;
@@ -388,6 +387,7 @@ send_icmp (const struct in_addr *my_ip,
388 ip_pkt.src_ip = my_ip->s_addr; 387 ip_pkt.src_ip = my_ip->s_addr;
389 ip_pkt.dst_ip = other->s_addr; 388 ip_pkt.dst_ip = other->s_addr;
390 ip_pkt.checksum = htons(calc_checksum((uint16_t*)&ip_pkt, sizeof (struct ip_packet))); 389 ip_pkt.checksum = htons(calc_checksum((uint16_t*)&ip_pkt, sizeof (struct ip_packet)));
390
391 memcpy (packet, &ip_pkt, sizeof (struct ip_packet)); 391 memcpy (packet, &ip_pkt, sizeof (struct ip_packet));
392 off += sizeof (ip_pkt); 392 off += sizeof (ip_pkt);
393 /* icmp reply: time exceeded */ 393 /* icmp reply: time exceeded */
@@ -526,7 +526,7 @@ main (int argc, char *const *argv)
526 strerror (errno)); 526 strerror (errno));
527 abort (); 527 abort ();
528 } 528 }
529 fprintf(stderr, "Sending icmp echo message.\n"); 529 fprintf(stderr, "Sending icmp message.\n");
530 send_icmp_echo(&target); 530 send_icmp_echo(&target);
531 fprintf(stderr, "Sending icmp message.\n"); 531 fprintf(stderr, "Sending icmp message.\n");
532 send_icmp (&external, 532 send_icmp (&external,