[GNUnet-SVN] r11049 - gnunet/src/peerinfo

[gnunet]

Author: grothoff
Date: 2010-04-23 10:53:28 +0200 (Fri, 23 Apr 2010)
New Revision: 11049

Modified:
   gnunet/src/peerinfo/peerinfo_api.c
Log:
fix

Modified: gnunet/src/peerinfo/peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/peerinfo_api.c  2010-04-23 08:46:51 UTC (rev 11048)
+++ gnunet/src/peerinfo/peerinfo_api.c  2010-04-23 08:53:28 UTC (rev 11049)
@@ -478,9 +478,9 @@
                                   ic->timeout_task);
          ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
        }
-      ic->callback (ic->callback_cls, NULL, NULL, 2);
       reconnect (ic->h);
       trigger_transmit (ic->h);
+      ic->callback (ic->callback_cls, NULL, NULL, 2);
       GNUNET_free (ic);
       return;
     }  
@@ -507,13 +507,14 @@
   struct GNUNET_PEERINFO_IteratorContext *ic = cls;
 
   ic->timeout_task = GNUNET_SCHEDULER_NO_TASK;
+  if (! ic->in_receive)
+    GNUNET_CONTAINER_DLL_remove (ic->h->tq_head,
+                                ic->h->tq_tail,
+                                ic->tqe);
   ic->callback (ic->callback_cls, NULL, NULL, 1);
   ic->callback = NULL;
   if (ic->in_receive)
-    return; /* need to finish processing */
-  GNUNET_CONTAINER_DLL_remove (ic->h->tq_head,
-                              ic->h->tq_tail,
-                              ic->tqe);
+    return;
   GNUNET_free (ic->tqe);
   GNUNET_free (ic);
 }