connected peer lookup

3 files changed, 48 insertions, 2 deletions

diff --git a/src/include/gnunet_dht_service.h b/src/include/gnunet_dht_service.h
index e57dd718c..027986a85 100644
--- a/src/include/gnunet_dht_service.h
+++ b/src/include/gnunet_dht_service.h
@@ -41,7 +41,7 @@ extern "C"
 
 
 /**
- * FIXME: document.
+ * Default republication frequency for stored data in the DHT.
  */
 #define GNUNET_DHT_DEFAULT_REPUBLISH_FREQUENCY GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_MINUTES, 60)
 
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 957bcd0eb..960ec60ab 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -102,7 +102,6 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_FRAGMENT 18
 
-
 /**
  * Message from the core saying that the transport
  * server should start giving it messages.  This
@@ -299,6 +298,11 @@ extern "C"
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_NAT_PROBE_KEEPALIVE 58
 
 /**
+ * Request to look up addresses of peers.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_PEER_ADDRESS_LOOKUP 59
+
+/**
  * Welcome message between TCP transports.
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 60
@@ -912,6 +916,10 @@ extern "C"
 
 
 
+/*******************************************************************************
+ * CHAT message types START
+ ******************************************************************************/
+
 /**
  * Message sent from client to join a chat room.
  */
@@ -977,6 +985,28 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_CHAT_P2P_CONFIRMATION_RECEIPT 311
 
+/*******************************************************************************
+ * CHAT message types END
+ ******************************************************************************/
+
+/*******************************************************************************
+ * NSE (network size estimation) message types START
+ ******************************************************************************/
+
+/**
+ * client->service message indicating start
+ */
+#define GNUNET_MESSAGE_TYPE_NSE_START 321
+
+/**
+ * P2P message sent from nearest peer
+ */
+#define GNUNET_MESSAGE_TYPE_NSE_P2P_FLOOD 322
+
+/**
+ * service->client message indicating
+ */
+#define GNUNET_MESSAGE_TYPE_NSE_ESTIMATE 323
 
 /**
  * Type used to match 'all' message types.
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 9a7093a10..607389ae7 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -645,6 +645,22 @@ GNUNET_TRANSPORT_address_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
                                  GNUNET_TRANSPORT_AddressLookUpCallback aluc,
                                  void *aluc_cls);
 
+/**
+ * Return all the known addresses for a peer.
+ *
+ * @param cfg configuration to use
+ * @param peer peer identity to look up the addresses of
+ * @param timeout how long is the lookup allowed to take at most
+ * @param peer_address_callback function to call with the results
+ * @param peer_address_callback_cls closure for peer_address_callback
+ */
+void
+GNUNET_TRANSPORT_peer_address_lookup (const struct GNUNET_CONFIGURATION_Handle *cfg,
+                                      const struct GNUNET_PeerIdentity *peer,
+                                      struct GNUNET_TIME_Relative timeout,
+                                      GNUNET_TRANSPORT_AddressLookUpCallback peer_address_callback,
+                                      void *peer_address_callback_cls);
+
 
 
 /**