aboutsummaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_http_server.c
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2013-11-20 09:56:22 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2013-11-20 09:56:22 +0000
commitb8cbf427301f1b5d2c0cfaa2af790c08287cfb9e (patch)
treea706f5b0ccaff4ece1f5eaa0515f374a6ae85dab /src/transport/plugin_transport_http_server.c
parent5ccd7acfa1ed8157feda8ff53dff7d2772f3d1ed (diff)
downloadgnunet-b8cbf427301f1b5d2c0cfaa2af790c08287cfb9e.tar.gz
gnunet-b8cbf427301f1b5d2c0cfaa2af790c08287cfb9e.zip
renaming timeout constants
Diffstat (limited to 'src/transport/plugin_transport_http_server.c')
-rw-r--r--src/transport/plugin_transport_http_server.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/transport/plugin_transport_http_server.c b/src/transport/plugin_transport_http_server.c
index 9e4e54e67..a1c321d1f 100644
--- a/src/transport/plugin_transport_http_server.c
+++ b/src/transport/plugin_transport_http_server.c
@@ -1190,7 +1190,7 @@ server_lookup_connection (struct HTTP_Server_Plugin *plugin,
1190 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name, 1190 GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
1191 "Session %p for peer `%s' fully connected\n", 1191 "Session %p for peer `%s' fully connected\n",
1192 s, GNUNET_i2s (&target)); 1192 s, GNUNET_i2s (&target));
1193 to = (SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL); 1193 to = (HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL);
1194 server_mhd_connection_timeout (plugin, s, to); 1194 server_mhd_connection_timeout (plugin, s, to);
1195 } 1195 }
1196 1196
@@ -2013,7 +2013,7 @@ server_start (struct HTTP_Server_Plugin *plugin)
2013 "MHD can set timeout per connection! Default time out %u sec.\n", 2013 "MHD can set timeout per connection! Default time out %u sec.\n",
2014 timeout); 2014 timeout);
2015#else 2015#else
2016 timeout = SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL; 2016 timeout = HTTP_SERVER_SESSION_TIMEOUT.rel_value_us / 1000LL / 1000LL;
2017 GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name, 2017 GNUNET_log_from (GNUNET_ERROR_TYPE_WARNING, plugin->name,
2018 "MHD cannot set timeout per connection! Default time out %u sec.\n", 2018 "MHD cannot set timeout per connection! Default time out %u sec.\n",
2019 timeout); 2019 timeout);
@@ -2889,7 +2889,7 @@ server_session_timeout (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc
2889 GNUNET_log (TIMEOUT_LOG, 2889 GNUNET_log (TIMEOUT_LOG,
2890 "Session %p was idle for %s, disconnecting\n", 2890 "Session %p was idle for %s, disconnecting\n",
2891 s, 2891 s,
2892 GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT, 2892 GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
2893 GNUNET_YES)); 2893 GNUNET_YES));
2894 2894
2895 /* call session destroy function */ 2895 /* call session destroy function */
@@ -2907,13 +2907,13 @@ server_start_session_timeout (struct Session *s)
2907{ 2907{
2908 GNUNET_assert (NULL != s); 2908 GNUNET_assert (NULL != s);
2909 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task); 2909 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
2910 s->timeout_task = GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT, 2910 s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
2911 &server_session_timeout, 2911 &server_session_timeout,
2912 s); 2912 s);
2913 GNUNET_log (TIMEOUT_LOG, 2913 GNUNET_log (TIMEOUT_LOG,
2914 "Timeout for session %p set to %s\n", 2914 "Timeout for session %p set to %s\n",
2915 s, 2915 s,
2916 GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT, 2916 GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
2917 GNUNET_YES)); 2917 GNUNET_YES));
2918} 2918}
2919 2919
@@ -2930,13 +2930,13 @@ server_reschedule_session_timeout (struct Session *s)
2930 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task); 2930 GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
2931 2931
2932 GNUNET_SCHEDULER_cancel (s->timeout_task); 2932 GNUNET_SCHEDULER_cancel (s->timeout_task);
2933 s->timeout_task = GNUNET_SCHEDULER_add_delayed (SERVER_SESSION_TIMEOUT, 2933 s->timeout_task = GNUNET_SCHEDULER_add_delayed (HTTP_SERVER_SESSION_TIMEOUT,
2934 &server_session_timeout, 2934 &server_session_timeout,
2935 s); 2935 s);
2936 GNUNET_log (TIMEOUT_LOG, 2936 GNUNET_log (TIMEOUT_LOG,
2937 "Timeout rescheduled for session %p set to %s\n", 2937 "Timeout rescheduled for session %p set to %s\n",
2938 s, 2938 s,
2939 GNUNET_STRINGS_relative_time_to_string (SERVER_SESSION_TIMEOUT, 2939 GNUNET_STRINGS_relative_time_to_string (HTTP_SERVER_SESSION_TIMEOUT,
2940 GNUNET_YES)); 2940 GNUNET_YES));
2941} 2941}
2942 2942