blacklisting API implementation

2 files changed, 48 insertions, 10 deletions

diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h
index 0925a1909..5451f53d9 100644
--- a/src/include/gnunet_protocols.h
+++ b/src/include/gnunet_protocols.h
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -185,43 +185,55 @@ extern "C"
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_ADDRESS_REPLY 30
 
+/**
+ * Change in blacklisting status of a peer.
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST 31
+
+/**
+ * Request to transport to notify us about any blacklisting status
+ * changes on this connection (and to immediately send all
+ * active blacklist entries).
+ */
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_BLACKLIST_NOTIFY 32
+
 
 /**
  * Request addition of a HELLO
  */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_ADD 32
+#define GNUNET_MESSAGE_TYPE_PEERINFO_ADD 36
 
 /**
  * Request update and listing of a peer.
  */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_GET 33
+#define GNUNET_MESSAGE_TYPE_PEERINFO_GET 37
 
 /**
  * Request update and listing of all peers.
  */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL 34
+#define GNUNET_MESSAGE_TYPE_PEERINFO_GET_ALL 38
 
 /**
  * Information about one of the peers.
  */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO 35
+#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO 39
 
 /**
  * End of information about other peers.
  */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END 36
+#define GNUNET_MESSAGE_TYPE_PEERINFO_INFO_END 40
 
 /**
  * Start notifying this client about all changes to
  * the known peers until it disconnects.
  */
-#define GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY 37
+#define GNUNET_MESSAGE_TYPE_PEERINFO_NOTIFY 41
 
 
 /**
  * Welcome message between TCP transports.
  */
-#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 40
+#define GNUNET_MESSAGE_TYPE_TRANSPORT_TCP_WELCOME 60
 
 /**
  * Welcome message between TCP transports.
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 10b7e8f89..0d378cbd3 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -294,6 +294,11 @@ GNUNET_TRANSPORT_address_lookup (struct GNUNET_SCHEDULER_Handle *sched,
 
 
 
+/**
+ * Handle for blacklisting requests.
+ */
+struct GNUNET_TRANSPORT_BlacklistRequest;
+
 
 /**
  * Blacklist a peer for a given period of time.  All connections
@@ -307,12 +312,33 @@ GNUNET_TRANSPORT_address_lookup (struct GNUNET_SCHEDULER_Handle *sched,
  * @param peer identity of peer to blacklist
  * @param duration how long to blacklist, use GNUNET_TIME_UNIT_ZERO to
  *        re-enable connections
+ * @param timeout when should this operation (trying to establish the
+ *        blacklisting time out)
+ * @param cont continuation to call once the request has been processed
+ * @param cont_cls closure for cont
+ * @return NULL on error, otherwise handle for cancellation
  */
-void
+struct GNUNET_TRANSPORT_BlacklistRequest *
 GNUNET_TRANSPORT_blacklist (struct GNUNET_SCHEDULER_Handle *sched,
                             const struct GNUNET_CONFIGURATION_Handle *cfg,
                             const struct GNUNET_PeerIdentity *peer,
-                            struct GNUNET_TIME_Relative duration);
+                            struct GNUNET_TIME_Relative duration,
+                            struct GNUNET_TIME_Relative timeout,
+                            GNUNET_SCHEDULER_Task cont,
+                            void *cont_cls);
+
+
+/**
+ * Abort transmitting the blacklist request.  Note that this function
+ * is NOT for removing a peer from the blacklist (for that, call 
+ * GNUNET_TRANSPORT_blacklist with a duration of zero).  This function
+ * is only for aborting the transmission of a blacklist request
+ * (i.e. because of shutdown).
+ *
+ * @param br handle of the request that is to be cancelled
+ */
+void
+GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_BlacklistRequest * br);
 
 
 /**