use new PriorityPreferences consistently, note on deprecation

4 files changed, 56 insertions, 20 deletions

diff --git a/src/include/gnunet_mq_lib.h b/src/include/gnunet_mq_lib.h
index 4fe5c8df9..81100d7d8 100644
--- a/src/include/gnunet_mq_lib.h
+++ b/src/include/gnunet_mq_lib.h
@@ -1043,6 +1043,8 @@ GNUNET_MQ_impl_current (struct GNUNET_MQ_Handle *mq);
 
 /**
  * Enum defining all known preference categories.
+ *
+ * @deprecated will be replaced by `enum GNUNET_MQ_PriorityPreference`
  */
 enum GNUNET_MQ_PreferenceKind
 {
@@ -1083,6 +1085,8 @@ enum GNUNET_MQ_PreferenceKind
  *
  * @param type the preference type
  * @return a string or NULL if invalid
+ *
+ * @deprecated will be replaced by `enum GNUNET_MQ_PriorityPreference`
  */
 const char *
 GNUNET_MQ_preference_to_string (enum GNUNET_MQ_PreferenceKind type);
diff --git a/src/include/gnunet_transport_address_service.h b/src/include/gnunet_transport_address_service.h
index 9f0717d00..b33a11411 100644
--- a/src/include/gnunet_transport_address_service.h
+++ b/src/include/gnunet_transport_address_service.h
@@ -21,6 +21,9 @@
 /**
  * @author Christian Grothoff
  *
+ * @deprecated NOTE: we may want to drop this API and
+ *  only keep the gnunet_transport_application_service.h in the future!
+ *
  * @file
  * Provide addresses to transport for validation
  *
@@ -36,9 +39,8 @@
 #define GNUNET_TRANSPORT_ADDRESS_SERVICE_H
 
 #ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -65,7 +67,8 @@ struct GNUNET_TRANSPORT_AddressHandle;
  * @return NULL on error
  */
 struct GNUNET_TRANSPORT_AddressHandle *
-GNUNET_TRANSPORT_address_connect (const struct GNUNET_CONFIGURATION_Handle *cfg);
+GNUNET_TRANSPORT_address_connect (
+  const struct GNUNET_CONFIGURATION_Handle *cfg);
 
 
 /**
@@ -101,7 +104,7 @@ GNUNET_TRANSPORT_address_try (struct GNUNET_TRANSPORT_AddressHandle *ch,
                               const size_t raw_size);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus
@@ -111,6 +114,6 @@ GNUNET_TRANSPORT_address_try (struct GNUNET_TRANSPORT_AddressHandle *ch,
 /* ifndef GNUNET_TRANSPORT_ADDRESS_SERVICE_H */
 #endif
 
-/** @} */  /* end of group */
+/** @} */ /* end of group */
 
 /* end of gnunet_transport_address_service.h */
diff --git a/src/include/gnunet_transport_application_service.h b/src/include/gnunet_transport_application_service.h
index 8c63a8234..c12bd7441 100644
--- a/src/include/gnunet_transport_application_service.h
+++ b/src/include/gnunet_transport_application_service.h
@@ -65,6 +65,34 @@ GNUNET_TRANSPORT_application_done (
 
 
 /**
+ * An application would like TRANSPORT to connect to a peer.
+ *
+ * @param ch handle
+ * @param peer identity of the peer we need an address for
+ * @param pk what kind of application will the application require (can be
+ *         #GNUNET_MQ_PRIO_BACKGROUND, we will still try to connect)
+ * @param bw desired bandwith, can be zero (we will still try to connect)
+ * @return suggest handle, NULL if a request is already pending
+ */
+struct GNUNET_TRANSPORT_ApplicationSuggestHandle *
+GNUNET_TRANSPORT_application_suggest (
+  struct GNUNET_TRANSPORT_ApplicationHandle *ch,
+  const struct GNUNET_PeerIdentity *peer,
+  enum GNUNET_MQ_PriorityPreferences pk,
+  struct GNUNET_BANDWIDTH_Value32NBO bw);
+
+
+/**
+ * We no longer care about being connected to a peer.
+ *
+ * @param sh handle to stop
+ */
+void
+GNUNET_TRANSPORT_application_suggest_cancel (
+  struct GNUNET_TRANSPORT_ApplicationSuggestHandle *sh);
+
+
+/**
  * An application (or a communicator) has received a HELLO (or other address
  * data of another peer) and wants TRANSPORT to validate that the address is
  * correct.  The result is NOT returned, in fact TRANSPORT may do nothing
diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h
index 58a1e9979..fe863c058 100644
--- a/src/include/gnunet_transport_hello_service.h
+++ b/src/include/gnunet_transport_hello_service.h
@@ -24,6 +24,8 @@
  * @file
  * obtain information about our current address
  *
+ * @deprecated, in TNG applications should query PEERSTORE directly!
+ *
  * @defgroup transport  Transport service
  * address information
  *
@@ -35,9 +37,8 @@
 #define GNUNET_TRANSPORT_HELLO_SERVICE_H
 
 #ifdef __cplusplus
-extern "C"
-{
-#if 0                           /* keep Emacsens' auto-indent happy */
+extern "C" {
+#if 0 /* keep Emacsens' auto-indent happy */
 }
 #endif
 #endif
@@ -118,9 +119,9 @@ enum GNUNET_TRANSPORT_AddressClass
  * @param cls closure
  * @param hello our updated HELLO
  */
-typedef void
-(*GNUNET_TRANSPORT_HelloUpdateCallback) (void *cls,
-                                         const struct GNUNET_MessageHeader *hello);
+typedef void (*GNUNET_TRANSPORT_HelloUpdateCallback) (
+  void *cls,
+  const struct GNUNET_MessageHeader *hello);
 
 
 /**
@@ -164,12 +165,12 @@ GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh);
  * @param nt network type of the address
  * @param expiration when does this address expire?
  */
-typedef void
-(*GNUNET_TRANSPORT_AddressCallback) (void *cls,
-                                     const struct GNUNET_PeerIdentity *peer,
-                                     const char *address,
-                                     enum GNUNET_NetworkType nt,
-                                     struct GNUNET_TIME_Absolute expiration);
+typedef void (*GNUNET_TRANSPORT_AddressCallback) (
+  void *cls,
+  const struct GNUNET_PeerIdentity *peer,
+  const char *address,
+  enum GNUNET_NetworkType nt,
+  struct GNUNET_TIME_Absolute expiration);
 
 
 /**
@@ -187,7 +188,7 @@ GNUNET_TRANSPORT_hello_parse (const struct GNUNET_MessageHeader *hello,
                               void *cb_cls);
 
 
-#if 0                           /* keep Emacsens' auto-indent happy */
+#if 0 /* keep Emacsens' auto-indent happy */
 {
 #endif
 #ifdef __cplusplus
@@ -197,6 +198,6 @@ GNUNET_TRANSPORT_hello_parse (const struct GNUNET_MessageHeader *hello,
 /* ifndef GNUNET_TRANSPORT_HELLO_SERVICE_H */
 #endif
 
-/** @} */  /* end of group */
+/** @} */ /* end of group */
 
 /* end of gnunet_transport_hello_service.h */