X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ftransport%2Fgnunet-service-transport_hello.h;h=605d19861da8f7cff055c2ca0dcbcaf44cd177a0;hb=f181f6eaf8cdb1fdb47dc98cf171ad1be842b441;hp=7b86d62d040519c28d2444a30c97c363e4a6bd55;hpb=c01972f2300865e9750092d566da5b08a05c7b4f;p=oweals%2Fgnunet.git

diff --git a/src/transport/gnunet-service-transport_hello.h b/src/transport/gnunet-service-transport_hello.h
index 7b86d62d0..605d19861 100644
--- a/src/transport/gnunet-service-transport_hello.h
+++ b/src/transport/gnunet-service-transport_hello.h
@@ -29,15 +29,9 @@
 #include "gnunet_statistics_service.h"
 #include "gnunet_transport_service.h"
 #include "gnunet_util_lib.h"
+#include "gnunet_hello_lib.h"
 
 
-/**
- * After how long do we expire an address in a HELLO that we just
- * validated?  This value is also used for our own addresses when we
- * create a HELLO.
- */
-#define GST_HELLO_ADDRESS_EXPIRATION GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_HOURS, 12)
-
 
 /**
  * Signature of a function to call whenever our hello changes.
@@ -45,8 +39,8 @@
  * @param cls closure
  * @param hello updated HELLO
  */
-typedef void (*GST_HelloCallback)(void *cls,
-				  const struct GNUNET_MessageHeader *hello);
+typedef void (*GST_HelloCallback) (void *cls,
+                                   const struct GNUNET_MessageHeader * hello);
 
 
 /**
@@ -55,9 +49,8 @@ typedef void (*GST_HelloCallback)(void *cls,
  * @param cb function to call whenever our HELLO changes
  * @param cb_cls closure for cb
  */
-void 
-GST_hello_start (GST_HelloCallback cb,
-		 void *cb_cls);
+void
+GST_hello_start (GST_HelloCallback cb, void *cb_cls);
 
 
 /**
@@ -80,23 +73,17 @@ GST_hello_get (void);
  * Add or remove an address from this peer's HELLO message.
  *
  * @param addremove GNUNET_YES to add, GNUNET_NO to remove
- * @param plugin_name name of the plugin for which this is an address
- * @param plugin_address address in a plugin-specific format
- * @param plugin_address_len number of bytes in plugin_address
+ * @param address address to add or remove
  */
 void
 GST_hello_modify_addresses (int addremove,
-			    const char *plugin_name,
-			    const void *plugin_address,
-			    size_t plugin_address_len);
+                            const struct GNUNET_HELLO_Address *address);
 
 
 /**
  * Test if a particular address is one of ours.
  *
- * @param plugin_name name of the plugin for which this is an address
- * @param plugin_address address in a plugin-specific format
- * @param plugin_address_len number of bytes in plugin_address
+ * @param address the address to test
  * @param sig location where to cache PONG signatures for this address [set]
  * @param sig_expiration how long until the current 'sig' expires?
  *            (ZERO if sig was never created) [set]
@@ -104,11 +91,9 @@ GST_hello_modify_addresses (int addremove,
  *         GNUNET_NO if not
  */
 int
-GST_hello_test_address (const char *plugin_name,
-			const void *plugin_address,
-			size_t plugin_address_len,
-			struct GNUNET_CRYPTO_RsaSignature **sig,
-			struct GNUNET_TIME_Absolute **sig_expiration);
+GST_hello_test_address (const struct GNUNET_HELLO_Address *address,
+                        struct GNUNET_CRYPTO_RsaSignature **sig,
+                        struct GNUNET_TIME_Absolute **sig_expiration);
 
 
 #endif