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

[gnunet]

Author: wachs
Date: 2010-08-16 13:05:20 +0200 (Mon, 16 Aug 2010)
New Revision: 12570

Modified:
   gnunet/src/transport/plugin_transport_http.c
   gnunet/src/transport/plugin_transport_https.c
Log:
Fixing bugs

Modified: gnunet/src/transport/plugin_transport_http.c
===================================================================
--- gnunet/src/transport/plugin_transport_http.c        2010-08-16 09:36:27 UTC 
(rev 12569)
+++ gnunet/src/transport/plugin_transport_http.c        2010-08-16 11:05:20 UTC 
(rev 12570)
@@ -485,8 +485,8 @@
     {
       msg->transmit_cont 
(msg->transmit_cont_cls,&pc->identity,call_msg_cont_result);
     }
+    
GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
     GNUNET_free(msg);
-    
GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
     msg = ps->pending_msgs_head;
   }
 
@@ -1133,9 +1133,9 @@
   long http_result = 0;
   int res;
   /* Getting last http result code */
+  GNUNET_assert(NULL!=ps);
   if (ps->recv_connected==GNUNET_NO)
   {
-    GNUNET_assert(NULL!=ps);
     res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, 
&http_result);
     if (CURLE_OK == res)
     {
@@ -1256,7 +1256,8 @@
     return CURL_READFUNC_PAUSE;
   }
 
-  msg = ps->pending_msgs_tail;
+  GNUNET_assert (msg!=NULL);
+
   /* data to send */
   if (msg->pos < msg->size)
   {
@@ -1300,8 +1301,9 @@
                                 const struct GNUNET_MessageHeader *message)
 {
   struct Session *ps  = cls;
+  GNUNET_assert(ps != NULL);
+
   struct HTTP_PeerContext *pc = ps->peercontext;
-  GNUNET_assert(ps != NULL);
   GNUNET_assert(pc != NULL);
 #if DEBUG_HTTP
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,

Modified: gnunet/src/transport/plugin_transport_https.c
===================================================================
--- gnunet/src/transport/plugin_transport_https.c       2010-08-16 09:36:27 UTC 
(rev 12569)
+++ gnunet/src/transport/plugin_transport_https.c       2010-08-16 11:05:20 UTC 
(rev 12570)
@@ -494,8 +494,8 @@
     {
       msg->transmit_cont 
(msg->transmit_cont_cls,&pc->identity,call_msg_cont_result);
     }
+    
GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
     GNUNET_free(msg);
-    
GNUNET_CONTAINER_DLL_remove(ps->pending_msgs_head,ps->pending_msgs_head,msg);
     msg = ps->pending_msgs_head;
   }
 
@@ -1142,9 +1142,9 @@
   long http_result = 0;
   int res;
   /* Getting last http result code */
+  GNUNET_assert(NULL!=ps);
   if (ps->recv_connected==GNUNET_NO)
   {
-    GNUNET_assert(NULL!=ps);
     res = curl_easy_getinfo(ps->recv_endpoint, CURLINFO_RESPONSE_CODE, 
&http_result);
     if (CURLE_OK == res)
     {
@@ -1258,7 +1258,6 @@
   if (ps->send_active == GNUNET_NO)
        return CURL_READFUNC_PAUSE;
 
-
   if ((ps->pending_msgs_tail == NULL) && (ps->send_active == GNUNET_YES))
   {
 #if DEBUG_CONNECTIONS
@@ -1268,7 +1267,8 @@
     return CURL_READFUNC_PAUSE;
   }
 
-  msg = ps->pending_msgs_tail;
+  GNUNET_assert (msg!=NULL);
+
   /* data to send */
   if (msg->pos < msg->size)
   {
@@ -1312,9 +1312,11 @@
                                 const struct GNUNET_MessageHeader *message)
 {
   struct Session *ps  = cls;
+  GNUNET_assert(ps != NULL);
+
   struct HTTP_PeerContext *pc = ps->peercontext;
-  GNUNET_assert(ps != NULL);
   GNUNET_assert(pc != NULL);
+
 #if DEBUG_HTTPS
   GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
               "Connection %X: Forwarding message to transport service, type %u 
and size %u from `%s' (`%s')\n",