[GNUnet-SVN] r10004 - gnunet/src/core

[gnunet]

Author: grothoff
Date: 2010-01-14 23:21:48 +0100 (Thu, 14 Jan 2010)
New Revision: 10004

Modified:
   gnunet/src/core/core_api.c
   gnunet/src/core/gnunet-service-core.c
Log:
fixes

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2010-01-14 22:21:34 UTC (rev 10003)
+++ gnunet/src/core/core_api.c  2010-01-14 22:21:48 UTC (rev 10004)
@@ -929,8 +929,6 @@
     ch->pending_tail = th->prev;
   else
     th->next->prev = th->prev;
-  GNUNET_assert (ch->submitted == NULL);
-  ch->submitted = th;
   return sizeof (struct RequestConfigureMessage);
 }
 

Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c       2010-01-14 22:21:34 UTC (rev 
10003)
+++ gnunet/src/core/gnunet-service-core.c       2010-01-14 22:21:48 UTC (rev 
10004)
@@ -2041,7 +2041,6 @@
 {
   struct Neighbour *n = cls;
 
-  GNUNET_assert (n->status != PEER_STATE_KEY_CONFIRMED);
   n->retry_set_key_task = GNUNET_SCHEDULER_NO_TASK;
   n->set_key_retry_frequency =
     GNUNET_TIME_relative_multiply (n->set_key_retry_frequency, 2);
@@ -2156,7 +2155,6 @@
     case PEER_STATE_KEY_RECEIVED:
       break;
     case PEER_STATE_KEY_CONFIRMED:
-      GNUNET_break (0);
       break;
     default:
       GNUNET_break (0);
@@ -2426,7 +2424,7 @@
     case PEER_STATE_KEY_CONFIRMED:
       if ((sender_status != PEER_STATE_KEY_RECEIVED) &&
           (sender_status != PEER_STATE_KEY_CONFIRMED))
-        {
+        {        
 #if DEBUG_CORE
           GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
                       "Responding to `%s' with my own key (other peer has 
status %u), I was already fully up.\n",
@@ -2806,7 +2804,7 @@
       return;
     }
   n->last_latency = latency;
-  up = n->status == PEER_STATE_KEY_CONFIRMED;
+  up = (n->status == PEER_STATE_KEY_CONFIRMED);
   type = ntohs (message->type);
   size = ntohs (message->size);
   switch (type)