[GNUnet-SVN] r18193 - in gnunet/src: include nat transport util

[gnunet]

Author: wachs
Date: 2011-11-17 17:39:10 +0100 (Thu, 17 Nov 2011)
New Revision: 18193

Modified:
   gnunet/src/include/gnunet_os_lib.h
   gnunet/src/nat/nat.c
   gnunet/src/nat/test_nat.c
   gnunet/src/transport/plugin_transport_tcp.c
   gnunet/src/util/os_network.c
   gnunet/src/util/test_os_network.c
Log:
api change for network interface iterations to support broadcast address and 
network mask 


Modified: gnunet/src/include/gnunet_os_lib.h
===================================================================
--- gnunet/src/include/gnunet_os_lib.h  2011-11-17 16:20:09 UTC (rev 18192)
+++ gnunet/src/include/gnunet_os_lib.h  2011-11-17 16:39:10 UTC (rev 18193)
@@ -146,13 +146,17 @@
  * @param name name of the interface (can be NULL for unknown)
  * @param isDefault is this presumably the default interface
  * @param addr address of this interface (can be NULL for unknown or 
unassigned)
+ * @param broadcast_addr the broadcast address (can be NULL for unknown or 
unassigned)
+ * @param netmask the network mask (can be NULL for unknown or unassigned))
  * @param addrlen length of the address
  * @return GNUNET_OK to continue iteration, GNUNET_SYSERR to abort
  */
 typedef int (*GNUNET_OS_NetworkInterfaceProcessor) (void *cls, const char 
*name,
                                                     int isDefault,
-                                                    const struct sockaddr *
-                                                    addr, socklen_t addrlen);
+                                                    const struct sockaddr * 
addr,
+                                                    const struct sockaddr * 
broadcast_addr,
+                                                    const struct sockaddr * 
netmask,
+                                                    socklen_t addrlen);
 
 
 /**

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2011-11-17 16:20:09 UTC (rev 18192)
+++ gnunet/src/nat/nat.c        2011-11-17 16:39:10 UTC (rev 18193)
@@ -633,8 +633,12 @@
  * @return GNUNET_OK to continue iterating
  */
 static int
-process_interfaces (void *cls, const char *name, int isDefault,
-                    const struct sockaddr *addr, socklen_t addrlen)
+process_interfaces(void *cls, const char *name,
+                  int isDefault,
+                  const struct sockaddr * addr,
+                  const struct sockaddr * broadcast_addr,
+                  const struct sockaddr * netmask,
+                  socklen_t addrlen)
 {
   struct GNUNET_NAT_Handle *h = cls;
   const struct sockaddr_in *s4;

Modified: gnunet/src/nat/test_nat.c
===================================================================
--- gnunet/src/nat/test_nat.c   2011-11-17 16:20:09 UTC (rev 18192)
+++ gnunet/src/nat/test_nat.c   2011-11-17 16:39:10 UTC (rev 18193)
@@ -97,8 +97,12 @@
  * @return GNUNET_OK to continue iterating
  */
 static int
-process_if (void *cls, const char *name, int isDefault,
-            const struct sockaddr *addr, socklen_t addrlen)
+process_if (void *cls, const char *name,
+            int isDefault,
+            const struct sockaddr * addr,
+            const struct sockaddr * broadcast_addr,
+            const struct sockaddr * netmask,
+            socklen_t addrlen)
 {
   struct addr_cls *data = cls;
 

Modified: gnunet/src/transport/plugin_transport_tcp.c
===================================================================
--- gnunet/src/transport/plugin_transport_tcp.c 2011-11-17 16:20:09 UTC (rev 
18192)
+++ gnunet/src/transport/plugin_transport_tcp.c 2011-11-17 16:39:10 UTC (rev 
18193)
@@ -428,7 +428,7 @@
   void *arg;
   size_t args;
 
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, "tcp",
+  GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, "tcp",
                    "NPMC called with %d for address `%s'\n", add_remove,
                    GNUNET_a2s (addr, addrlen));
   /* convert 'addr' to our internal format */

Modified: gnunet/src/util/os_network.c
===================================================================
--- gnunet/src/util/os_network.c        2011-11-17 16:20:09 UTC (rev 18192)
+++ gnunet/src/util/os_network.c        2011-11-17 16:39:10 UTC (rev 18193)
@@ -157,7 +157,10 @@
         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;
       }
     }
@@ -190,7 +193,10 @@
         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,
+                  NULL,
+                  NULL,
+                  alen))
           break;
       }
     }
@@ -262,7 +268,10 @@
         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;
       }
@@ -277,7 +286,10 @@
         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;
       }

Modified: gnunet/src/util/test_os_network.c
===================================================================
--- gnunet/src/util/test_os_network.c   2011-11-17 16:20:09 UTC (rev 18192)
+++ gnunet/src/util/test_os_network.c   2011-11-17 16:39:10 UTC (rev 18193)
@@ -34,7 +34,11 @@
  * (success).
  */
 static int
-proc (void *cls, const char *name, int isDefault, const struct sockaddr *addr,
+proc (void *cls, const char *name,
+      int isDefault,
+      const struct sockaddr * addr,
+      const struct sockaddr * broadcast_addr,
+      const struct sockaddr * netmask,
       socklen_t addrlen)
 {
   int *ok = cls;