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

[gnunet]

Author: wachs
Date: 2011-09-26 11:14:11 +0200 (Mon, 26 Sep 2011)
New Revision: 17011

Modified:
   gnunet/src/transport/plugin_transport_http.h
   gnunet/src/transport/plugin_transport_http_new.c
   gnunet/src/transport/plugin_transport_http_server.c
Log:
binding to specific address


Modified: gnunet/src/transport/plugin_transport_http.h
===================================================================
--- gnunet/src/transport/plugin_transport_http.h        2011-09-25 22:16:20 UTC 
(rev 17010)
+++ gnunet/src/transport/plugin_transport_http.h        2011-09-26 09:14:11 UTC 
(rev 17011)
@@ -136,6 +136,9 @@
   struct MHD_Daemon *server_v6;
   GNUNET_SCHEDULER_TaskIdentifier server_v6_task;
 
+  struct sockaddr_in * server_addr_v4;
+  struct sockaddr_in6 * server_addr_v6;
+
   char *crypto_init;
   char *key;
   char *cert;

Modified: gnunet/src/transport/plugin_transport_http_new.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_new.c    2011-09-25 22:16:20 UTC 
(rev 17010)
+++ gnunet/src/transport/plugin_transport_http_new.c    2011-09-26 09:14:11 UTC 
(rev 17011)
@@ -665,25 +665,7 @@
   }
 }
 
-/**
- * Function called by the NAT subsystem suggesting another peer wants
- * to connect to us via connection reversal.  Try to connect back to the
- * given IP.
- *
- * @param cls closure
- * @param addr address to try
- * @param addrlen number of bytes in addr
- */
 static void
-nat_connection_reversal (void *cls, const struct sockaddr *addr,
-                         socklen_t addrlen)
-{
-
-
-
-}
-
-static void
 nat_add_address (void *cls, int add_remove, const struct sockaddr *addr,
                  socklen_t addrlen)
 {
@@ -879,7 +861,7 @@
         GNUNET_NAT_register (plugin->env->cfg, GNUNET_YES, plugin->port,
                              (unsigned int) res,
                              (const struct sockaddr **) addrs, addrlens,
-                             &nat_port_map_callback, &nat_connection_reversal,
+                             &nat_port_map_callback, NULL,
                              plugin);
     while (res > 0)
     {
@@ -894,7 +876,7 @@
   {
     plugin->nat =
         GNUNET_NAT_register (plugin->env->cfg, GNUNET_YES, 0, 0, NULL, NULL,
-                             NULL, &nat_connection_reversal, plugin);
+                             NULL, NULL, plugin);
   }
 }
 
@@ -962,6 +944,7 @@
                      plugin->name);
     res = GNUNET_SYSERR;
   }
+
   /* Reading port number from config file */
   unsigned long long port;
 
@@ -973,9 +956,63 @@
                      _("Port is required! Fix in configuration\n"),
                      plugin->name);
     res = GNUNET_SYSERR;
+    goto fail;
   }
   plugin->port = port;
 
