LRN: Fix automake deps to allow -j* builds again

[oweals/gnunet.git] / src / util / os_network.c

diff --git a/src/util/os_network.c b/src/util/os_network.c
index 3b2254d58ce858614e4aa15b9233c086c207e7b0..ccf326c05e8a64c962ef7783467ef20c8834a984 100644 (file)
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -64,7 +64,6 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
         {
           char szEntry[1001];
           DWORD dwIP = 0;
-          int iItm;
           PIP_ADAPTER_INFO pAdapterInfo;
           PIP_ADAPTER_INFO pAdapter = NULL;
           DWORD dwRetVal = 0;
@@ -149,14 +148,17 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                 free (pszIfName);
 
               sa.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+             sa.sin_len = (u_char) sizeof (struct sockaddr_in);
+#endif
               sa.sin_addr.S_un.S_addr = dwIP;
 
               if (GNUNET_OK !=
                   proc (proc_cls,
                         szEntry,
-                        pAddrTable->table[dwIfIdx].dwIndex == dwExternalNIC,
-                        &sa,
-                        0))
+                        pTable->table[dwIfIdx].dwIndex == dwExternalNIC,
+                        (const struct sockaddr *) &sa,
+                        sizeof (sa)))
                 break;
             }
         }
@@ -164,7 +166,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
       GlobalFree (pTable);
     }
 
-  return GNUNET_YES;
+  return;
 
 #elif HAVE_GETIFADDRS && HAVE_FREEIFADDRS
 
@@ -257,6 +259,9 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
             {
               memset (&a4, 0, sizeof (a4));
               a4.sin_family = AF_INET;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+             a4.sin_len = (u_char) sizeof (struct sockaddr_in);
+#endif
               a4.sin_addr = v4;
               if (GNUNET_OK !=
                   proc (proc_cls,
@@ -271,8 +276,10 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
             {
               memset (&a6, 0, sizeof (a6));
               a6.sin6_family = AF_INET6;
+#if HAVE_SOCKADDR_IN_SIN_LEN
+             a6.sin6_len = (u_char) sizeof (struct sockaddr_in6);
+#endif
               a6.sin6_addr = v6;
-              fprintf (stderr, "procing %s\n", addrstr);
               if (GNUNET_OK !=
                   proc (proc_cls,
                         ifc,