From 664286d705905dff31298844753b12be38a079e7 Mon Sep 17 00:00:00 2001 From: t3sserakt Date: Wed, 7 Jun 2023 14:26:26 +0200 Subject: NEWS: Added __attribute__((deprecated)) to the old transport API --- src/include/gnunet_ats_application_service.h | 8 ++--- src/include/gnunet_ats_service.h | 40 ++++++++++++------------ src/include/gnunet_ats_transport_service.h | 10 +++--- src/include/gnunet_testing_ng_lib.h | 16 ++++++++++ src/include/gnunet_testing_plugin.h | 1 + src/include/gnunet_transport_hello_service.h | 8 ++--- src/include/gnunet_transport_service.h | 46 ++++++++++++++-------------- 7 files changed, 73 insertions(+), 56 deletions(-) (limited to 'src/include') diff --git a/src/include/gnunet_ats_application_service.h b/src/include/gnunet_ats_application_service.h index da7fd4b52..285b78b4e 100644 --- a/src/include/gnunet_ats_application_service.h +++ b/src/include/gnunet_ats_application_service.h @@ -55,7 +55,7 @@ struct GNUNET_ATS_ApplicationHandle; * @return ats application handle, NULL on error */ struct GNUNET_ATS_ApplicationHandle * -GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg); +GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg) __attribute__((deprecated)); /** @@ -64,7 +64,7 @@ GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg); * @param ch handle to destroy */ void -GNUNET_ATS_application_done (struct GNUNET_ATS_ApplicationHandle *ch); +GNUNET_ATS_application_done (struct GNUNET_ATS_ApplicationHandle *ch) __attribute__((deprecated)); /** @@ -89,7 +89,7 @@ struct GNUNET_ATS_ApplicationSuggestHandle * GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, const struct GNUNET_PeerIdentity *peer, enum GNUNET_MQ_PreferenceKind pk, - struct GNUNET_BANDWIDTH_Value32NBO bw); + struct GNUNET_BANDWIDTH_Value32NBO bw) __attribute__((deprecated)); /** @@ -99,7 +99,7 @@ GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, */ void GNUNET_ATS_application_suggest_cancel (struct - GNUNET_ATS_ApplicationSuggestHandle *sh); + GNUNET_ATS_ApplicationSuggestHandle *sh) __attribute__((deprecated)); /** @} */ /* end of group */ diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index ce149875a..07c649642 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h @@ -199,7 +199,7 @@ struct GNUNET_ATS_ConnectivitySuggestHandle; * @return ats connectivity handle, NULL on error */ struct GNUNET_ATS_ConnectivityHandle * -GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg); +GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg) __attribute__((deprecated)); /** @@ -208,7 +208,7 @@ GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg); * @param ch handle to destroy */ void -GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch); +GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch) __attribute__((deprecated)); /** @@ -223,7 +223,7 @@ GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch); struct GNUNET_ATS_ConnectivitySuggestHandle * GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch, const struct GNUNET_PeerIdentity *peer, - uint32_t strength); + uint32_t strength) __attribute__((deprecated)); /** @@ -233,7 +233,7 @@ GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch, */ void GNUNET_ATS_connectivity_suggest_cancel (struct - GNUNET_ATS_ConnectivitySuggestHandle *sh); + GNUNET_ATS_ConnectivitySuggestHandle *sh) __attribute__((deprecated)); /* ******************************** Scheduling API ***************************** */ @@ -288,7 +288,7 @@ typedef void struct GNUNET_ATS_SchedulingHandle * GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_ATS_AddressSuggestionCallback suggest_cb, - void *suggest_cb_cls); + void *suggest_cb_cls) __attribute__((deprecated)); /** @@ -297,7 +297,7 @@ GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg, * @param sh handle to release */ void -GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh); +GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh) __attribute__((deprecated)); /** @@ -322,7 +322,7 @@ struct GNUNET_ATS_AddressRecord * GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, const struct GNUNET_HELLO_Address *address, struct GNUNET_ATS_Session *session, - const struct GNUNET_ATS_Properties *prop); + const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); /** @@ -333,7 +333,7 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, */ void GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, - struct GNUNET_ATS_Session *session); + struct GNUNET_ATS_Session *session) __attribute__((deprecated)); /** @@ -350,7 +350,7 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, */ int GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar, - struct GNUNET_ATS_Session *session); + struct GNUNET_ATS_Session *session) __attribute__((deprecated)); /** @@ -368,7 +368,7 @@ GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar, */ void GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar, - const struct GNUNET_ATS_Properties *prop); + const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); /** @@ -378,7 +378,7 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar, * expired and ATS may no longer use it */ void -GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar); +GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar) __attribute__((deprecated)); /* ******************************** Performance API ***************************** */ @@ -434,7 +434,7 @@ struct GNUNET_ATS_AddressListHandle; struct GNUNET_ATS_PerformanceHandle * GNUNET_ATS_performance_init (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_ATS_AddressInformationCallback addr_info_cb, - void *addr_info_cb_cls); + void *addr_info_cb_cls) __attribute__((deprecated)); /** @@ -455,7 +455,7 @@ GNUNET_ATS_performance_list_addresses (struct GNUNET_ATS_PerformanceHandle *ph, int all, GNUNET_ATS_AddressInformationCallback infocb, - void *infocb_cls); + void *infocb_cls) __attribute__((deprecated)); /** @@ -465,7 +465,7 @@ GNUNET_ATS_performance_list_addresses (struct GNUNET_ATS_PerformanceHandle *ph, */ void GNUNET_ATS_performance_list_addresses_cancel (struct - GNUNET_ATS_AddressListHandle *alh); + GNUNET_ATS_AddressListHandle *alh) __attribute__((deprecated)); /** @@ -474,7 +474,7 @@ GNUNET_ATS_performance_list_addresses_cancel (struct * @param ph handle */ void -GNUNET_ATS_performance_done (struct GNUNET_ATS_PerformanceHandle *ph); +GNUNET_ATS_performance_done (struct GNUNET_ATS_PerformanceHandle *ph) __attribute__((deprecated)); /** @@ -519,7 +519,7 @@ GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph, const struct GNUNET_PeerIdentity *peer, int32_t amount, GNUNET_ATS_ReservationCallback rcb, - void *rcb_cls); + void *rcb_cls) __attribute__((deprecated)); /** @@ -528,7 +528,7 @@ GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph, * @param rc context returned by the original #GNUNET_ATS_reserve_bandwidth() call */ void -GNUNET_ATS_reserve_bandwidth_cancel (struct GNUNET_ATS_ReservationContext *rc); +GNUNET_ATS_reserve_bandwidth_cancel (struct GNUNET_ATS_ReservationContext *rc) __attribute__((deprecated)); /** @@ -579,7 +579,7 @@ enum GNUNET_ATS_PreferenceKind * @return a string or NULL if invalid */ const char * -GNUNET_ATS_print_preference_type (enum GNUNET_ATS_PreferenceKind type); +GNUNET_ATS_print_preference_type (enum GNUNET_ATS_PreferenceKind type) __attribute__((deprecated)); /** @@ -596,7 +596,7 @@ GNUNET_ATS_performance_change_preference (struct GNUNET_ATS_PerformanceHandle *ph, const struct GNUNET_PeerIdentity *peer, - ...); + ...) __attribute__((deprecated)); /** @@ -620,7 +620,7 @@ void GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph, const struct GNUNET_PeerIdentity *peer, const struct GNUNET_TIME_Relative scope, - ...); + ...) __attribute__((deprecated)); #endif diff --git a/src/include/gnunet_ats_transport_service.h b/src/include/gnunet_ats_transport_service.h index b6c7b15ae..56472a5e4 100644 --- a/src/include/gnunet_ats_transport_service.h +++ b/src/include/gnunet_ats_transport_service.h @@ -171,7 +171,7 @@ GNUNET_ATS_transport_init (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_ATS_AllocationCallback alloc_cb, void *alloc_cb_cls, GNUNET_ATS_SuggestionCallback suggest_cb, - void *suggest_cb_cls); + void *suggest_cb_cls) __attribute__((deprecated)); /** @@ -180,7 +180,7 @@ GNUNET_ATS_transport_init (const struct GNUNET_CONFIGURATION_Handle *cfg, * @param ath handle to release */ void -GNUNET_ATS_transport_done (struct GNUNET_ATS_TransportHandle *ath); +GNUNET_ATS_transport_done (struct GNUNET_ATS_TransportHandle *ath) __attribute__((deprecated)); /** @@ -208,7 +208,7 @@ GNUNET_ATS_session_add (struct GNUNET_ATS_TransportHandle *ath, const struct GNUNET_PeerIdentity *pid, const char *address, struct GNUNET_ATS_Session *session, - const struct GNUNET_ATS_Properties *prop); + const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); /** @@ -220,7 +220,7 @@ GNUNET_ATS_session_add (struct GNUNET_ATS_TransportHandle *ath, */ void GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar, - const struct GNUNET_ATS_Properties *prop); + const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); /** @@ -231,7 +231,7 @@ GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar, * @param ar session record to drop */ void -GNUNET_ATS_session_del (struct GNUNET_ATS_SessionRecord *ar); +GNUNET_ATS_session_del (struct GNUNET_ATS_SessionRecord *ar) __attribute__((deprecated)); #endif diff --git a/src/include/gnunet_testing_ng_lib.h b/src/include/gnunet_testing_ng_lib.h index aae918ff3..a691137cd 100644 --- a/src/include/gnunet_testing_ng_lib.h +++ b/src/include/gnunet_testing_ng_lib.h @@ -542,6 +542,22 @@ struct GNUNET_TESTING_Command GNUNET_TESTING_cmd_stat (struct GNUNET_TESTING_Timer *timers); +/** + * Command to execute a script. The cmd succeeds when the script exit with 0 and fails, + * when the script exits with an error code. + * + * @param label The label of the cmd. + * @param script The name of the script. + * @param script_argv Array with script args. + * @param script_argv_len Length of the array. + */ +const struct GNUNET_TESTING_Command +GNUNET_TESTING_cmd_exec_bash_script (const char *label, + const char *script, + char **script_argv, + unsigned int script_argv_len); + + /* *** Generic trait logic for implementing traits ********* */ /** diff --git a/src/include/gnunet_testing_plugin.h b/src/include/gnunet_testing_plugin.h index 12fbd7b75..019ae989e 100644 --- a/src/include/gnunet_testing_plugin.h +++ b/src/include/gnunet_testing_plugin.h @@ -40,6 +40,7 @@ extern "C" struct GNUNET_TESTING_Barrier; + /** * Callback function to write messages from the helper process running on a netjail node to the master process. * diff --git a/src/include/gnunet_transport_hello_service.h b/src/include/gnunet_transport_hello_service.h index 03305ec27..663587944 100644 --- a/src/include/gnunet_transport_hello_service.h +++ b/src/include/gnunet_transport_hello_service.h @@ -146,7 +146,7 @@ struct GNUNET_TRANSPORT_HelloGetHandle * GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg, enum GNUNET_TRANSPORT_AddressClass ac, GNUNET_TRANSPORT_HelloUpdateCallback rec, - void *rec_cls); + void *rec_cls) __attribute__((deprecated)); /** @@ -155,7 +155,7 @@ GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg, * @param ghh handle to cancel */ void -GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh); +GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh) __attribute__((deprecated)); /** @@ -172,7 +172,7 @@ typedef void (*GNUNET_TRANSPORT_AddressCallback) ( const struct GNUNET_PeerIdentity *peer, const char *address, enum GNUNET_NetworkType nt, - struct GNUNET_TIME_Absolute expiration); + struct GNUNET_TIME_Absolute expiration) __attribute__((deprecated)); /** @@ -187,7 +187,7 @@ typedef void (*GNUNET_TRANSPORT_AddressCallback) ( int GNUNET_TRANSPORT_hello_parse (const struct GNUNET_MessageHeader *hello, GNUNET_TRANSPORT_AddressCallback cb, - void *cb_cls); + void *cb_cls) __attribute__((deprecated)); #if 0 /* keep Emacsens' auto-indent happy */ diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index 72cdbe0a7..2fc40a1f5 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h @@ -60,7 +60,7 @@ extern "C" { /** * Handle for a #GNUNET_TRANSPORT_offer_hello operation */ -struct GNUNET_TRANSPORT_OfferHelloHandle; +struct GNUNET_TRANSPORT_OfferHelloHandle __attribute__((deprecated)); /** @@ -82,7 +82,7 @@ struct GNUNET_TRANSPORT_OfferHelloHandle * GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, const struct GNUNET_MessageHeader *hello, GNUNET_SCHEDULER_TaskCallback cont, - void *cont_cls); + void *cont_cls) __attribute__((deprecated)); /** @@ -92,7 +92,7 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, */ void GNUNET_TRANSPORT_offer_hello_cancel ( - struct GNUNET_TRANSPORT_OfferHelloHandle *ohh); + struct GNUNET_TRANSPORT_OfferHelloHandle *ohh) __attribute__((deprecated)); /* *********************** Address to String ******************* */ @@ -285,7 +285,7 @@ enum GNUNET_TRANSPORT_PeerState * freed (the exception being the cleanup code in #free_neighbour()). */ GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED -}; +} __attribute__((deprecated)); /** @@ -294,7 +294,7 @@ enum GNUNET_TRANSPORT_PeerState * @param state the state */ const char * -GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state); +GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state) __attribute__((deprecated)); /** @@ -304,13 +304,13 @@ GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state); * @return #GNUNET_YES or #GNUNET_NO */ int -GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state); +GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state) __attribute__((deprecated)); /** * Handle for a #GNUNET_TRANSPORT_monitor_peers operation. */ -struct GNUNET_TRANSPORT_PeerMonitoringContext; +struct GNUNET_TRANSPORT_PeerMonitoringContext __attribute__((deprecated)); /** @@ -337,7 +337,7 @@ typedef void const struct GNUNET_PeerIdentity *peer, const struct GNUNET_HELLO_Address *address, enum GNUNET_TRANSPORT_PeerState state, - struct GNUNET_TIME_Absolute state_timeout); + struct GNUNET_TIME_Absolute state_timeout) __attribute__((deprecated)); /** @@ -373,7 +373,7 @@ GNUNET_TRANSPORT_monitor_peers ( const struct GNUNET_PeerIdentity *peer, int one_shot, GNUNET_TRANSPORT_PeerIterateCallback peer_callback, - void *peer_callback_cls); + void *peer_callback_cls) __attribute__((deprecated)) __attribute__((deprecated)); /** @@ -383,7 +383,7 @@ GNUNET_TRANSPORT_monitor_peers ( */ void GNUNET_TRANSPORT_monitor_peers_cancel ( - struct GNUNET_TRANSPORT_PeerMonitoringContext *pic); + struct GNUNET_TRANSPORT_PeerMonitoringContext *pic) __attribute__((deprecated)) __attribute__((deprecated)); /* *********************** Blacklisting ************************ */ @@ -391,7 +391,7 @@ GNUNET_TRANSPORT_monitor_peers_cancel ( /** * Handle for blacklisting peers. */ -struct GNUNET_TRANSPORT_Blacklist; +struct GNUNET_TRANSPORT_Blacklist __attribute__((deprecated)); /** @@ -404,7 +404,7 @@ struct GNUNET_TRANSPORT_Blacklist; typedef int (*GNUNET_TRANSPORT_BlacklistCallback) ( void *cls, - const struct GNUNET_PeerIdentity *pid); + const struct GNUNET_PeerIdentity *pid) __attribute__((deprecated)); /** @@ -424,7 +424,7 @@ typedef int struct GNUNET_TRANSPORT_Blacklist * GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_TRANSPORT_BlacklistCallback cb, - void *cb_cls); + void *cb_cls) __attribute__((deprecated)); /** @@ -434,19 +434,19 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg, * @param br handle of the request that is to be cancelled */ void -GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br); +GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br) __attribute__((deprecated)); /** * Handle for a plugin session state monitor. */ -struct GNUNET_TRANSPORT_PluginMonitor; +struct GNUNET_TRANSPORT_PluginMonitor __attribute__((deprecated)); /** * Abstract representation of a plugin's session. * Corresponds to the `struct GNUNET_ATS_Session` within the TRANSPORT service. */ -struct GNUNET_TRANSPORT_PluginSession; +struct GNUNET_TRANSPORT_PluginSession __attribute__((deprecated)); /** @@ -480,7 +480,7 @@ enum GNUNET_TRANSPORT_SessionState * Last call for each session object. */ GNUNET_TRANSPORT_SS_DONE -}; +} __attribute__((deprecated)); /** @@ -529,7 +529,7 @@ struct GNUNET_TRANSPORT_SessionInfo * Address used by the session. Can be NULL if none is available. */ const struct GNUNET_HELLO_Address *address; -}; +} __attribute__((deprecated)); /** @@ -554,7 +554,7 @@ typedef void void *cls, struct GNUNET_TRANSPORT_PluginSession *session, void **session_ctx, - const struct GNUNET_TRANSPORT_SessionInfo *info); + const struct GNUNET_TRANSPORT_SessionInfo *info) __attribute__((deprecated)); /** @@ -569,7 +569,7 @@ typedef void struct GNUNET_TRANSPORT_PluginMonitor * GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg, GNUNET_TRANSPORT_SessionMonitorCallback cb, - void *cb_cls); + void *cb_cls) __attribute__((deprecated)); /** @@ -581,7 +581,7 @@ GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg, */ void GNUNET_TRANSPORT_monitor_plugins_cancel ( - struct GNUNET_TRANSPORT_PluginMonitor *pm); + struct GNUNET_TRANSPORT_PluginMonitor *pm) __attribute__((deprecated)); /** @@ -647,7 +647,7 @@ typedef void (*GNUNET_TRANSPORT_NotifyExcessBandwidth) ( void *cls, const struct GNUNET_PeerIdentity *neighbour, - void *handlers_cls); + void *handlers_cls) __attribute__((deprecated)); /** @@ -674,7 +674,7 @@ GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, void *cls, GNUNET_TRANSPORT_NotifyConnect nc, GNUNET_TRANSPORT_NotifyDisconnect nd, - GNUNET_TRANSPORT_NotifyExcessBandwidth neb); + GNUNET_TRANSPORT_NotifyExcessBandwidth neb) __attribute__((deprecated)); /** -- cgit v1.2.3