[GNUnet-SVN] r13877 - in gnunet/src: nat util

[gnunet]

Author: moon
Date: 2010-12-03 20:07:32 +0100 (Fri, 03 Dec 2010)
New Revision: 13877

Modified:
   gnunet/src/nat/test_nat.c
   gnunet/src/util/os_network.c
Log:
Fix W32 interface listing, and correctly copy addr in test-nat (patch by LRN)


Modified: gnunet/src/nat/test_nat.c
===================================================================
--- gnunet/src/nat/test_nat.c   2010-12-03 18:56:41 UTC (rev 13876)
+++ gnunet/src/nat/test_nat.c   2010-12-03 19:07:32 UTC (rev 13877)
@@ -45,7 +45,7 @@
 
 struct addr_cls
 {
-  const struct sockaddr *addr;
+  struct sockaddr *addr;
   socklen_t addrlen;
 };
 
@@ -76,22 +76,16 @@
 {
   struct addr_cls *data = cls;
 
-  if (addr)
+  if (addr && addrlen > 0)
     {
-      data->addr = addr;
+      if (data->addr)
+        GNUNET_free (data->addr);
+      data->addr = memcpy (GNUNET_malloc (addrlen), addr, addrlen);
       data->addrlen = addrlen;
+      if (isDefault)
+        return GNUNET_SYSERR;
     }
-
-  if (strcmp (name, "eth1") == 0 && addr->sa_family == AF_INET)
-    return GNUNET_SYSERR;
-
   return GNUNET_OK;
-
-
-  if (isDefault && addr)
-    return GNUNET_SYSERR;
-  else
-    return GNUNET_OK;
 }
 
 static void

Modified: gnunet/src/util/os_network.c
===================================================================
--- gnunet/src/util/os_network.c        2010-12-03 18:56:41 UTC (rev 13876)
+++ gnunet/src/util/os_network.c        2010-12-03 19:07:32 UTC (rev 13877)
@@ -153,9 +153,9 @@
               if (GNUNET_OK !=
                   proc (proc_cls,
                         szEntry,
-                        pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC,
+                        pTable->table[dwIfIdx].dwIndex == dwExternalNIC,
                         (const struct sockaddr *) &sa,
-                        0))
+                        sizeof (sa)))
                 break;
             }
         }