fixing leak

[oweals/gnunet.git] / src / include / gnunet_core_service.h

diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h
index a66fe2343b894eee1e98fba0f1bfe7c14a87636d..fd43753556c7e66ade355343071e99acfc54a223 100644 (file)
--- a/src/include/gnunet_core_service.h
+++ b/src/include/gnunet_core_service.h
@@ -77,7 +77,7 @@ typedef void (*GNUNET_CORE_ConnectEventHandler) (void *cls,
  */
 typedef void (*GNUNET_CORE_PeerStatusEventHandler) (void *cls,
                                                    const struct
-                                                   GNUNET_PeerIdentity * peer,
+                                                   GNUNET_PeerIdentity *peer,
                                                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
                                                    struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
                                                    struct GNUNET_TIME_Absolute timeout,
@@ -298,14 +298,17 @@ GNUNET_CORE_peer_request_connect_cancel (struct GNUNET_CORE_PeerRequestHandle *r
  * @param bandwidth_out available amount of outbound bandwidth
  * @param amount set to the amount that was actually reserved or unreserved;
  *               either the full requested amount or zero (no partial reservations)
+ * @param res_delay if the reservation could not be satisfied (amount was 0), how
+ *        long should the client wait until re-trying?
  * @param preference current traffic preference for the given peer
  */
 typedef void
   (*GNUNET_CORE_PeerConfigurationInfoCallback) (void *cls,
                                                 const struct
-                                                GNUNET_PeerIdentity * peer,
+                                                GNUNET_PeerIdentity *peer,
                                                struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
-                                               int amount,
+                                               int32_t amount,
+                                               struct GNUNET_TIME_Relative res_delay,
                                                 uint64_t preference);
 
 
@@ -325,7 +328,7 @@ struct GNUNET_CORE_InformationRequestContext;
  * @param timeout after how long should we give up (and call "info" with NULL
  *                for "peer" to signal an error)?
  * @param bw_out set to the current bandwidth limit (sending) for this peer,
- *                caller should set "bpm_out" to "-1" to avoid changing
+ *                caller should set "bpm_out" to "GNUNET_BANDWIDTH_VALUE_MAX" to avoid changing
  *                the current value; otherwise "bw_out" will be lowered to
  *                the specified value; passing a pointer to "0" can be used to force
  *                us to disconnect from the peer; "bw_out" might not increase
@@ -380,6 +383,25 @@ GNUNET_CORE_iterate_peers (const struct GNUNET_CONFIGURATION_Handle *cfg,
                            GNUNET_CORE_ConnectEventHandler peer_cb,
                            void *cb_cls);
 
+/**
+ * Iterate over all currently connected peers.
+ * Calls peer_cb with each connected peer, and then
+ * once with NULL to indicate that all peers have
+ * been handled.
+ *
+ * @param cfg configuration to use
+ * @param peer the specific peer to check for
+ * @param peer_cb function to call with the peer information
+ * @param cb_cls closure for peer_cb
+ *
+ * @return GNUNET_OK if iterating, GNUNET_SYSERR on error
+ */
+int
+GNUNET_CORE_is_peer_connected (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                               struct GNUNET_PeerIdentity *peer,
+                               GNUNET_CORE_ConnectEventHandler peer_cb,
+                               void *cb_cls);
+
 
 /**
  * Handle for a transmission request.
@@ -395,6 +417,7 @@ struct GNUNET_CORE_TransmitHandle;
  * 
  *
  * @param handle connection to core service
+ * @param cork is corking allowed for this transmission?
  * @param priority how important is the message?
  * @param maxdelay how long can the message wait?
  * @param target who should receive the message,
@@ -418,6 +441,7 @@ struct GNUNET_CORE_TransmitHandle *
 GNUNET_CORE_notify_transmit_ready (struct
                                   GNUNET_CORE_Handle
                                   *handle,
+                                  int cork,
                                   uint32_t priority,
                                   struct
                                   GNUNET_TIME_Relative