[GNUnet-SVN] r30821 - gnunet/src/transport

[gnunet]

Author: wachs
Date: 2013-11-20 10:56:22 +0100 (Wed, 20 Nov 2013)
New Revision: 30821

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/plugin_transport_http_common.h
   gnunet/src/transport/plugin_transport_http_server.c
Log:
renaming timeout constants


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2013-11-19 19:47:44 UTC 
(rev 30820)
+++ gnunet/src/transport/plugin_transport_http_client.c 2013-11-20 09:56:22 UTC 
(rev 30821)
@@ -1603,7 +1603,7 @@
   GNUNET_log (TIMEOUT_LOG,
               "Session %p was idle for %s, disconnecting\n",
               s,
-             GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT,
+             GNUNET_STRINGS_relative_time_to_string 
(HTTP_CLIENT_SESSION_TIMEOUT,
                                                      GNUNET_YES));
 
   /* call session destroy function */
@@ -1622,13 +1622,13 @@
 
  GNUNET_assert (NULL != s);
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK == s->timeout_task);
- s->timeout_task =  GNUNET_SCHEDULER_add_delayed (CLIENT_SESSION_TIMEOUT,
+ s->timeout_task =  GNUNET_SCHEDULER_add_delayed (HTTP_CLIENT_SESSION_TIMEOUT,
                                                   &client_session_timeout,
                                                   s);
  GNUNET_log (TIMEOUT_LOG,
              "Timeout for session %p set to %s\n",
              s,
-            GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT,
+            GNUNET_STRINGS_relative_time_to_string 
(HTTP_CLIENT_SESSION_TIMEOUT,
                                                     GNUNET_YES));
 }
 
@@ -1646,13 +1646,13 @@
  GNUNET_assert (GNUNET_SCHEDULER_NO_TASK != s->timeout_task);
 
  GNUNET_SCHEDULER_cancel (s->timeout_task);
- s->timeout_task =  GNUNET_SCHEDULER_add_delayed (CLIENT_SESSION_TIMEOUT,
+ s->timeout_task =  GNUNET_SCHEDULER_add_delayed (HTTP_CLIENT_SESSION_TIMEOUT,
                                                   &client_session_timeout,
                                                   s);
  GNUNET_log (TIMEOUT_LOG,
              "Timeout rescheduled for session %p set to %s\n",
              s,
-            GNUNET_STRINGS_relative_time_to_string (CLIENT_SESSION_TIMEOUT,
+            GNUNET_STRINGS_relative_time_to_string 
(HTTP_CLIENT_SESSION_TIMEOUT,
                                                     GNUNET_YES));
 }
 

Modified: gnunet/src/transport/plugin_transport_http_common.h
===================================================================
--- gnunet/src/transport/plugin_transport_http_common.h 2013-11-19 19:47:44 UTC 
(rev 30820)
+++ gnunet/src/transport/plugin_transport_http_common.h 2013-11-20 09:56:22 UTC 
(rev 30821)
@@ -36,7 +36,7 @@
 #if TESTING
 #define HTTP_SERVER_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 3)
 #define HTTP_CLIENT_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 3)
-#define CLIENT_SESSION_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 7)
+#define HTTP_CLIENT_SESSION_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 7)
 #define SERVER_SESSION_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 7)
 #define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
 
@@ -50,8 +50,8 @@
 
 #define HTTP_SERVER_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 15)
 #define HTTP_CLIENT_NOT_VALIDATED_TIMEOUT GNUNET_TIME_relative_multiply 
(GNUNET_TIME_UNIT_SECONDS, 15)
-#define CLIENT_SESSION_TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
-#define SERVER_SESSION_TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
+#define HTTP_CLIENT_SESSION_TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
+#define HTTP_SERVER_SESSION_TIMEOUT GNUNET_CONSTANTS_IDLE_CONNECTION_TIMEOUT
 #define TIMEOUT_LOG GNUNET_ERROR_TYPE_DEBUG
 
 #endif

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-11-19 19:47:44 UTC 
(rev 30820)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-11-20 09:56:22 UTC 
(rev 30821)
@@ -1190,7 +1190,7 @@
     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);
   }
 
@@ -2013,7 +2013,7 @@
                    "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 +2889,7 @@
   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 +2907,13 @@
 {
  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 +2930,13 @@
  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));
 }