2 files changed, 51 insertions, 23 deletions

diff --git a/src/core/core.h b/src/core/core.h
index 30130b84b..20c3ddc4b 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -112,6 +112,36 @@ struct ConnectNotifyMessage
   struct GNUNET_MessageHeader header;
 
   /**
+   * Distance to the peer.
+   */
+  uint32_t distance GNUNET_PACKED;
+
+  /**
+   * Currently observed latency.
+   */
+  struct GNUNET_TIME_RelativeNBO latency;
+
+  /**
+   * Identity of the connecting peer.
+   */
+  struct GNUNET_PeerIdentity peer;
+
+};
+
+
+
+/**
+ * Message sent by the service to clients to notify them
+ * about a peer disconnecting.
+ */
+struct DisconnectNotifyMessage
+{
+  /**
+   * Header with type GNUNET_MESSAGE_TYPE_CORE_NOTIFY_DISCONNECT.
+   */
+  struct GNUNET_MessageHeader header;
+
+  /**
    * Always zero.
    */
   uint32_t reserved GNUNET_PACKED;
@@ -143,9 +173,14 @@ struct NotifyTrafficMessage
   struct GNUNET_MessageHeader header;
 
   /**
-   * Always zero.
+   * Distance to the peer.
    */
-  uint32_t reserved GNUNET_PACKED;
+  uint32_t distance GNUNET_PACKED;
+
+  /**
+   * Currently observed latency.
+   */
+  struct GNUNET_TIME_RelativeNBO latency;
 
   /**
    * Identity of the receiver or sender.
@@ -230,12 +265,6 @@ struct ConfigurationInfoMessage
   uint32_t bpm_out GNUNET_PACKED;
 
   /**
-   * Latest transport latency estimate for the peer.
-   * FOREVER if we have been disconnected.
-   */
-  struct GNUNET_TIME_RelativeNBO latency;
-
-  /**
    * Current traffic preference for the peer.
    * 0 if we have been disconnected.
    */
@@ -280,11 +309,11 @@ struct SendMessage
 
 
 /**
- * Client asking core to transmit a particular message to a particular
- * target.  There is no response from the core to this type of request
- * (however, if an actual connection is created or destroyed, be it
- * because of this type request or not, the core generally needs to
- * notify the clients).
+ * Client asking core to connect to a particular target.  There is no
+ * response from the core to this type of request (however, if an
+ * actual connection is created or destroyed, be it because of this
+ * type request or not, the core generally needs to notify the
+ * clients).
  */
 struct ConnectMessage
 {
diff --git a/src/core/core_api_peer_get_info.c b/src/core/core_api_peer_get_info.c
index 23ae04f01..f6ce31110 100644
--- a/src/core/core_api_peer_get_info.c
+++ b/src/core/core_api_peer_get_info.c
@@ -88,7 +88,6 @@ receive_info (void *cls,
                &cim->peer,
                ntohl (cim->bpm_in),
                ntohl (cim->bpm_out),
-               GNUNET_TIME_relative_ntoh (cim->latency),
                ntohl (cim->reserved_amount),
                GNUNET_ntohll (cim->preference));  
   GNUNET_CLIENT_disconnect (irc->client);
@@ -122,15 +121,15 @@ receive_info (void *cls,
  * @return NULL on error
  */
 struct GNUNET_CORE_InformationRequestContext *
-GNUNET_CORE_peer_get_info (struct GNUNET_SCHEDULER_Handle *sched,
-                           const struct GNUNET_CONFIGURATION_Handle *cfg,
-                           const struct GNUNET_PeerIdentity *peer,
-                           struct GNUNET_TIME_Relative timeout,
-                           uint32_t bpm_out,
-                           int32_t amount,
-                           uint64_t preference,
-                           GNUNET_CORE_PeerConfigurationInfoCallback info,
-                           void *info_cls)
+GNUNET_CORE_peer_change_preference (struct GNUNET_SCHEDULER_Handle *sched,
+                                    const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                    const struct GNUNET_PeerIdentity *peer,
+                                    struct GNUNET_TIME_Relative timeout,
+                                    uint32_t bpm_out,
+                                    int32_t amount,
+                                    uint64_t preference,
+                                    GNUNET_CORE_PeerConfigurationInfoCallback info,
+                                    void *info_cls)
 {
   struct GNUNET_CORE_InformationRequestContext *irc;
   struct RequestInfoMessage rim;