[GNUnet-SVN] r30644 - gnunet/src/identity

[gnunet]

Author: grothoff
Date: 2013-11-09 21:19:39 +0100 (Sat, 09 Nov 2013)
New Revision: 30644

Modified:
   gnunet/src/identity/identity_api.c
Log:
-fixing crash in #3101, but just replacing it with a break, so there is likely 
still an issue left

Modified: gnunet/src/identity/identity_api.c
===================================================================
--- gnunet/src/identity/identity_api.c  2013-11-09 20:08:41 UTC (rev 30643)
+++ gnunet/src/identity/identity_api.c  2013-11-09 20:19:39 UTC (rev 30644)
@@ -418,6 +418,14 @@
       return;
     }
     op = h->op_head;
+    if (NULL == op)
+    {
+      GNUNET_break (0);
+      reschedule_connect (h);
+      return;
+    }
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Received SET_DEFAULT message from identity service\n");
     GNUNET_CONTAINER_DLL_remove (h->op_head,
                                 h->op_tail,
                                 op);
@@ -889,6 +897,8 @@
        (NULL == h->client) )
   {
     /* request not active, can simply remove */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Client aborted non-head operation, simply removing it\n");
     GNUNET_CONTAINER_DLL_remove (h->op_head,
                                 h->op_tail,
                                 op);
@@ -898,6 +908,8 @@
   if (NULL != h->th)
   {
     /* request active but not yet with service, can still abort */
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "Client aborted head operation prior to transmission, aborting 
it\n");
     GNUNET_CLIENT_notify_transmit_ready_cancel (h->th);
     h->th = NULL;
     GNUNET_CONTAINER_DLL_remove (h->op_head,
@@ -908,6 +920,8 @@
     return;
   }
   /* request active with service, simply ensure continuations are not called */
+  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+              "Client aborted active request, NULLing continuation\n");
   op->cont = NULL;
   op->cb = NULL;
 }