-simplify logic
[oweals/gnunet.git] / src / transport / plugin_transport_http_server.c
index abc3bcbb043b5bed47cf1dd5bc50f373f904e8c4..9f2908bda391cf38b2a1e5aaf9c4572d34da49ff 100644 (file)
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2002-2014 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2002-2014 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -232,12 +232,12 @@ struct Session
   /**
    * Session timeout task
    */
-  GNUNET_SCHEDULER_TaskIdentifier timeout_task;
+  struct GNUNET_SCHEDULER_Task * timeout_task;
 
   /**
    * Task to resume MHD handling when receiving is allowed again
    */
-  GNUNET_SCHEDULER_TaskIdentifier recv_wakeup_task;
+  struct GNUNET_SCHEDULER_Task * recv_wakeup_task;
 
   /**
    * Number of bytes waiting for transmission to this peer.
@@ -255,9 +255,9 @@ struct Session
   uint32_t tag;
 
   /**
-   * ATS network type in NBO
+   * ATS network type.
    */
-  uint32_t ats_address_network_type;
+  enum GNUNET_ATS_Network_Type scope;
 
   /**
    * #GNUNET_YES if this session is known to the service.
@@ -374,17 +374,17 @@ struct HTTP_Server_Plugin
   /**
    * MHD IPv4 task
    */
-  GNUNET_SCHEDULER_TaskIdentifier server_v4_task;
+  struct GNUNET_SCHEDULER_Task * server_v4_task;
 
   /**
    * MHD IPv6 task
    */
-  GNUNET_SCHEDULER_TaskIdentifier server_v6_task;
+  struct GNUNET_SCHEDULER_Task * server_v6_task;
 
   /**
    * Task calling transport service about external address
    */
-  GNUNET_SCHEDULER_TaskIdentifier notify_ext_task;
+  struct GNUNET_SCHEDULER_Task * notify_ext_task;
 
   /**
    * Notify transport only about external address
@@ -499,7 +499,7 @@ server_wake_up (void *cls,
 {
   struct Session *s = cls;
 
-  s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+  s->recv_wakeup_task = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -534,16 +534,16 @@ server_delete_session (struct Session *s)
   struct HTTP_Server_Plugin *plugin = s->plugin;
   struct HTTP_Message *msg;
 
-  if (GNUNET_SCHEDULER_NO_TASK != s->timeout_task)
+  if (NULL != s->timeout_task)
   {
     GNUNET_SCHEDULER_cancel (s->timeout_task);
-    s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+    s->timeout_task = NULL;
     s->timeout = GNUNET_TIME_UNIT_ZERO_ABS;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != s->recv_wakeup_task)
+  if (NULL != s->recv_wakeup_task)
   {
     GNUNET_SCHEDULER_cancel (s->recv_wakeup_task);
-    s->recv_wakeup_task = GNUNET_SCHEDULER_NO_TASK;
+    s->recv_wakeup_task = NULL;
     if (NULL != s->server_recv)
       MHD_resume_connection (s->server_recv->mhd_conn);
   }
@@ -604,6 +604,7 @@ server_delete_session (struct Session *s)
     plugin->env->session_end (plugin->env->cls,
                               s->address,
                               s);
+    s->known_to_service = GNUNET_NO;
   }
   if (NULL != s->msg_tk)
   {
@@ -649,7 +650,7 @@ server_session_timeout (void *cls,
   struct Session *s = cls;
   struct GNUNET_TIME_Relative left;
 
-  s->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  s->timeout_task = NULL;
   left = GNUNET_TIME_absolute_get_remaining (s->timeout);
   if (0 != left.rel_value_us)
   {
@@ -680,7 +681,7 @@ server_session_timeout (void *cls,
 static void
 server_reschedule_session_timeout (struct Session *s)
 {
- GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
+ GNUNET_assert (NULL != s->timeout_task);
   s->timeout = GNUNET_TIME_relative_to_absolute (GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT);
 }
 
@@ -917,7 +918,7 @@ server_v4_run (void *cls,
 {
   struct HTTP_Server_Plugin *plugin = cls;
 
-  plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+  plugin->server_v4_task = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   plugin->server_v4_immediately = GNUNET_NO;
@@ -939,7 +940,7 @@ server_v6_run (void *cls,
 {
   struct HTTP_Server_Plugin *plugin = cls;
 
-  plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+  plugin->server_v6_task = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
   plugin->server_v6_immediately = GNUNET_NO;
@@ -957,12 +958,12 @@ server_v6_run (void *cls,
  * @param now schedule now
  * @return gnunet task identifier
  */
