allow empty/NULL context message

[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 cc1548f20076ef9de54a85ccd07d4ab6fe744340..c43124c2e86652112a7c896603f0a61704b30c80 100644 (file)
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -374,17 +374,17 @@ struct HTTP_Server_Plugin
   /**
    * MHD IPv4 task
    */
-  struct GNUNET_SCHEDULER_Task * server_v4_task;
+  struct GNUNET_SCHEDULER_Task *server_v4_task;
 
   /**
    * MHD IPv6 task
    */
-  struct GNUNET_SCHEDULER_Task * server_v6_task;
+  struct GNUNET_SCHEDULER_Task *server_v6_task;
 
   /**
    * Task calling transport service about external address
    */
-  struct GNUNET_SCHEDULER_Task * notify_ext_task;
+  struct GNUNET_SCHEDULER_Task *notify_ext_task;
 
   /**
    * Notify transport only about external address
@@ -491,17 +491,13 @@ notify_session_monitor (struct HTTP_Server_Plugin *plugin,
  * Wake up an MHD connection which was suspended
  *
  * @param cls the session
- * @param tc task context
  */
 static void
-server_wake_up (void *cls,
-                const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_wake_up (void *cls)
 {
   struct GNUNET_ATS_Session *s = cls;
 
   s->recv_wakeup_task = NULL;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
   LOG (GNUNET_ERROR_TYPE_DEBUG,
        "Session %p: Waking up PUT handle\n",
        s);
@@ -641,11 +637,9 @@ http_server_plugin_disconnect_session (void *cls,
  * Session was idle, so disconnect it
  *
  * @param cls the session
- * @param tc task context
  */
 static void
-server_session_timeout (void *cls,
-                        const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_session_timeout (void *cls)
 {
   struct GNUNET_ATS_Session *s = cls;
   struct GNUNET_TIME_Relative left;
@@ -910,17 +904,13 @@ http_server_plugin_get_session (void *cls,
  * and schedule the next run.
  *
  * @param cls plugin as closure
- * @param tc task context
  */
 static void
-server_v4_run (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_v4_run (void *cls)
 {
   struct HTTP_Server_Plugin *plugin = cls;
 
   plugin->server_v4_task = NULL;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
   plugin->server_v4_immediately = GNUNET_NO;
   GNUNET_assert (MHD_YES == MHD_run (plugin->server_v4));
   server_reschedule (plugin, plugin->server_v4, GNUNET_NO);
@@ -932,17 +922,13 @@ server_v4_run (void *cls,
  * and schedule the next run.
  *
  * @param cls plugin as closure
- * @param tc task context
  */
 static void
-server_v6_run (void *cls,
-               const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_v6_run (void *cls)
 {
   struct HTTP_Server_Plugin *plugin = cls;
 
   plugin->server_v6_task = NULL;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
   plugin->server_v6_immediately = GNUNET_NO;
   GNUNET_assert (MHD_YES == MHD_run (plugin->server_v6));
   server_reschedule (plugin, plugin->server_v6, GNUNET_NO);
@@ -1871,8 +1857,10 @@ server_access_cb (void *cls,
         GNUNET_assert(s->server_recv->mhd_conn == mhd_connection);
         MHD_suspend_connection (s->server_recv->mhd_conn);
         if (NULL == s->recv_wakeup_task)
-          s->recv_wakeup_task = GNUNET_SCHEDULER_add_delayed (delay,
-              &server_wake_up, s);
+          s->recv_wakeup_task
+           = GNUNET_SCHEDULER_add_delayed (delay,
+                                           &server_wake_up,
+                                           s);
       }
       return MHD_YES;
     }
@@ -2844,11 +2832,9 @@ server_check_ipv6_support (struct HTTP_Server_Plugin *plugin)
  * Notify server about our external hostname
  *
  * @param cls plugin
- * @param tc task context (unused)
  */
 static void
-server_notify_external_hostname (void *cls,
-                                 const struct GNUNET_SCHEDULER_TaskContext *tc)
+server_notify_external_hostname (void *cls)
 {
   struct HTTP_Server_Plugin *plugin = cls;
   struct HttpAddress *ext_addr;
@@ -2857,14 +2843,10 @@ server_notify_external_hostname (void *cls,
   char *url;
 
   plugin->notify_ext_task = NULL;
-  if (0 != (tc->reason & GNUNET_SCHEDULER_REASON_SHUTDOWN))
-    return;
-
-  GNUNET_asprintf(&url,
-                  "%s://%s",
-                  plugin->protocol,
-                  plugin->external_hostname);
-
+  GNUNET_asprintf (&url,
+                  "%s://%s",
+                  plugin->protocol,
+                  plugin->external_hostname);
   urlen = strlen (url) + 1;
   ext_addr = GNUNET_malloc (sizeof (struct HttpAddress) + urlen);
   ext_addr->options = htonl (plugin->options);
@@ -2883,13 +2865,23 @@ server_notify_external_hostname (void *cls,
          "Enabling SSL verification for external hostname address `%s'\n",
          plugin->external_hostname);
   plugin->ext_addr = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-      "https_client", ext_addr, ext_addr_len, GNUNET_HELLO_ADDRESS_INFO_NONE );
-  plugin->env->notify_address (plugin->env->cls, GNUNET_YES, plugin->ext_addr);
+                                                   "https_client",
+                                                   ext_addr,
+                                                   ext_addr_len,
+                                                   GNUNET_HELLO_ADDRESS_INFO_NONE);
+  plugin->env->notify_address (plugin->env->cls,
+                              GNUNET_YES,
+                              plugin->ext_addr);
   GNUNET_free (ext_addr);
 #else
   plugin->ext_addr = GNUNET_HELLO_address_allocate (plugin->env->my_identity,
-      "http_client", ext_addr, ext_addr_len, GNUNET_HELLO_ADDRESS_INFO_NONE );
-  plugin->env->notify_address (plugin->env->cls, GNUNET_YES, plugin->ext_addr);
+                                                   "http_client",
+                                                   ext_addr,
+                                                   ext_addr_len,
+                                                   GNUNET_HELLO_ADDRESS_INFO_NONE);
+  plugin->env->notify_address (plugin->env->cls,
+                              GNUNET_YES,
+                              plugin->ext_addr);
   GNUNET_free (ext_addr);
 #endif
 }