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

[gnunet]

Author: grothoff
Date: 2012-05-31 22:59:49 +0200 (Thu, 31 May 2012)
New Revision: 21672

Modified:
   gnunet/src/transport/plugin_transport_http_server.c
Log:
-removing assertion that seems bogus

Modified: gnunet/src/transport/plugin_transport_http_server.c
===================================================================
--- gnunet/src/transport/plugin_transport_http_server.c 2012-05-31 20:59:20 UTC 
(rev 21671)
+++ gnunet/src/transport/plugin_transport_http_server.c 2012-05-31 20:59:49 UTC 
(rev 21672)
@@ -349,30 +349,26 @@
     }
   }
 
-  struct Plugin *plugin = s->plugin;
-  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, plugin->name,
+  GNUNET_log_from (GNUNET_ERROR_TYPE_DEBUG, s->plugin->name,
                    "Server: %X: sent %u bytes\n", s, bytes_read);
 
   return bytes_read;
 }
 
+
 static struct Session *
 server_lookup_session (struct Plugin *plugin,
                        struct ServerConnection * sc)
 {
   struct Session *s;
+
   for (s = plugin->head; NULL != s; s = s->next)
-  {
     if ((s->server_recv == sc) || (s->server_send == sc))
       return s;
-  }
-
   for (s = plugin->server_semi_head; NULL != s; s = s->next)
-  {
     if ((s->server_recv == sc) || (s->server_send == sc))
       return s;
-  }
-  return s;
+  return NULL;
 }
 
 
@@ -624,9 +620,9 @@
   int res = MHD_YES;
 
   GNUNET_assert (cls != NULL);
-  /* new connection */
   if (sc == NULL)
   {
+    /* new connection */
     sc = server_lookup_serverconnection (plugin, mhd_connection, url, method);
     if (sc != NULL)
       (*httpSessionCache) = sc;
@@ -642,10 +638,10 @@
   }
   else
   {
+    /* 'old' connection */
     if (NULL == server_lookup_session (plugin, sc))
     {
       /* Session was already disconnected */
-      GNUNET_break (0);
       return MHD_NO;
     }
   }