-static GNUNET_SCHEDULER_TaskIdentifier
+static struct GNUNET_SCHEDULER_Task *
 server_schedule (struct HTTP_Server_Plugin *plugin,
                  struct MHD_Daemon *daemon_handle,
                  int now)
 {
-  GNUNET_SCHEDULER_TaskIdentifier ret;
+  struct GNUNET_SCHEDULER_Task * ret;
   fd_set rs;
   fd_set ws;
   fd_set es;
@@ -975,9 +976,9 @@ server_schedule (struct HTTP_Server_Plugin *plugin,
   struct GNUNET_TIME_Relative tv;
 
   if (GNUNET_YES == plugin->in_shutdown)
-    return GNUNET_SCHEDULER_NO_TASK;
+    return NULL;
 
-  ret = GNUNET_SCHEDULER_NO_TASK;
+  ret = NULL;
   FD_ZERO (&rs);
   FD_ZERO (&ws);
   FD_ZERO (&es);
@@ -1015,10 +1016,10 @@ server_schedule (struct HTTP_Server_Plugin *plugin,
 
   if (daemon_handle == plugin->server_v4)
   {
-    if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
+    if (plugin->server_v4_task != NULL)
     {
       GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
-      plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+      plugin->server_v4_task = NULL;
     }
 #if 0
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -1032,10 +1033,10 @@ server_schedule (struct HTTP_Server_Plugin *plugin,
   }
   if (daemon_handle == plugin->server_v6)
   {
-    if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
+    if (plugin->server_v6_task != NULL)
     {
       GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
-      plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+      plugin->server_v6_task = NULL;
     }
 #if 0
     LOG (GNUNET_ERROR_TYPE_DEBUG,
@@ -1073,10 +1074,10 @@ server_reschedule (struct HTTP_Server_Plugin *plugin,
     if (GNUNET_YES == now)
       plugin->server_v4_immediately = GNUNET_YES;
 
-    if (plugin->server_v4_task != GNUNET_SCHEDULER_NO_TASK)
+    if (plugin->server_v4_task != NULL)
     {
       GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
-      plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+      plugin->server_v4_task = NULL;
     }
     plugin->server_v4_task = server_schedule (plugin, plugin->server_v4, now);
   }
@@ -1089,10 +1090,10 @@ server_reschedule (struct HTTP_Server_Plugin *plugin,
     if (GNUNET_YES == now)
       plugin->server_v6_immediately = GNUNET_YES;
 
-    if (plugin->server_v6_task != GNUNET_SCHEDULER_NO_TASK)
+    if (plugin->server_v6_task != NULL)
     {
       GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
-      plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+      plugin->server_v6_task = NULL;
     }
     plugin->server_v6_task = server_schedule (plugin, plugin->server_v6, now);
   }
@@ -1362,13 +1363,13 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
   struct ServerRequest *sc = NULL;
   const union MHD_ConnectionInfo *conn_info;
   struct HttpAddress *addr;
-  struct GNUNET_ATS_Information ats;
   struct GNUNET_PeerIdentity target;
   size_t addr_len;
   struct SessionTagContext stc;
   uint32_t options;
   int direction = GNUNET_SYSERR;
   unsigned int to;
+  enum GNUNET_ATS_Network_Type scope;
 
   conn_info = MHD_get_connection_info (mhd_connection,
                                        MHD_CONNECTION_INFO_CLIENT_ADDRESS);
@@ -1423,34 +1424,32 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
                                               conn_info->client_addr,
                                               sizeof (struct sockaddr_in));
       addr_len = http_common_address_get_size (addr);
-      ats = plugin->env->get_address_type (plugin->env->cls,
-                                           conn_info->client_addr,
-                                           sizeof (struct sockaddr_in));
+      scope = plugin->env->get_address_type (plugin->env->cls,
+                                             conn_info->client_addr,
+                                             sizeof (struct sockaddr_in));
       break;
     case (AF_INET6):
       addr = http_common_address_from_socket (plugin->protocol,
                                               conn_info->client_addr,
                                               sizeof (struct sockaddr_in6));
       addr_len = http_common_address_get_size (addr);
-      ats = plugin->env->get_address_type (plugin->env->cls,
-                                           conn_info->client_addr,
-                                           sizeof (struct sockaddr_in6));
+      scope = plugin->env->get_address_type (plugin->env->cls,
+                                             conn_info->client_addr,
+                                             sizeof (struct sockaddr_in6));
       break;
     default:
-       /* external host name */
-      ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-      ats.type = htonl (GNUNET_ATS_NET_WAN);
+      /* external host name */
       return NULL;
     }
     s = GNUNET_new (struct Session);
     s->target = target;
     s->plugin = plugin;
+    s->scope = scope;
     s->address = GNUNET_HELLO_address_allocate (&s->target,
                                                 PLUGIN_NAME,
                                                 addr,
                                                 addr_len,
                                                 GNUNET_HELLO_ADDRESS_INFO_INBOUND);
-    s->ats_address_network_type = ats.value;
     s->next_receive = GNUNET_TIME_UNIT_ZERO_ABS;
     s->tag = stc.tag;
     s->timeout = GNUNET_TIME_relative_to_absolute (HTTP_SERVER_SESSION_TIMEOUT);
@@ -1520,30 +1519,14 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
     notify_session_monitor (plugin,
                             s,
                             GNUNET_TRANSPORT_SS_UP);
-    plugin->env->session_start (NULL,
+    plugin->env->session_start (plugin->env->cls,
                                 s->address,
                                 s,
-                                NULL, 0);
+                                s->scope);
   }
 
-  if ( (NULL == s->server_recv) ||
-       (NULL == s->server_send) )
-  {
-    to = (HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL);
-    MHD_set_connection_option (mhd_connection,
-                              MHD_CONNECTION_OPTION_TIMEOUT, to);
-    server_reschedule (plugin, sc->mhd_daemon, GNUNET_NO);
-  }
-  else
-  {
-    LOG (GNUNET_ERROR_TYPE_DEBUG,
-         "Session %p for peer `%s' fully connected\n",
-         s, GNUNET_i2s (&target));
-    to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
-    server_mhd_connection_timeout (plugin, s, to);
-  }
-  LOG (GNUNET_ERROR_TYPE_DEBUG,
-       "Setting timeout for %p to %u sec.\n", sc, to);
+  to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+  server_mhd_connection_timeout (plugin, s, to);
   return sc;
 }
 
@@ -1656,23 +1639,16 @@ server_receive_mst_cb (void *cls,
 {
   struct Session *s = cls;
   struct HTTP_Server_Plugin *plugin = s->plugin;
-  struct GNUNET_ATS_Information atsi;
   struct GNUNET_TIME_Relative delay;
   char *stat_txt;
 
-  atsi.type = htonl (GNUNET_ATS_NETWORK_TYPE);
-  atsi.value = s->ats_address_network_type;
-  GNUNET_break (s->ats_address_network_type !=
-                ntohl (GNUNET_ATS_NET_UNSPECIFIED));
-
   if (GNUNET_NO == s->known_to_service)
   {
     s->known_to_service = GNUNET_YES;
-    plugin->env->session_start (NULL,
+    plugin->env->session_start (plugin->env->cls,
                                 s->address,
                                 s,
-                                NULL,
-                                0);
+                                s->scope);
     notify_session_monitor (plugin,
                             s,
                             GNUNET_TRANSPORT_SS_UP);
@@ -1681,9 +1657,6 @@ server_receive_mst_cb (void *cls,
                                 s->address,
                                 s,
                                 message);
-  plugin->env->update_address_metrics (plugin->env->cls,
-                                       s->address, s,
-                                       &atsi, 1);
   GNUNET_asprintf (&stat_txt,
                    "# bytes received via %s_server",
                    plugin->protocol);
@@ -1895,7 +1868,7 @@ server_access_cb (void *cls,
             s, sc, GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
         GNUNET_assert(s->server_recv->mhd_conn == mhd_connection);
         MHD_suspend_connection (s->server_recv->mhd_conn);
-        if (GNUNET_SCHEDULER_NO_TASK == s->recv_wakeup_task)
+        if (NULL == s->recv_wakeup_task)
           s->recv_wakeup_task = GNUNET_SCHEDULER_add_delayed (delay,
               &server_wake_up, s);
       }
@@ -2199,11 +2172,13 @@ server_load_certificate (struct HTTP_Server_Plugin *plugin)
  *
  * @param plugin our plugin
  * @param addr listen address to use
+ * @param v6 MHD_NO_FLAG or MHD_USE_IPv6, depending on context
  * @return NULL on error
  */
 static struct MHD_Daemon *
 run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
-                      const struct sockaddr_in *addr)
+                      const struct sockaddr_in *addr,
+                      int v6)
 {
   struct MHD_Daemon *server;
   unsigned int timeout;
@@ -2226,7 +2201,8 @@ run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
 #if BUILD_HTTPS
                              MHD_USE_SSL |
 #endif
-                             MHD_USE_SUSPEND_RESUME,
+                             MHD_USE_SUSPEND_RESUME |
+                             v6,
                              plugin->port,
                              &server_accept_cb, plugin,
                              &server_access_cb, plugin,
@@ -2252,16 +2228,18 @@ run_mhd_start_daemon (struct HTTP_Server_Plugin *plugin,
                              MHD_OPTION_EXTERNAL_LOGGER,
                              &server_log, NULL,
                              MHD_OPTION_END);
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
   if ( (NULL != server) &&
        (0 != (plugin->options & HTTP_OPTIONS_TCP_STEALTH)) )
   {
-    union MHD_DaemonInfo *di = MHD_get_daemon_info (server,
-                                                    MHD_DAEMON_INFO_LISTEN_FD,
-                                                    NULL);
+    const union MHD_DaemonInfo *di;
+
+    di = MHD_get_daemon_info (server,
+                              MHD_DAEMON_INFO_LISTEN_FD,
+                              NULL);
     if ( (0 != setsockopt ((int) di->listen_fd,
                            IPPROTO_TCP,
-                           SO_TCPSTEALTH,
+                           TCP_STEALTH,
                            plugin->env->my_identity,
                            sizeof (struct GNUNET_PeerIdentity))) )
     {
@@ -2304,7 +2282,8 @@ server_start (struct HTTP_Server_Plugin *plugin)
   {
     plugin->server_v4
       = run_mhd_start_daemon (plugin,
-                              (const struct sockaddr_in *) plugin->server_addr_v4);
+                              (const struct sockaddr_in *) plugin->server_addr_v4,
+                              MHD_NO_FLAG);
 
     if (NULL == plugin->server_v4)
     {
@@ -2325,7 +2304,8 @@ server_start (struct HTTP_Server_Plugin *plugin)
   {
     plugin->server_v6
       = run_mhd_start_daemon (plugin,
-                              (const struct sockaddr_in *) plugin->server_addr_v6);
+                              (const struct sockaddr_in *) plugin->server_addr_v6,
+                              MHD_USE_IPv6);
     if (NULL == plugin->server_v6)
     {
       LOG (GNUNET_ERROR_TYPE_ERROR,
@@ -2874,7 +2854,7 @@ server_notify_external_hostname (void *cls,
   unsigned int urlen;
   char *url;
 
-  plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
+  plugin->notify_ext_task = NULL;
   if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
     return;
 
@@ -3168,10 +3148,10 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
        _("Shutting down plugin `%s'\n"),
        plugin->name);
 
-  if (GNUNET_SCHEDULER_NO_TASK != plugin->notify_ext_task)
+  if (NULL != plugin->notify_ext_task)
   {
     GNUNET_SCHEDULER_cancel (plugin->notify_ext_task);
-    plugin->notify_ext_task = GNUNET_SCHEDULER_NO_TASK;
+    plugin->notify_ext_task = NULL;
   }
 
   if (NULL != plugin->ext_addr)
@@ -3206,16 +3186,16 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
     MHD_stop_daemon (plugin->server_v6);
     plugin->server_v6 = NULL;
   }
-  if (GNUNET_SCHEDULER_NO_TASK != plugin->server_v4_task)
+  if (NULL != plugin->server_v4_task)
   {
     GNUNET_SCHEDULER_cancel (plugin->server_v4_task);
-    plugin->server_v4_task = GNUNET_SCHEDULER_NO_TASK;
+    plugin->server_v4_task = NULL;
   }
 
-  if (GNUNET_SCHEDULER_NO_TASK != plugin->server_v6_task)
+  if (NULL != plugin->server_v6_task)
   {
     GNUNET_SCHEDULER_cancel (plugin->server_v6_task);
-    plugin->server_v6_task = GNUNET_SCHEDULER_NO_TASK;
+    plugin->server_v6_task = NULL;
   }
 #if BUILD_HTTPS
   GNUNET_free_non_null (plugin->crypto_init);
@@ -3277,7 +3257,7 @@ static enum GNUNET_ATS_Network_Type
 http_server_plugin_get_network (void *cls,
                                 struct Session *session)
 {
-  return ntohl (session->ats_address_network_type);
+  return session->scope;
 }
 
 
@@ -3302,7 +3282,7 @@ http_server_plugin_update_inbound_delay (void *cls,
        "New inbound delay %s\n",
        GNUNET_STRINGS_relative_time_to_string (delay,
                                                GNUNET_NO));
-  if (GNUNET_SCHEDULER_NO_TASK != session->recv_wakeup_task)
+  if (NULL != session->recv_wakeup_task)
   {
     GNUNET_SCHEDULER_cancel (session->recv_wakeup_task);
     session->recv_wakeup_task
@@ -3427,7 +3407,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
                                             plugin->name,
                                             "TCP_STEALTH"))
   {
-#ifdef SO_TCPSTEALTH
+#ifdef TCP_STEALTH
     plugin->options |= HTTP_OPTIONS_TCP_STEALTH;
 #else
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,