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

[gnunet]

Author: wachs
Date: 2011-09-16 15:22:46 +0200 (Fri, 16 Sep 2011)
New Revision: 16876

Modified:
   gnunet/src/transport/plugin_transport_http_client.c
   gnunet/src/transport/plugin_transport_http_new.c
Log:


Modified: gnunet/src/transport/plugin_transport_http_client.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_client.c 2011-09-16 12:55:01 UTC 
(rev 16875)
+++ gnunet/src/transport/plugin_transport_http_client.c 2011-09-16 13:22:46 UTC 
(rev 16876)
@@ -183,6 +183,7 @@
                    "Connection to '%s'  %s ended\n", GNUNET_i2s(&s->target), 
http_plugin_address_to_string(plugin, s->addr, s->addrlen));
 #endif
          client_disconnect(s);
+         GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,"Notifying 
about ended session to peer `%s' `%s'\n", GNUNET_i2s (&s->target), GNUNET_a2s 
(s->addr, s->addrlen));
          notify_session_end (plugin, &s->target, s);
        }
     }
@@ -198,9 +199,9 @@
 {
   int res = GNUNET_OK;
   CURLMcode mret;
-  struct Plugin *plugin = plugin;
+  struct Plugin *plugin = s->plugin;
 
-#if DEBUG_HTTP
+#if 0
   GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
                    "Deleting outbound PUT session to peer `%s'\n",
                    GNUNET_i2s (&s->target));
@@ -239,13 +240,13 @@
   }
 
   plugin->cur_connections -= 2;
-
   /* Re-schedule since handles have changed */
-  if (plugin->client_perform_task!= GNUNET_SCHEDULER_NO_TASK)
+  if (plugin->client_perform_task != GNUNET_SCHEDULER_NO_TASK)
   {
     GNUNET_SCHEDULER_cancel (plugin->client_perform_task);
     plugin->client_perform_task = GNUNET_SCHEDULER_NO_TASK;
   }
+
   plugin->client_perform_task = GNUNET_SCHEDULER_add_now(client_run, plugin);
 
   return res;

Modified: gnunet/src/transport/plugin_transport_http_new.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_new.c    2011-09-16 12:55:01 UTC 
(rev 16875)
+++ gnunet/src/transport/plugin_transport_http_new.c    2011-09-16 13:22:46 UTC 
(rev 16876)
@@ -988,9 +988,17 @@
     s = t;
   }
 
+#if DEBUG_HTTP
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                   "Stopping server\n");
+#endif
   /* Stop server */
   server_stop (plugin);
 
+#if DEBUG_HTTP
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+                   "Stopping client\n");
+#endif
   /* Stop client */
   client_stop (plugin);