[GNUnet-SVN] r5535 - GNUnet/src/include

[gnunet]

Author: grothoff
Date: 2007-08-24 03:10:36 -0600 (Fri, 24 Aug 2007)
New Revision: 5535

Modified:
   GNUnet/src/include/gnunet_datastore_service.h
   GNUnet/src/include/gnunet_identity_service.h
Log:
API cleanup

Modified: GNUnet/src/include/gnunet_datastore_service.h
===================================================================
--- GNUnet/src/include/gnunet_datastore_service.h       2007-08-24 09:10:32 UTC 
(rev 5534)
+++ GNUnet/src/include/gnunet_datastore_service.h       2007-08-24 09:10:36 UTC 
(rev 5535)
@@ -170,21 +170,14 @@
   int (*fast_get) (const HashCode512 * key);
 
   /**
-   * Get a random value from the datastore that has
-   * a key close to the given approx value.
+   * Get a random value from the datastore.
    *
-   * @param approx maybe NULL (if any random entry
-   *   will do)
    * @param key set to the key of the match
    * @param value set to an approximate match
-   * @param type if a particular type is desired, 0
-   *        for any type.
    * @return OK if a value was found, SYSERR if not
    */
-  int (*getRandom) (const HashCode512 * approx,
-                    unsigned int sizeLimit,
-                    HashCode512 * key,
-                    Datastore_Value ** value, unsigned int type);
+  int (*getRandom) (HashCode512 * key,
+                    Datastore_Value ** value);
 
   /**
    * Explicitly remove some content from the database.

Modified: GNUnet/src/include/gnunet_identity_service.h
===================================================================
--- GNUnet/src/include/gnunet_identity_service.h        2007-08-24 09:10:32 UTC 
(rev 5534)
+++ GNUnet/src/include/gnunet_identity_service.h        2007-08-24 09:10:36 UTC 
(rev 5535)
@@ -176,13 +176,18 @@
                         unsigned int desperation, int strict);
 
   /**
-   * Is the node currently 'strictly' blacklisted, that is, the node
+   * Is the node currently blacklisted.
+   * If "strict" is true, only count strictly blacklisted
+   * peers, which are peers where the node
    * misbehaved badly and we also reject inbound connections.
    *
    * @param identity node to check
+   * @param strict YES if we should only care about
+   *        strict blacklisting
    * @return YES if true, else NO
    */
-  int (*isBlacklistedStrict) (const PeerIdentity * identity);
+  int (*isBlacklisted) (const PeerIdentity * identity,
+                       int strict);
 
   /**
    * Whitelist a host. This method is called if a host