+
+  char * bind4_address = NULL;
+  if ((plugin->ipv4 == GNUNET_YES) && (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, plugin->name,
+                                             "BINDTO", &bind4_address)))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                "Binding %s plugin to specific IPv4 address: `%s'\n",
+                plugin->protocol, bind4_address);
+    plugin->server_addr_v4 = GNUNET_malloc (sizeof (struct sockaddr_in));
+    if (1 != inet_pton (AF_INET, bind4_address, 
&plugin->server_addr_v4->sin_addr))
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                  _("Specific IPv4 address `%s' for plugin %s in configuration 
file is invalid! Binding to all addresses!\n"),
+                  bind4_address, plugin->protocol);
+      GNUNET_free (plugin->server_addr_v4);
+      plugin->server_addr_v4 = NULL;
+    }
+    else
+    {
+      plugin->server_addr_v4->sin_family = AF_INET;
+      plugin->server_addr_v4->sin_port = htons (plugin->port);
+    }
+    GNUNET_free (bind4_address);
+  }
+
+
+  char * bind6_address = NULL;
+  if ((plugin->ipv6 == GNUNET_YES) && (GNUNET_YES ==
+      GNUNET_CONFIGURATION_get_value_string (plugin->env->cfg, plugin->name,
+                                             "BINDTO6", &bind6_address)))
+  {
+    GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                "Binding %s plugin to specific IPv6 address: `%s'\n",
+                plugin->protocol, bind6_address);
+    plugin->server_addr_v6 = GNUNET_malloc (sizeof (struct sockaddr_in6));
+    if (1 != inet_pton (AF_INET6, bind6_address, 
&plugin->server_addr_v6->sin6_addr))
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                  _("Specific IPv6 address `%s' for plugin %s in configuration 
file is invalid! Binding to all addresses!\n"),
+                  bind6_address, plugin->protocol);
+      GNUNET_free (plugin->server_addr_v6);
+      plugin->server_addr_v6 = NULL;
+    }
+    else
+    {
+      plugin->server_addr_v6->sin6_family = AF_INET6;
+      plugin->server_addr_v6->sin6_port = htons (plugin->port);
+    }
+    GNUNET_free (bind6_address);
+  }
+
+
   /* Optional parameters */
   unsigned long long maxneigh;
   if (GNUNET_OK !=
@@ -984,6 +1021,7 @@
     maxneigh = 128;
   plugin->max_connections = maxneigh;
 
+fail:
   return res;
 }
 
@@ -1020,6 +1058,8 @@
   res = configure_plugin (plugin);
   if (res == GNUNET_SYSERR)
   {
+    GNUNET_free_non_null (plugin->server_addr_v4);
+    GNUNET_free_non_null (plugin->server_addr_v6);
     GNUNET_free (plugin);
     GNUNET_free (api);
     return NULL;
@@ -1029,6 +1069,8 @@
   res = client_start (plugin);
   if (res == GNUNET_SYSERR)
   {
+    GNUNET_free_non_null (plugin->server_addr_v4);
+    GNUNET_free_non_null (plugin->server_addr_v6);
     GNUNET_free (plugin);
     GNUNET_free (api);
     return NULL;
@@ -1041,6 +1083,8 @@
     server_stop (plugin);
     client_stop (plugin);
 
+    GNUNET_free_non_null (plugin->server_addr_v4);
+    GNUNET_free_non_null (plugin->server_addr_v6);
     GNUNET_free (plugin);
     GNUNET_free (api);
     return NULL;
@@ -1110,6 +1154,8 @@
                    "Plugin `%s' unloaded\n", plugin->name);
 #endif
 
+  GNUNET_free_non_null (plugin->server_addr_v4);
+  GNUNET_free_non_null (plugin->server_addr_v6);
   GNUNET_free (plugin);
   GNUNET_free (api);
 

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2011-09-25 22:16:20 UTC 
(rev 17010)
+++ gnunet/src/transport/plugin_transport_http_server.c 2011-09-26 09:14:11 UTC 
(rev 17011)
@@ -862,9 +862,9 @@
                                            MHD_NO_FLAG, plugin->port,
                                            &server_accept_cb, plugin,
                                            &server_access_cb, plugin,
-                                           //MHD_OPTION_SOCK_ADDR,
-                                           //(struct sockaddr_in *)
-                                           //plugin->bind4_address,
+                                           MHD_OPTION_SOCK_ADDR,
+                                           (struct sockaddr_in *)
+                                           plugin->server_addr_v4,
                                            MHD_OPTION_CONNECTION_LIMIT,
                                            (unsigned int)
                                            plugin->max_connections,
@@ -901,8 +901,9 @@
                                            MHD_USE_IPv6, plugin->port,
                                            &server_accept_cb, plugin,
                                            &server_access_cb, plugin,
-                                           //MHD_OPTION_SOCK_ADDR,
-                                           //tmp,
+                                           MHD_OPTION_SOCK_ADDR,
+                                           (struct sockaddr_in6 *)
+                                           plugin->server_addr_v6,
                                            MHD_OPTION_CONNECTION_LIMIT,
                                            (unsigned int)
                                            plugin->max_connections,