diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-08-18 19:04:01 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-08-18 19:04:01 +0000 |
commit | 688e0aceab7ef731030d151cdda32e42fd788ef6 (patch) | |
tree | 46066ec60817a0a7b4c72ff35cb9e50f6ec7fd57 /src/transport/gnunet-nat-client-windows.c | |
parent | 034057672fd3c25828d653434afa428042b4cb00 (diff) | |
download | gnunet-688e0aceab7ef731030d151cdda32e42fd788ef6.tar.gz gnunet-688e0aceab7ef731030d151cdda32e42fd788ef6.zip |
yes, windows still sucks
Diffstat (limited to 'src/transport/gnunet-nat-client-windows.c')
-rw-r--r-- | src/transport/gnunet-nat-client-windows.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/src/transport/gnunet-nat-client-windows.c b/src/transport/gnunet-nat-client-windows.c index cb354bca7..eb28e1192 100644 --- a/src/transport/gnunet-nat-client-windows.c +++ b/src/transport/gnunet-nat-client-windows.c | |||
@@ -390,6 +390,19 @@ send_icmp (const struct in_addr *my_ip, | |||
390 | 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 | memset (&dst, 0, sizeof (dst)); | ||
394 | dst.sin_family = AF_INET; | ||
395 | //dst.sin_addr = *other; | ||
396 | dst.sin_addr = *other; | ||
397 | |||
398 | err = sendto(rawsock, | ||
399 | packet, | ||
400 | off, 0, | ||
401 | (struct sockaddr*)&dst, | ||
402 | sizeof(dst)); /* or sizeof 'struct sockaddr'? */ | ||
403 | |||
404 | fprintf(stderr, "Sent %d bytes\n", err); | ||
405 | |||
393 | /* icmp reply: time exceeded */ | 406 | /* icmp reply: time exceeded */ |
394 | icmp_pkt = (struct icmp_packet*) &packet[off]; | 407 | icmp_pkt = (struct icmp_packet*) &packet[off]; |
395 | memset(icmp_pkt, 0, sizeof(struct icmp_packet)); | 408 | memset(icmp_pkt, 0, sizeof(struct icmp_packet)); |
@@ -423,10 +436,6 @@ send_icmp (const struct in_addr *my_ip, | |||
423 | icmp_pkt->checksum = htons(calc_checksum((uint16_t*)icmp_pkt, | 436 | icmp_pkt->checksum = htons(calc_checksum((uint16_t*)icmp_pkt, |
424 | sizeof (struct icmp_packet) + sizeof(struct ip_packet) + sizeof(struct icmp_echo_packet))); | 437 | sizeof (struct icmp_packet) + sizeof(struct ip_packet) + sizeof(struct icmp_echo_packet))); |
425 | 438 | ||
426 | memset (&dst, 0, sizeof (dst)); | ||
427 | dst.sin_family = AF_INET; | ||
428 | //dst.sin_addr = *other; | ||
429 | dst.sin_addr = *other; | ||
430 | err = sendto(rawsock, | 439 | err = sendto(rawsock, |
431 | packet, | 440 | packet, |
432 | off, 0, | 441 | off, 0, |