add units to time, use configuration time api where appropriate, fixing Mantis #1875

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

diff --git a/src/util/os_network.c b/src/util/os_network.c
index 21376f94c62f6d1ccbc1487a11d30d7bea5d293d..c5afde7d0cf86fa0b1f6f1b5a41e3f44664d85de 100644 (file)
--- a/src/util/os_network.c
+++ b/src/util/os_network.c
@@ -31,6 +31,10 @@
 #include "gnunet_common.h"
 #include "gnunet_os_lib.h"
 
+
+#define LOG(kind,...) GNUNET_log_from (kind, "util", __VA_ARGS__)
+#define LOG_STRERROR_FILE(kind,syscall,filename) GNUNET_log_from_strerror_file (kind, "util", syscall, filename)
+
 /**
  * @brief Enumerate all network interfaces
  *
@@ -135,8 +139,9 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
                 pTable->table[dwIfIdx].dwPhysAddrLen);
 
         snprintf (szEntry, 1000, "%s (%s - %I64u)",
-                  pszIfName ? pszIfName : (char *) pTable->table[dwIfIdx].
-                  bDescr, inet_ntop (AF_INET, &dwIP, dst, INET_ADDRSTRLEN),
+                  pszIfName ? pszIfName : (char *) pTable->
+                  table[dwIfIdx].bDescr, inet_ntop (AF_INET, &dwIP, dst,
+                                                    INET_ADDRSTRLEN),
                   *((unsigned long long *) bPhysAddr));
         szEntry[1000] = 0;
 
@@ -152,7 +157,10 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
         if (GNUNET_OK !=
             proc (proc_cls, szEntry,
                   pTable->table[dwIfIdx].dwIndex == dwExternalNIC,
-                  (const struct sockaddr *) &sa, sizeof (sa)))
+                  (const struct sockaddr *) &sa,
+                  NULL,
+                  NULL,
+                  sizeof (sa)))
           break;
       }
     }
@@ -185,7 +193,10 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
         if (GNUNET_OK !=
             proc (proc_cls, ifa_ptr->ifa_name,
                   0 == strcmp (ifa_ptr->ifa_name, GNUNET_DEFAULT_INTERFACE),
-                  ifa_ptr->ifa_addr, alen))
+                  ifa_ptr->ifa_addr,
+                  ifa_ptr->ifa_broadaddr,
+                  ifa_ptr->ifa_netmask,
+                  alen))
           break;
       }
     }
@@ -212,8 +223,8 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
     f = popen ("ifconfig -a 2> /dev/null", "r");
   if (!f)
   {
-    GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_WARNING |
-                              GNUNET_ERROR_TYPE_BULK, "popen", "ifconfig");
+    LOG_STRERROR_FILE (GNUNET_ERROR_TYPE_WARNING | GNUNET_ERROR_TYPE_BULK,
+                       "popen", "ifconfig");
     return;
   }
 
@@ -257,7 +268,10 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
         a4.sin_addr = v4;
         if (GNUNET_OK !=
             proc (proc_cls, ifc, 0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
-                  (const struct sockaddr *) &a4, sizeof (a4)))
+                  (const struct sockaddr *) &a4,
+                  NULL,
+                  NULL,
+                  sizeof (a4)))
           break;
         continue;
       }
@@ -272,7 +286,10 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc,
         a6.sin6_addr = v6;
         if (GNUNET_OK !=
             proc (proc_cls, ifc, 0 == strcmp (ifc, GNUNET_DEFAULT_INTERFACE),
-                  (const struct sockaddr *) &a6, sizeof (a6)))
+                  (const struct sockaddr *) &a6,
+                  NULL,
+                  NULL,
+                  sizeof (a6)))
           break;
         continue;
       }