From 84e15afe4933ee2ca62e3e111ca261c3a986c157 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 21 Apr 2010 20:19:43 +0000
Subject: activating new peerinfo API

---
 src/include/gnunet_peerinfo_service.h | 84 ++++++-----------------------------
 src/include/gnunet_protocols.h        |  5 ---
 2 files changed, 14 insertions(+), 75 deletions(-)

(limited to 'src/include')

diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h
index ac88df201..4f689e504 100644
--- a/src/include/gnunet_peerinfo_service.h
+++ b/src/include/gnunet_peerinfo_service.h
@@ -51,14 +51,15 @@ struct GNUNET_PEERINFO_Handle;
 /**
  * Connect to the peerinfo service.
  *
- * @param cfg configuration to use
  * @param sched scheduler to use
+ * @param cfg configuration to use
  * @return NULL on error (configuration related, actual connection
  *         etablishment may happen asynchronously).
  */
 struct GNUNET_PEERINFO_Handle *
-GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg,
-			 struct GNUNET_SCHEDULER_Handle *sched);
+GNUNET_PEERINFO_connect (struct GNUNET_SCHEDULER_Handle *sched,
+			 const struct GNUNET_CONFIGURATION_Handle *cfg);
+			 
 
 
 /**
@@ -86,25 +87,10 @@ GNUNET_PEERINFO_disconnect (struct GNUNET_PEERINFO_Handle *h);
  * @param hello the verified (!) HELLO message
  */
 void
-GNUNET_PEERINFO_add_peer_new (struct GNUNET_PEERINFO_Handle *h,
-			      const struct GNUNET_HELLO_Message *hello);
-
+GNUNET_PEERINFO_add_peer (struct GNUNET_PEERINFO_Handle *h,
+			  const struct GNUNET_HELLO_Message *hello);
 
 
-/**
- * Add a host to the persistent list.
- *
- * @param cfg configuration to use
- * @param sched scheduler to use
- * @param peer identity of the peer
- * @param hello the verified (!) HELLO message
- */
-void
-GNUNET_PEERINFO_add_peer (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                          struct GNUNET_SCHEDULER_Handle *sched,
-                          const struct GNUNET_PeerIdentity *peer,
-                          const struct GNUNET_HELLO_Message *hello);
-
 /**
  * Type of an iterator over the hosts.  Note that each
  * host will be called with each available protocol.
@@ -127,40 +113,6 @@ typedef void
 struct GNUNET_PEERINFO_IteratorContext;
 
 
-/**
- * Call a method for each known matching host and change
- * its trust value.  The method will be invoked once for
- * each host and then finally once with a NULL pointer.  After
- * that final invocation, the iterator context must no longer
- * be used.
- *
- * Note that the last call can be triggered by timeout or by simply
- * being done; however, the trust argument will be set to zero if we
- * are done, 1 if we timed out and 2 for fatal error.
- *
- * @param cfg configuration to use
- * @param sched scheduler to use
- * @param peer restrict iteration to this peer only (can be NULL)
- * @param trust_delta how much to change the trust in all matching peers
- * @param timeout how long to wait until timing out
- * @param callback the method to call for each peer
- * @param callback_cls closure for callback
- * @return NULL on error (in this case, 'callback' is never called!), 
- *         otherwise an iterator context
- */
-struct GNUNET_PEERINFO_IteratorContext *
-GNUNET_PEERINFO_iterate (const struct GNUNET_CONFIGURATION_Handle *cfg,
-                         struct GNUNET_SCHEDULER_Handle *sched,
-                         const struct GNUNET_PeerIdentity *peer,
-                         int trust_delta,
-                         struct GNUNET_TIME_Relative timeout,
-                         GNUNET_PEERINFO_Processor callback,
-                         void *callback_cls);
-
-
-struct GNUNET_PEERINFO_NewIteratorContext;
-
-
 /**
  * Call a method for each known matching host and change its trust
  * value.  The callback method will be invoked once for each matching
@@ -183,23 +135,14 @@ struct GNUNET_PEERINFO_NewIteratorContext;
  * @return NULL on error (in this case, 'callback' is never called!), 
  *         otherwise an iterator context
  */
-struct GNUNET_PEERINFO_NewIteratorContext *
-GNUNET_PEERINFO_iterate_new (struct GNUNET_PEERINFO_Handle *h,
-			     const struct GNUNET_PeerIdentity *peer,
-			     int trust_delta,
-			     struct GNUNET_TIME_Relative timeout,
-			     GNUNET_PEERINFO_Processor callback,
-			     void *callback_cls);
-
-
+struct GNUNET_PEERINFO_IteratorContext *
+GNUNET_PEERINFO_iterate (struct GNUNET_PEERINFO_Handle *h,
+			 const struct GNUNET_PeerIdentity *peer,
+			 int trust_delta,
+			 struct GNUNET_TIME_Relative timeout,
+			 GNUNET_PEERINFO_Processor callback,
+			 void *callback_cls);
 
-/**
- * Cancel an iteration over peer information.
- *
- * @param ic context of the iterator to cancel
- */
-void
-GNUNET_PEERINFO_iterate_cancel_new (struct GNUNET_PEERINFO_NewIteratorContext *ic);
 
 
 /**
@@ -211,6 +154,7 @@ void
 GNUNET_PEERINFO_iterate_cancel (struct GNUNET_PEERINFO_IteratorContext *ic);
 
 
+
 /**
  * Handle for notifications about changes to the set of known peers.
  */
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index d992c9fb7..72fcccf94 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -198,11 +198,6 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_PONG 33
 
-/**
- * Request addition of a HELLO
- */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_ADD 36
-
 /**
  * Request update and listing of a peer.
  */
-- 
cgit v1.2.3