diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-08-19 09:59:55 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-08-19 09:59:55 +0000 |
commit | fdf50481cfe8906aad75976c9e16bf8a95ae19b2 (patch) | |
tree | 435ffd4b9e3d9580b6ceb41624ec45f181183882 /src/transport/gnunet-nat-client-windows.c | |
parent | 3f6ca29ce69c4900627686b6b916b93f97826bbf (diff) | |
download | gnunet-fdf50481cfe8906aad75976c9e16bf8a95ae19b2.tar.gz gnunet-fdf50481cfe8906aad75976c9e16bf8a95ae19b2.zip |
workingish?
Diffstat (limited to 'src/transport/gnunet-nat-client-windows.c')
-rw-r--r-- | src/transport/gnunet-nat-client-windows.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/transport/gnunet-nat-client-windows.c b/src/transport/gnunet-nat-client-windows.c index 64ee932fe..1cb31377b 100644 --- a/src/transport/gnunet-nat-client-windows.c +++ b/src/transport/gnunet-nat-client-windows.c | |||
@@ -60,8 +60,8 @@ typedef unsigned int uid_t; | |||
60 | typedef SOCKET Socket; | 60 | typedef SOCKET Socket; |
61 | typedef unsigned short ushort; | 61 | typedef unsigned short ushort; |
62 | #define ICMP_ECHO 8 | 62 | #define ICMP_ECHO 8 |
63 | #define IPDEFTTL 64 /* default ttl, from RFC 1340 */ | 63 | #define IPDEFTTL 64 |
64 | #define ICMP_TIME_EXCEEDED 11 /* Time Exceeded */ | 64 | #define ICMP_TIME_EXCEEDED 11 |
65 | 65 | ||
66 | /** | 66 | /** |
67 | * Must match IP given in the server. | 67 | * Must match IP given in the server. |
@@ -124,7 +124,6 @@ static uint32_t port; | |||
124 | */ | 124 | */ |
125 | static int inet_pton (int af, char *cp, struct in_addr *buf) | 125 | static int inet_pton (int af, char *cp, struct in_addr *buf) |
126 | { | 126 | { |
127 | //ret = WSAStringToAddress (cp, af, NULL, (LPSOCKADDR)buf, &ssize); | ||
128 | buf->s_addr = inet_addr(cp); | 127 | buf->s_addr = inet_addr(cp); |
129 | if (buf->s_addr == INADDR_NONE) | 128 | if (buf->s_addr == INADDR_NONE) |
130 | { | 129 | { |
@@ -306,7 +305,6 @@ send_icmp (const struct in_addr *my_ip, | |||
306 | off += sizeof (ip_pkt); | 305 | off += sizeof (ip_pkt); |
307 | memset (&dst, 0, sizeof (dst)); | 306 | memset (&dst, 0, sizeof (dst)); |
308 | dst.sin_family = AF_INET; | 307 | dst.sin_family = AF_INET; |
309 | //dst.sin_addr = *other; | ||
310 | dst.sin_addr = *other; | 308 | dst.sin_addr = *other; |
311 | 309 | ||
312 | /* icmp reply: time exceeded */ | 310 | /* icmp reply: time exceeded */ |
@@ -391,12 +389,11 @@ main (int argc, char *const *argv) | |||
391 | struct in_addr external; | 389 | struct in_addr external; |
392 | struct in_addr target; | 390 | struct in_addr target; |
393 | 391 | ||
394 | // WSA startup | ||
395 | WSADATA wsaData; | 392 | WSADATA wsaData; |
396 | if (WSAStartup (MAKEWORD (2, 1), &wsaData) != 0) | 393 | if (WSAStartup (MAKEWORD (2, 1), &wsaData) != 0) |
397 | { | 394 | { |
398 | fprintf (stderr, "Failed to find Winsock 2.1 or better.\n"); | 395 | fprintf (stderr, "Failed to find Winsock 2.1 or better.\n"); |
399 | return 4; // ERROR | 396 | return 4; |
400 | } | 397 | } |
401 | 398 | ||
402 | if (-1 == (rawsock = make_raw_socket())) | 399 | if (-1 == (rawsock = make_raw_socket())) |