[GNUnet-SVN] r31918 - gnunet/src/include

[gnunet]

Author: wachs
Date: 2014-01-15 18:16:10 +0100 (Wed, 15 Jan 2014)
New Revision: 31918

Modified:
   gnunet/src/include/gnunet_protocols.h
   gnunet/src/include/gnunet_transport_service.h
Log:
header for transport validation monitoring API


Modified: gnunet/src/include/gnunet_protocols.h
===================================================================
--- gnunet/src/include/gnunet_protocols.h       2014-01-15 16:01:29 UTC (rev 
31917)
+++ gnunet/src/include/gnunet_protocols.h       2014-01-15 17:16:10 UTC (rev 
31918)
@@ -1319,8 +1319,6 @@
  */
 #define GNUNET_MESSAGE_TYPE_TRANSPORT_MONITOR_VALIDATION_RESPONSE 387
 
-
-
 
/*******************************************************************************
  * FS-PUBLISH-HELPER IPC Messages
  
******************************************************************************/

Modified: gnunet/src/include/gnunet_transport_service.h
===================================================================
--- gnunet/src/include/gnunet_transport_service.h       2014-01-15 16:01:29 UTC 
(rev 31917)
+++ gnunet/src/include/gnunet_transport_service.h       2014-01-15 17:16:10 UTC 
(rev 31918)
@@ -206,8 +206,29 @@
   GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED
 };
 
+enum GNUNET_TRANSPORT_ValidationState
+{
+  /**
+   * Fresh validation entry
+   */
+  GNUNET_TRANSPORT_VS_NEW,
 
+  /**
+   * Updated validation entry
+   */
+  GNUNET_TRANSPORT_VS_UPDATE,
 
+  /**
+   * Timeout for validation entry
+   */
+  GNUNET_TRANSPORT_VS_TIMEOUT,
+
+  /**
+   * Validation entry is removed
+   */
+  GNUNET_TRANSPORT_VS_REMOVE,
+};
+
 /**
  * Function called by the transport for each received message.
  *
@@ -319,10 +340,12 @@
  *
  */
 typedef void (*GNUNET_TRANSPORT_ValidationIterateCallback) (void *cls,
-                                    const struct GNUNET_PeerIdentity *peer,
-                                    const struct GNUNET_HELLO_Address *address,
-                                    struct GNUNET_TIME_Absolute valid_until,
-                                    struct GNUNET_TIME_Absolute 
next_validation);
+    const struct GNUNET_PeerIdentity *peer,
+    const struct GNUNET_HELLO_Address *address,
+    struct GNUNET_TIME_Absolute last_validation,
+    struct GNUNET_TIME_Absolute valid_until,
+    struct GNUNET_TIME_Absolute next_validation,
+    enum GNUNET_TRANSPORT_ValidationState state);
 
 
 
@@ -601,7 +624,7 @@
  * @param state the state
  */
 const char *
-GNUNET_TRANSPORT_p2s (enum GNUNET_TRANSPORT_PeerState state);
+GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state);
 
 
 /**
@@ -615,6 +638,16 @@
 
 
 /**
+ * Convert validation state to human-readable string.
+ *
+ * @param state the state value
+ * @return corresponding string
+ */
+const char *
+GNUNET_TRANSPORT_vs2s (enum GNUNET_TRANSPORT_ValidationState state);
+
+
+/**
  * Return information about a specific peer or all peers currently known to
  * transport service once or in monitoring mode. To obtain information about
  * a specific peer, a peer identity can be passed. To obtain information about