diff options
author | Nathan S. Evans <evans@in.tum.de> | 2010-08-18 15:25:30 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2010-08-18 15:25:30 +0000 |
commit | 9427b72fc86aedbf479294c22ff96774e352634d (patch) | |
tree | 7d46a65626dbcb468659ad3bfc3299ea859a1e03 /src/transport/gnunet-nat-server-windows.c | |
parent | cd3d77c2c8812eeeba3c9aec4b9e47100010e8af (diff) | |
download | gnunet-9427b72fc86aedbf479294c22ff96774e352634d.tar.gz gnunet-9427b72fc86aedbf479294c22ff96774e352634d.zip |
windoze sucks
Diffstat (limited to 'src/transport/gnunet-nat-server-windows.c')
-rw-r--r-- | src/transport/gnunet-nat-server-windows.c | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/src/transport/gnunet-nat-server-windows.c b/src/transport/gnunet-nat-server-windows.c index 0f1fb64f7..a23d9954d 100644 --- a/src/transport/gnunet-nat-server-windows.c +++ b/src/transport/gnunet-nat-server-windows.c | |||
@@ -145,24 +145,17 @@ calc_checksum(const uint16_t *data, | |||
145 | * @param cp the address to print | 145 | * @param cp the address to print |
146 | * @param buf where to write the address result | 146 | * @param buf where to write the address result |
147 | */ | 147 | */ |
148 | static int inet_pton (int af, char *cp, void *buf) | 148 | static int inet_pton (int af, char *cp, struct in_addr *buf) |
149 | { | 149 | { |
150 | int ret; | 150 | //ret = WSAStringToAddress (cp, af, NULL, (LPSOCKADDR)buf, &ssize); |
151 | int ssize; | 151 | buf->s_addr = inet_addr(cp); |
152 | 152 | if (buf->s_addr != INADDR_NONE) | |
153 | ssize = sizeof(struct sockaddr_storage); | ||
154 | fprintf (stderr, "in_addr size %d", ssize); | ||
155 | fprintf (stderr, "buf size %d", sizeof(buf)); | ||
156 | ret = WSAStringToAddress (cp, af, NULL, (LPSOCKADDR)buf, &ssize); | ||
157 | if (ret != 0) | ||
158 | { | 153 | { |
159 | |||
160 | fprintf(stderr, "Error %d handling address %s", WSAGetLastError(), cp); | 154 | fprintf(stderr, "Error %d handling address %s", WSAGetLastError(), cp); |
155 | return 0; | ||
161 | } | 156 | } |
162 | if (ret == 0) | ||
163 | return 1; | ||
164 | else | 157 | else |
165 | return 0; | 158 | return 1; |
166 | } | 159 | } |
167 | #endif | 160 | #endif |
168 | 161 | ||
@@ -414,7 +407,7 @@ make_raw_socket () | |||
414 | int | 407 | int |
415 | main (int argc, char *const *argv) | 408 | main (int argc, char *const *argv) |
416 | { | 409 | { |
417 | struct sockaddr_storage external; | 410 | struct in_addr external; |
418 | fd_set rs; | 411 | fd_set rs; |
419 | struct timeval tv; | 412 | struct timeval tv; |
420 | #ifndef WIN32 | 413 | #ifndef WIN32 |
@@ -454,7 +447,7 @@ main (int argc, char *const *argv) | |||
454 | return 1; | 447 | return 1; |
455 | } | 448 | } |
456 | 449 | ||
457 | if (1 != inet_pton (AF_INET, argv[1], &saddr)) | 450 | if (1 != inet_pton (AF_INET, argv[1], &external)) |
458 | { | 451 | { |
459 | fprintf (stderr, | 452 | fprintf (stderr, |
460 | "Error parsing IPv4 address: %s, error %s\n", | 453 | "Error parsing IPv4 address: %s, error %s\n", |