Removing all the tests for the bluetooth transport plugin.

[oweals/gnunet.git] / src / transport / plugin_transport_http_server.c

diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 17e39360cf3b5bd43dfa4fdf35d73e3b36874f37..4d879e1661ec642856e9a12175ed2ea4e20138cc 100644 (file)
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -654,35 +654,33 @@ static int
 http_server_plugin_address_suggested (void *cls, const void *addr,
                size_t addrlen)
 {
-  struct HttpAddressWrapper *next;
-  struct HttpAddressWrapper *pos;
-       struct HttpAddress *h_addr;
-       h_addr = (struct HttpAddress *) addr;
-
-  if ((NULL != p->ext_addr) &&
-          GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
-                                          p->ext_addr, p->ext_addr_len)))
-  {
-       /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external hostname */
-       if ((ntohl(h_addr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
-                       (p->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
+       struct HttpAddressWrapper *next;
+       struct HttpAddressWrapper *pos;
+       const struct HttpAddress *haddr = addr;
+
+       if ((NULL != p->ext_addr) &&
+                GNUNET_YES == (http_common_cmp_addresses (addr, addrlen,
+                                                                p->ext_addr, p->ext_addr_len)))
+       {
+               /* Checking HTTP_OPTIONS_VERIFY_CERTIFICATE option for external hostname */
+               if ((ntohl(haddr->options) & HTTP_OPTIONS_VERIFY_CERTIFICATE) !=
+                               (p->options & HTTP_OPTIONS_VERIFY_CERTIFICATE))
                        return GNUNET_NO; /* VERIFY option not set as required! */
-       return GNUNET_OK;
-  }
-
-  next  = p->addr_head;
-  while (NULL != (pos = next))
-  {
-    next = pos->next;
-    if (GNUNET_YES == (http_common_cmp_addresses(addr,
-                                                 addrlen,
-                                                 pos->address,
-                                                 pos->addrlen)))
-      return GNUNET_OK;
-
-  }
-
-  return GNUNET_NO;
+               return GNUNET_OK;
+       }
+
+       next  = p->addr_head;
+       while (NULL != (pos = next))
+       {
+               next = pos->next;
+               if (GNUNET_YES == (http_common_cmp_addresses(addr,
+                                                                                                                                                                                                addrlen,
+                                                                                                                                                                                                pos->address,
+                                                                                                                                                                                                pos->addrlen)))
+                       return GNUNET_OK;
+
+       }
+       return GNUNET_NO;
 }
 
 
@@ -879,7 +877,7 @@ server_disconnect (struct Session *s)
 
 
 /**
- * Tell MHD that the connection should timeout after #to seconds.
+ * Tell MHD that the connection should timeout after @a to seconds.
  *
  * @param plugin our plugin
  * @param s session for which the timeout changes
@@ -1424,7 +1422,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
     response = MHD_create_response_from_data (strlen ("Thank you!"),
                                        "Thank you!",
                                        MHD_NO, MHD_NO);
-    res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+    MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
     MHD_destroy_response (response);
     return MHD_YES;
   }
@@ -1472,7 +1470,7 @@ server_access_cb (void *cls, struct MHD_Connection *mhd_connection,
       response = MHD_create_response_from_data (strlen ("Thank you!"),
                                          "Thank you!",
                                          MHD_NO, MHD_NO);
-      res = MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
+      MHD_queue_response (mhd_connection, MHD_HTTP_OK, response);
       MHD_destroy_response (response);
       return MHD_YES;
     }
@@ -2008,6 +2006,7 @@ static int
 server_start (struct HTTP_Server_Plugin *plugin)
 {
   unsigned int timeout;
+  char *msg;
   GNUNET_assert (NULL != plugin);
 
 #if BUILD_HTTPS
@@ -2031,6 +2030,7 @@ server_start (struct HTTP_Server_Plugin *plugin)
                    "MHD cannot set timeout per connection! Default time out %u sec.\n",
                    timeout);
 #endif
+
   plugin->server_v4 = NULL;
   if (plugin->use_ipv4 == GNUNET_YES)
   {
@@ -2067,7 +2067,17 @@ server_start (struct HTTP_Server_Plugin *plugin)
                                            &server_disconnect_cb, plugin,
                                            MHD_OPTION_EXTERNAL_LOGGER,
                                            server_log, NULL, MHD_OPTION_END);
+    if (plugin->server_v4 == NULL)
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                       "Failed to start %s IPv4 server component on port %u\n",
+                       plugin->name, plugin->port);
+    }
+    else
+       server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
   }
+
+
   plugin->server_v6 = NULL;
   if (plugin->use_ipv6 == GNUNET_YES)
   {
@@ -2104,29 +2114,34 @@ server_start (struct HTTP_Server_Plugin *plugin)
                                            &server_disconnect_cb, plugin,
                                            MHD_OPTION_EXTERNAL_LOGGER,
                                            server_log, NULL, MHD_OPTION_END);
-
-  }
-
-  if ((plugin->use_ipv4 == GNUNET_YES) && (plugin->server_v4 == NULL))
-  {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                     "Failed to start %s IPv4 server component on port %u\n",
-                     plugin->name, plugin->port);
-    return GNUNET_SYSERR;
+    if (plugin->server_v6 == NULL)
+    {
+      GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
+                       "Failed to start %s IPv6 server component on port %u\n",
+                       plugin->name, plugin->port);
+    }
+    else
+       server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
   }
-  server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
 
-  if ((plugin->use_ipv6 == GNUNET_YES) && (plugin->server_v6 == NULL))
+       msg = "No";
+  if ((plugin->server_v6 == NULL) && (plugin->server_v4 == NULL))
   {
     GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                     "Failed to start %s IPv6 server component on port %u\n",
-                     plugin->name, plugin->port);
+                     "%s %s server component started on port %u\n",
+                     msg, plugin->name, plugin->port);
+    sleep (10);
     return GNUNET_SYSERR;
   }
-  server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
+  else if ((plugin->server_v6 != NULL) && (plugin->server_v4 != NULL))
+       msg = "IPv4 and IPv6";
+  else if (plugin->server_v6 != NULL)
+       msg = "IPv6";
+  else if (plugin->server_v4 != NULL)
+       msg = "IPv4";
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
-                   "%s server component started on port %u\n", plugin->name,
-                   plugin->port);
+                   "%s %s server component started on port %u\n",
+                   msg, plugin->name, plugin->port);
   return GNUNET_OK;
 }
 
@@ -3126,7 +3141,6 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
       LIBGNUNET_PLUGIN_TRANSPORT_DONE (api);
       return NULL;
   }
-
   return api;
 }