-doxygen

[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 8e6eff072e1cc715047d61be5fa8673d05fbf7ce..6d706efba044399b6b50a7e587f83a2d0d2621ac 100644 (file)
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -1013,7 +1013,7 @@ server_parse_url (struct HTTP_Server_Plugin *plugin,
       return GNUNET_SYSERR;
   }
   if (GNUNET_OK !=
-      GNUNET_CRYPTO_ecc_public_sign_key_from_string (target_start,
+      GNUNET_CRYPTO_eddsa_public_key_from_string (target_start,
                                                     hash_length,
                                                     &target->public_key))
     {
@@ -1177,7 +1177,6 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
     plugin->env->session_start (NULL, &s->target, PLUGIN_NAME, NULL, 0 ,s, NULL, 0);
   }
 
-#if MHD_VERSION >= 0x00090E00
   if ((NULL == s->server_recv) || (NULL == s->server_send))
   {
     to = (HTTP_SERVER_NOT_VALIDATED_TIMEOUT.rel_value_us / 1000LL / 1000LL);
@@ -1190,13 +1189,12 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
     GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                      "Session %p for peer `%s' fully connected\n",
                      s, GNUNET_i2s (&target));
-    to = (SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
+    to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
     server_mhd_connection_timeout (plugin, s, to);
   }
 
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                    "Setting timeout for %p to %u sec.\n", sc, to);
-#endif
   return sc;
 }
 
@@ -1960,10 +1958,10 @@ server_load_certificate (struct HTTP_Server_Plugin *plugin)
 
   if ((plugin->key == NULL) || (plugin->cert == NULL))
   {
-    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR, plugin->name,
-                     _
-                     ("No usable TLS certificate found and creating one failed!\n"),
-                     "transport-https");
+    GNUNET_log_from (GNUNET_ERROR_TYPE_ERROR,
+                     plugin->name,
+                     _("No usable TLS certificate found and creating one at `%s/%s' failed!\n"),
+                     key_file, cert_file);
     GNUNET_free (key_file);
     GNUNET_free (cert_file);
 
@@ -2013,7 +2011,7 @@ server_start (struct HTTP_Server_Plugin *plugin)
                    "MHD can set timeout per connection! Default time out %u sec.\n",
                    timeout);
 #else
-  timeout = SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
+  timeout = HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
   GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
                    "MHD cannot set timeout per connection! Default time out %u sec.\n",
                    timeout);
@@ -2889,7 +2887,7 @@ server_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc
   GNUNET_log (TIMEOUT_LOG,
               "Session %p was idle for %s, disconnecting\n",
               s,
-             GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+             GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
                                                      GNUNET_YES));
 
   /* call session destroy function */
@@ -2907,13 +2905,13 @@ server_start_session_timeout (struct Session *s)
 {
  GNUNET_assert (NULL != s);
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
- s->timeout_task =  GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT,
+ s->timeout_task =  GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
                                                   &server_session_timeout,
                                                   s);
  GNUNET_log (TIMEOUT_LOG,
              "Timeout for session %p set to %s\n",
              s,
-            GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+            GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
                                                     GNUNET_YES));
 }
 
@@ -2930,13 +2928,13 @@ server_reschedule_session_timeout (struct Session *s)
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
 
  GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task =  GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT,
+ s->timeout_task =  GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
                                                   &server_session_timeout,
                                                   s);
  GNUNET_log (TIMEOUT_LOG,
              "Timeout rescheduled for session %p set to %s\n",
              s,
-            GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT,
+            GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
                                                     GNUNET_YES));
 }