[GNUnet-SVN] r12621 - gnunet/src/transport

[gnunet]

Author: nevans
Date: 2010-08-18 17:25:30 +0200 (Wed, 18 Aug 2010)
New Revision: 12621

Modified:
   gnunet/src/transport/gnunet-nat-server-windows.c
Log:
windoze sucks

Modified: gnunet/src/transport/gnunet-nat-server-windows.c
===================================================================
--- gnunet/src/transport/gnunet-nat-server-windows.c    2010-08-18 15:16:25 UTC 
(rev 12620)
+++ gnunet/src/transport/gnunet-nat-server-windows.c    2010-08-18 15:25:30 UTC 
(rev 12621)
@@ -145,24 +145,17 @@
  * @param cp the address to print
  * @param buf where to write the address result
  */
-static int inet_pton (int af, char *cp, void *buf)
+static int inet_pton (int af, char *cp, struct in_addr *buf)
 {
-  int ret;
-  int ssize;
-
-  ssize = sizeof(struct sockaddr_storage);
-  fprintf (stderr, "in_addr size %d", ssize);
-  fprintf (stderr, "buf size %d", sizeof(buf));
-  ret = WSAStringToAddress (cp, af, NULL, (LPSOCKADDR)buf, &ssize);
-  if (ret != 0)
+  //ret = WSAStringToAddress (cp, af, NULL, (LPSOCKADDR)buf, &ssize);
+  buf->s_addr = inet_addr(cp);
+  if (buf->s_addr != INADDR_NONE)
     {
-
       fprintf(stderr, "Error %d handling address %s", WSAGetLastError(), cp);
+      return 0;
     }
-  if (ret == 0)
-    return 1;
   else
-    return 0;
+    return 1;
 }
 #endif
 
@@ -414,7 +407,7 @@
 int
 main (int argc, char *const *argv)
 {
-  struct sockaddr_storage external;
+  struct in_addr external;
   fd_set rs;
   struct timeval tv;
 #ifndef WIN32
@@ -454,7 +447,7 @@
       return 1;
     }
 
-  if (1 != inet_pton (AF_INET, argv[1], &saddr))
+  if (1 != inet_pton (AF_INET, argv[1], &external))
     {
       fprintf (stderr,
               "Error parsing IPv4 address: %s, error %s\n",