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

[gnunet]

Author: grothoff
Date: 2011-06-03 15:45:38 +0200 (Fri, 03 Jun 2011)
New Revision: 15399

Modified:
   gnunet/src/core/core_api.c
Log:
fix

Modified: gnunet/src/core/core_api.c
===================================================================
--- gnunet/src/core/core_api.c  2011-06-03 13:45:17 UTC (rev 15398)
+++ gnunet/src/core/core_api.c  2011-06-03 13:45:38 UTC (rev 15399)
@@ -83,9 +83,10 @@
   void *pcic_cls;
 
   /**
-   * Pointer to free when we call pcic.
+   * Pointer to free when we call pcic and to use to cancel
+   * preference change on disconnect.
    */
-  void *pcic_ptr;
+  struct GNUNET_CORE_InformationRequestContext *pcic_ptr;
 
   /**
    * Request information ID for the given pcic (needed in case a
@@ -414,6 +415,7 @@
   struct GNUNET_CORE_TransmitHandle *th;
   struct PeerRecord *pr = value;
   GNUNET_CORE_PeerConfigurationInfoCallback pcic;
+  void *pcic_cls;
 
   while (NULL != (th = pr->pending_head))
     {
@@ -430,10 +432,9 @@
     }
   if (NULL != (pcic = pr->pcic))
     {
-      pr->pcic = NULL;
-      GNUNET_free_non_null (pr->pcic_ptr);
-      pr->pcic_ptr = NULL;
-      pcic (pr->pcic_cls,
+      pcic_cls = pr->pcic_cls;
+      GNUNET_CORE_peer_change_preference_cancel (pr->pcic_ptr);
+      pcic (pcic_cls,
            &pr->peer,
            zero,
            0,