From: Matthias Wachs <wachs@net.in.tum.de>
Date: Mon, 31 May 2010 08:34:08 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: initial-import-from-subversion-38251~21524
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=868d1b6b8294377fa8845648c49980e8671bb969;p=oweals%2Fgnunet.git

---

diff --git a/src/transport/plugin_transport_http.c b/src/transport/plugin_transport_http.c
index d67ac75eb..726a9dbe2 100644
--- a/src/transport/plugin_transport_http.c
+++ b/src/transport/plugin_transport_http.c
@@ -851,6 +851,8 @@ static void send_execute (void *cls,
                                __LINE__,
                                curl_easy_strerror (msg->data.result));
                     /* sending msg failed*/
+                    if ( NULL != cs->transmit_cont)
+                      cs->transmit_cont (NULL,&cs->sender,GNUNET_SYSERR);
                     }
                   else
                     {
@@ -862,6 +864,7 @@ static void send_execute (void *cls,
                     curl_easy_cleanup(cs->curl_handle);
                     cs->curl_handle=NULL;
 
+                    /* send pending messages */
                     if (cs->pending_outbound_msg != NULL)
                       send_select_init (cs);
 
diff --git a/src/transport/test_plugin_transport_http.c b/src/transport/test_plugin_transport_http.c
index de4bd21b2..aa32e3eb1 100644
--- a/src/transport/test_plugin_transport_http.c
+++ b/src/transport/test_plugin_transport_http.c
@@ -299,6 +299,7 @@ run (void *cls,
                   _
                   ("Transport service is lacking key configuration settings.  Exiting.\n"));
       GNUNET_SCHEDULER_shutdown (s);
+      fail = 1;
       return;
     }
   max_connect_per_transport = (uint32_t) tneigh;
@@ -310,6 +311,7 @@ run (void *cls,
                   _
                   ("Transport service could not access hostkey.  Exiting.\n"));
       GNUNET_SCHEDULER_shutdown (s);
+      fail = 1;
       return;
     }
   GNUNET_CRYPTO_rsa_key_get_public (my_private_key, &my_public_key);
@@ -326,15 +328,19 @@ run (void *cls,
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 _("Failed to load transport plugin for http\n"));
-    fail = GNUNET_YES;
+    fail = 1;
     return;
   }
 
   ti_timeout = GNUNET_SCHEDULER_add_delayed (sched, TEST_TIMEOUT, &task_timeout, NULL);
 
+  /* testing plugin functionality */
 
 
+  /* testing finished, shutting down */
+  shutdown_clean();
 
+  fail = 0;
   return;
 }