[GNUnet-SVN] r10335 - in gnunet/src: core transport

[gnunet]

Author: grothoff
Date: 2010-02-16 23:28:48 +0100 (Tue, 16 Feb 2010)
New Revision: 10335

Modified:
   gnunet/src/core/gnunet-service-core.c
   gnunet/src/transport/gnunet-service-transport.c
   gnunet/src/transport/transport_api.c
Log:
fixing bad assumptions

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-02-16 22:19:04 UTC (rev 
10334)
+++ gnunet/src/core/gnunet-service-core.c       2010-02-16 22:28:48 UTC (rev 
10335)
@@ -2976,11 +2976,9 @@
 #endif
   n = find_neighbour (peer);
   if (n == NULL)
-    {
-      GNUNET_break (0);
-      return;
-    }
-  GNUNET_break (n->is_connected);
+    n = create_neighbour (peer);
+  if (n == NULL)
+    return;   
   n->last_latency = latency;
   n->last_distance = distance;
   up = (n->status == PEER_STATE_KEY_CONFIRMED);

Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c     2010-02-16 22:19:04 UTC 
(rev 10334)
+++ gnunet/src/transport/gnunet-service-transport.c     2010-02-16 22:28:48 UTC 
(rev 10335)
@@ -2630,16 +2630,6 @@
       handle_pong(plugin, message, peer, sender_address, sender_address_len);
       break;
     default:
-      if (! n->received_pong)
-       {
-         GNUNET_break_op (0);
-#if DEBUG_TRANSPORT || 1
-         GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                     "Received message of type %u from `%4s', prior to key 
confirmation (dropped).\n",
-                     ntohs (message->type), GNUNET_i2s (peer));
-#endif
-         break;
-       }
 #if DEBUG_TRANSPORT
       GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                   "Received message of type %u from `%4s', sending to all 
clients.\n",
@@ -2652,7 +2642,6 @@
       im->latency = GNUNET_TIME_relative_hton (n->latency);
       im->peer = *peer;
       memcpy (&im[1], message, msize);
-
       cpos = clients;
       while (cpos != NULL)
         {

Modified: gnunet/src/transport/transport_api.c
===================================================================
--- gnunet/src/transport/transport_api.c        2010-02-16 22:19:04 UTC (rev 
10334)
+++ gnunet/src/transport/transport_api.c        2010-02-16 22:28:48 UTC (rev 
10335)
@@ -1528,10 +1528,9 @@
 #endif      
       n = neighbour_find (h, &im->peer);
       if (n == NULL)
-       {
-         GNUNET_break (0);
-         break;
-       }      
+       n = neighbour_add (h, &im->peer);
+      if (n == NULL) 
+       break;
       if (h->rec != NULL)
        h->rec (h->cls, &im->peer, imm,
                GNUNET_TIME_relative_ntoh (im->latency), ntohs(im->distance));