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

[gnunet]

Author: wachs
Date: 2013-12-18 15:18:46 +0100 (Wed, 18 Dec 2013)
New Revision: 31533

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/plugin_transport_http_server.c
Log:
session time out for http client/server


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2013-12-18 14:12:39 UTC 
(rev 31532)
+++ gnunet/src/transport/plugin_transport_http_client.c 2013-12-18 14:18:46 UTC 
(rev 31533)
@@ -543,7 +543,6 @@
   }
 
   client_schedule (s->plugin, GNUNET_YES);
-  client_reschedule_session_timeout (s);
   return msgbuf_size;
 }
 
@@ -861,8 +860,6 @@
   GNUNET_STATISTICS_update (plugin->env->stats,
                             stat_txt, len, GNUNET_NO);
   GNUNET_free (stat_txt);
-
-  client_reschedule_session_timeout (s);
   return len;
 }
 
@@ -1764,7 +1761,13 @@
                                   const struct GNUNET_PeerIdentity *peer,
                                   struct Session *session)
 {
+  struct HTTP_Client_Plugin *plugin = cls;
 
+  /* lookup if session is really existing */
+  if (GNUNET_YES != client_exist_session (plugin, session))
+    return;
+
+  client_reschedule_session_timeout (session);
 }
 
 /**

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2013-12-18 14:12:39 UTC 
(rev 31532)
+++ gnunet/src/transport/plugin_transport_http_server.c 2013-12-18 14:18:46 UTC 
(rev 31533)
@@ -605,7 +605,6 @@
     server_reschedule (session->plugin,
                        session->server_send->mhd_daemon,
                        GNUNET_YES);
-    server_reschedule_session_timeout (session);
   }
   return bytes_sent;
 }
@@ -905,7 +904,12 @@
                                   const struct GNUNET_PeerIdentity *peer,
                                   struct Session *session)
 {
+  struct HTTP_Server_Plugin *plugin = cls;
 
+  if (GNUNET_NO == server_exist_session (plugin, session))
+      return;
+
+  server_reschedule_session_timeout (session);
 }