diff options
-rw-r--r-- | src/include/gnunet_ats_application_service.h | 8 | ||||
-rw-r--r-- | src/include/gnunet_ats_service.h | 40 | ||||
-rw-r--r-- | src/include/gnunet_ats_transport_service.h | 10 | ||||
-rw-r--r-- | src/include/gnunet_testing_ng_lib.h | 16 | ||||
-rw-r--r-- | src/include/gnunet_testing_plugin.h | 1 | ||||
-rw-r--r-- | src/include/gnunet_transport_hello_service.h | 8 | ||||
-rw-r--r-- | src/include/gnunet_transport_service.h | 46 |
7 files changed, 73 insertions, 56 deletions
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; | |||
55 | * @return ats application handle, NULL on error | 55 | * @return ats application handle, NULL on error |
56 | */ | 56 | */ |
57 | struct GNUNET_ATS_ApplicationHandle * | 57 | struct GNUNET_ATS_ApplicationHandle * |
58 | GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg); | 58 | GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg) __attribute__((deprecated)); |
59 | 59 | ||
60 | 60 | ||
61 | /** | 61 | /** |
@@ -64,7 +64,7 @@ GNUNET_ATS_application_init (const struct GNUNET_CONFIGURATION_Handle *cfg); | |||
64 | * @param ch handle to destroy | 64 | * @param ch handle to destroy |
65 | */ | 65 | */ |
66 | void | 66 | void |
67 | GNUNET_ATS_application_done (struct GNUNET_ATS_ApplicationHandle *ch); | 67 | GNUNET_ATS_application_done (struct GNUNET_ATS_ApplicationHandle *ch) __attribute__((deprecated)); |
68 | 68 | ||
69 | 69 | ||
70 | /** | 70 | /** |
@@ -89,7 +89,7 @@ struct GNUNET_ATS_ApplicationSuggestHandle * | |||
89 | GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, | 89 | GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, |
90 | const struct GNUNET_PeerIdentity *peer, | 90 | const struct GNUNET_PeerIdentity *peer, |
91 | enum GNUNET_MQ_PreferenceKind pk, | 91 | enum GNUNET_MQ_PreferenceKind pk, |
92 | struct GNUNET_BANDWIDTH_Value32NBO bw); | 92 | struct GNUNET_BANDWIDTH_Value32NBO bw) __attribute__((deprecated)); |
93 | 93 | ||
94 | 94 | ||
95 | /** | 95 | /** |
@@ -99,7 +99,7 @@ GNUNET_ATS_application_suggest (struct GNUNET_ATS_ApplicationHandle *ch, | |||
99 | */ | 99 | */ |
100 | void | 100 | void |
101 | GNUNET_ATS_application_suggest_cancel (struct | 101 | GNUNET_ATS_application_suggest_cancel (struct |
102 | GNUNET_ATS_ApplicationSuggestHandle *sh); | 102 | GNUNET_ATS_ApplicationSuggestHandle *sh) __attribute__((deprecated)); |
103 | 103 | ||
104 | /** @} */ /* end of group */ | 104 | /** @} */ /* end of group */ |
105 | 105 | ||
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; | |||
199 | * @return ats connectivity handle, NULL on error | 199 | * @return ats connectivity handle, NULL on error |
200 | */ | 200 | */ |
201 | struct GNUNET_ATS_ConnectivityHandle * | 201 | struct GNUNET_ATS_ConnectivityHandle * |
202 | GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg); | 202 | GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg) __attribute__((deprecated)); |
203 | 203 | ||
204 | 204 | ||
205 | /** | 205 | /** |
@@ -208,7 +208,7 @@ GNUNET_ATS_connectivity_init (const struct GNUNET_CONFIGURATION_Handle *cfg); | |||
208 | * @param ch handle to destroy | 208 | * @param ch handle to destroy |
209 | */ | 209 | */ |
210 | void | 210 | void |
211 | GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch); | 211 | GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch) __attribute__((deprecated)); |
212 | 212 | ||
213 | 213 | ||
214 | /** | 214 | /** |
@@ -223,7 +223,7 @@ GNUNET_ATS_connectivity_done (struct GNUNET_ATS_ConnectivityHandle *ch); | |||
223 | struct GNUNET_ATS_ConnectivitySuggestHandle * | 223 | struct GNUNET_ATS_ConnectivitySuggestHandle * |
224 | GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch, | 224 | GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch, |
225 | const struct GNUNET_PeerIdentity *peer, | 225 | const struct GNUNET_PeerIdentity *peer, |
226 | uint32_t strength); | 226 | uint32_t strength) __attribute__((deprecated)); |
227 | 227 | ||
228 | 228 | ||
229 | /** | 229 | /** |
@@ -233,7 +233,7 @@ GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch, | |||
233 | */ | 233 | */ |
234 | void | 234 | void |
235 | GNUNET_ATS_connectivity_suggest_cancel (struct | 235 | GNUNET_ATS_connectivity_suggest_cancel (struct |
236 | GNUNET_ATS_ConnectivitySuggestHandle *sh); | 236 | GNUNET_ATS_ConnectivitySuggestHandle *sh) __attribute__((deprecated)); |
237 | 237 | ||
238 | 238 | ||
239 | /* ******************************** Scheduling API ***************************** */ | 239 | /* ******************************** Scheduling API ***************************** */ |
@@ -288,7 +288,7 @@ typedef void | |||
288 | struct GNUNET_ATS_SchedulingHandle * | 288 | struct GNUNET_ATS_SchedulingHandle * |
289 | GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | 289 | GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg, |
290 | GNUNET_ATS_AddressSuggestionCallback suggest_cb, | 290 | GNUNET_ATS_AddressSuggestionCallback suggest_cb, |
291 | void *suggest_cb_cls); | 291 | void *suggest_cb_cls) __attribute__((deprecated)); |
292 | 292 | ||
293 | 293 | ||
294 | /** | 294 | /** |
@@ -297,7 +297,7 @@ GNUNET_ATS_scheduling_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
297 | * @param sh handle to release | 297 | * @param sh handle to release |
298 | */ | 298 | */ |
299 | void | 299 | void |
300 | GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh); | 300 | GNUNET_ATS_scheduling_done (struct GNUNET_ATS_SchedulingHandle *sh) __attribute__((deprecated)); |
301 | 301 | ||
302 | 302 | ||
303 | /** | 303 | /** |
@@ -322,7 +322,7 @@ struct GNUNET_ATS_AddressRecord * | |||
322 | GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, | 322 | GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, |
323 | const struct GNUNET_HELLO_Address *address, | 323 | const struct GNUNET_HELLO_Address *address, |
324 | struct GNUNET_ATS_Session *session, | 324 | struct GNUNET_ATS_Session *session, |
325 | const struct GNUNET_ATS_Properties *prop); | 325 | const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); |
326 | 326 | ||
327 | 327 | ||
328 | /** | 328 | /** |
@@ -333,7 +333,7 @@ GNUNET_ATS_address_add (struct GNUNET_ATS_SchedulingHandle *sh, | |||
333 | */ | 333 | */ |
334 | void | 334 | void |
335 | GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, | 335 | GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, |
336 | struct GNUNET_ATS_Session *session); | 336 | struct GNUNET_ATS_Session *session) __attribute__((deprecated)); |
337 | 337 | ||
338 | 338 | ||
339 | /** | 339 | /** |
@@ -350,7 +350,7 @@ GNUNET_ATS_address_add_session (struct GNUNET_ATS_AddressRecord *ar, | |||
350 | */ | 350 | */ |
351 | int | 351 | int |
352 | GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar, | 352 | GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar, |
353 | struct GNUNET_ATS_Session *session); | 353 | struct GNUNET_ATS_Session *session) __attribute__((deprecated)); |
354 | 354 | ||
355 | 355 | ||
356 | /** | 356 | /** |
@@ -368,7 +368,7 @@ GNUNET_ATS_address_del_session (struct GNUNET_ATS_AddressRecord *ar, | |||
368 | */ | 368 | */ |
369 | void | 369 | void |
370 | GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar, | 370 | GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar, |
371 | const struct GNUNET_ATS_Properties *prop); | 371 | const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); |
372 | 372 | ||
373 | 373 | ||
374 | /** | 374 | /** |
@@ -378,7 +378,7 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_AddressRecord *ar, | |||
378 | * expired and ATS may no longer use it | 378 | * expired and ATS may no longer use it |
379 | */ | 379 | */ |
380 | void | 380 | void |
381 | GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar); | 381 | GNUNET_ATS_address_destroy (struct GNUNET_ATS_AddressRecord *ar) __attribute__((deprecated)); |
382 | 382 | ||
383 | 383 | ||
384 | /* ******************************** Performance API ***************************** */ | 384 | /* ******************************** Performance API ***************************** */ |
@@ -434,7 +434,7 @@ struct GNUNET_ATS_AddressListHandle; | |||
434 | struct GNUNET_ATS_PerformanceHandle * | 434 | struct GNUNET_ATS_PerformanceHandle * |
435 | GNUNET_ATS_performance_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | 435 | GNUNET_ATS_performance_init (const struct GNUNET_CONFIGURATION_Handle *cfg, |
436 | GNUNET_ATS_AddressInformationCallback addr_info_cb, | 436 | GNUNET_ATS_AddressInformationCallback addr_info_cb, |
437 | void *addr_info_cb_cls); | 437 | void *addr_info_cb_cls) __attribute__((deprecated)); |
438 | 438 | ||
439 | 439 | ||
440 | /** | 440 | /** |
@@ -455,7 +455,7 @@ GNUNET_ATS_performance_list_addresses (struct GNUNET_ATS_PerformanceHandle *ph, | |||
455 | int all, | 455 | int all, |
456 | GNUNET_ATS_AddressInformationCallback | 456 | GNUNET_ATS_AddressInformationCallback |
457 | infocb, | 457 | infocb, |
458 | void *infocb_cls); | 458 | void *infocb_cls) __attribute__((deprecated)); |
459 | 459 | ||
460 | 460 | ||
461 | /** | 461 | /** |
@@ -465,7 +465,7 @@ GNUNET_ATS_performance_list_addresses (struct GNUNET_ATS_PerformanceHandle *ph, | |||
465 | */ | 465 | */ |
466 | void | 466 | void |
467 | GNUNET_ATS_performance_list_addresses_cancel (struct | 467 | GNUNET_ATS_performance_list_addresses_cancel (struct |
468 | GNUNET_ATS_AddressListHandle *alh); | 468 | GNUNET_ATS_AddressListHandle *alh) __attribute__((deprecated)); |
469 | 469 | ||
470 | 470 | ||
471 | /** | 471 | /** |
@@ -474,7 +474,7 @@ GNUNET_ATS_performance_list_addresses_cancel (struct | |||
474 | * @param ph handle | 474 | * @param ph handle |
475 | */ | 475 | */ |
476 | void | 476 | void |
477 | GNUNET_ATS_performance_done (struct GNUNET_ATS_PerformanceHandle *ph); | 477 | GNUNET_ATS_performance_done (struct GNUNET_ATS_PerformanceHandle *ph) __attribute__((deprecated)); |
478 | 478 | ||
479 | 479 | ||
480 | /** | 480 | /** |
@@ -519,7 +519,7 @@ GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph, | |||
519 | const struct GNUNET_PeerIdentity *peer, | 519 | const struct GNUNET_PeerIdentity *peer, |
520 | int32_t amount, | 520 | int32_t amount, |
521 | GNUNET_ATS_ReservationCallback rcb, | 521 | GNUNET_ATS_ReservationCallback rcb, |
522 | void *rcb_cls); | 522 | void *rcb_cls) __attribute__((deprecated)); |
523 | 523 | ||
524 | 524 | ||
525 | /** | 525 | /** |
@@ -528,7 +528,7 @@ GNUNET_ATS_reserve_bandwidth (struct GNUNET_ATS_PerformanceHandle *ph, | |||
528 | * @param rc context returned by the original #GNUNET_ATS_reserve_bandwidth() call | 528 | * @param rc context returned by the original #GNUNET_ATS_reserve_bandwidth() call |
529 | */ | 529 | */ |
530 | void | 530 | void |
531 | GNUNET_ATS_reserve_bandwidth_cancel (struct GNUNET_ATS_ReservationContext *rc); | 531 | GNUNET_ATS_reserve_bandwidth_cancel (struct GNUNET_ATS_ReservationContext *rc) __attribute__((deprecated)); |
532 | 532 | ||
533 | 533 | ||
534 | /** | 534 | /** |
@@ -579,7 +579,7 @@ enum GNUNET_ATS_PreferenceKind | |||
579 | * @return a string or NULL if invalid | 579 | * @return a string or NULL if invalid |
580 | */ | 580 | */ |
581 | const char * | 581 | const char * |
582 | GNUNET_ATS_print_preference_type (enum GNUNET_ATS_PreferenceKind type); | 582 | GNUNET_ATS_print_preference_type (enum GNUNET_ATS_PreferenceKind type) __attribute__((deprecated)); |
583 | 583 | ||
584 | 584 | ||
585 | /** | 585 | /** |
@@ -596,7 +596,7 @@ GNUNET_ATS_performance_change_preference (struct | |||
596 | GNUNET_ATS_PerformanceHandle *ph, | 596 | GNUNET_ATS_PerformanceHandle *ph, |
597 | const struct | 597 | const struct |
598 | GNUNET_PeerIdentity *peer, | 598 | GNUNET_PeerIdentity *peer, |
599 | ...); | 599 | ...) __attribute__((deprecated)); |
600 | 600 | ||
601 | 601 | ||
602 | /** | 602 | /** |
@@ -620,7 +620,7 @@ void | |||
620 | GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph, | 620 | GNUNET_ATS_performance_give_feedback (struct GNUNET_ATS_PerformanceHandle *ph, |
621 | const struct GNUNET_PeerIdentity *peer, | 621 | const struct GNUNET_PeerIdentity *peer, |
622 | const struct GNUNET_TIME_Relative scope, | 622 | const struct GNUNET_TIME_Relative scope, |
623 | ...); | 623 | ...) __attribute__((deprecated)); |
624 | 624 | ||
625 | #endif | 625 | #endif |
626 | 626 | ||
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, | |||
171 | GNUNET_ATS_AllocationCallback alloc_cb, | 171 | GNUNET_ATS_AllocationCallback alloc_cb, |
172 | void *alloc_cb_cls, | 172 | void *alloc_cb_cls, |
173 | GNUNET_ATS_SuggestionCallback suggest_cb, | 173 | GNUNET_ATS_SuggestionCallback suggest_cb, |
174 | void *suggest_cb_cls); | 174 | void *suggest_cb_cls) __attribute__((deprecated)); |
175 | 175 | ||
176 | 176 | ||
177 | /** | 177 | /** |
@@ -180,7 +180,7 @@ GNUNET_ATS_transport_init (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
180 | * @param ath handle to release | 180 | * @param ath handle to release |
181 | */ | 181 | */ |
182 | void | 182 | void |
183 | GNUNET_ATS_transport_done (struct GNUNET_ATS_TransportHandle *ath); | 183 | GNUNET_ATS_transport_done (struct GNUNET_ATS_TransportHandle *ath) __attribute__((deprecated)); |
184 | 184 | ||
185 | 185 | ||
186 | /** | 186 | /** |
@@ -208,7 +208,7 @@ GNUNET_ATS_session_add (struct GNUNET_ATS_TransportHandle *ath, | |||
208 | const struct GNUNET_PeerIdentity *pid, | 208 | const struct GNUNET_PeerIdentity *pid, |
209 | const char *address, | 209 | const char *address, |
210 | struct GNUNET_ATS_Session *session, | 210 | struct GNUNET_ATS_Session *session, |
211 | const struct GNUNET_ATS_Properties *prop); | 211 | const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); |
212 | 212 | ||
213 | 213 | ||
214 | /** | 214 | /** |
@@ -220,7 +220,7 @@ GNUNET_ATS_session_add (struct GNUNET_ATS_TransportHandle *ath, | |||
220 | */ | 220 | */ |
221 | void | 221 | void |
222 | GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar, | 222 | GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar, |
223 | const struct GNUNET_ATS_Properties *prop); | 223 | const struct GNUNET_ATS_Properties *prop) __attribute__((deprecated)); |
224 | 224 | ||
225 | 225 | ||
226 | /** | 226 | /** |
@@ -231,7 +231,7 @@ GNUNET_ATS_session_update (struct GNUNET_ATS_SessionRecord *ar, | |||
231 | * @param ar session record to drop | 231 | * @param ar session record to drop |
232 | */ | 232 | */ |
233 | void | 233 | void |
234 | GNUNET_ATS_session_del (struct GNUNET_ATS_SessionRecord *ar); | 234 | GNUNET_ATS_session_del (struct GNUNET_ATS_SessionRecord *ar) __attribute__((deprecated)); |
235 | 235 | ||
236 | 236 | ||
237 | #endif | 237 | #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 | |||
542 | GNUNET_TESTING_cmd_stat (struct GNUNET_TESTING_Timer *timers); | 542 | GNUNET_TESTING_cmd_stat (struct GNUNET_TESTING_Timer *timers); |
543 | 543 | ||
544 | 544 | ||
545 | /** | ||
546 | * Command to execute a script. The cmd succeeds when the script exit with 0 and fails, | ||
547 | * when the script exits with an error code. | ||
548 | * | ||
549 | * @param label The label of the cmd. | ||
550 | * @param script The name of the script. | ||
551 | * @param script_argv Array with script args. | ||
552 | * @param script_argv_len Length of the array. | ||
553 | */ | ||
554 | const struct GNUNET_TESTING_Command | ||
555 | GNUNET_TESTING_cmd_exec_bash_script (const char *label, | ||
556 | const char *script, | ||
557 | char **script_argv, | ||
558 | unsigned int script_argv_len); | ||
559 | |||
560 | |||
545 | /* *** Generic trait logic for implementing traits ********* */ | 561 | /* *** Generic trait logic for implementing traits ********* */ |
546 | 562 | ||
547 | /** | 563 | /** |
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" | |||
40 | 40 | ||
41 | struct GNUNET_TESTING_Barrier; | 41 | struct GNUNET_TESTING_Barrier; |
42 | 42 | ||
43 | |||
43 | /** | 44 | /** |
44 | * Callback function to write messages from the helper process running on a netjail node to the master process. | 45 | * Callback function to write messages from the helper process running on a netjail node to the master process. |
45 | * | 46 | * |
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 * | |||
146 | GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg, | 146 | GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg, |
147 | enum GNUNET_TRANSPORT_AddressClass ac, | 147 | enum GNUNET_TRANSPORT_AddressClass ac, |
148 | GNUNET_TRANSPORT_HelloUpdateCallback rec, | 148 | GNUNET_TRANSPORT_HelloUpdateCallback rec, |
149 | void *rec_cls); | 149 | void *rec_cls) __attribute__((deprecated)); |
150 | 150 | ||
151 | 151 | ||
152 | /** | 152 | /** |
@@ -155,7 +155,7 @@ GNUNET_TRANSPORT_hello_get (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
155 | * @param ghh handle to cancel | 155 | * @param ghh handle to cancel |
156 | */ | 156 | */ |
157 | void | 157 | void |
158 | GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh); | 158 | GNUNET_TRANSPORT_hello_get_cancel (struct GNUNET_TRANSPORT_HelloGetHandle *ghh) __attribute__((deprecated)); |
159 | 159 | ||
160 | 160 | ||
161 | /** | 161 | /** |
@@ -172,7 +172,7 @@ typedef void (*GNUNET_TRANSPORT_AddressCallback) ( | |||
172 | const struct GNUNET_PeerIdentity *peer, | 172 | const struct GNUNET_PeerIdentity *peer, |
173 | const char *address, | 173 | const char *address, |
174 | enum GNUNET_NetworkType nt, | 174 | enum GNUNET_NetworkType nt, |
175 | struct GNUNET_TIME_Absolute expiration); | 175 | struct GNUNET_TIME_Absolute expiration) __attribute__((deprecated)); |
176 | 176 | ||
177 | 177 | ||
178 | /** | 178 | /** |
@@ -187,7 +187,7 @@ typedef void (*GNUNET_TRANSPORT_AddressCallback) ( | |||
187 | int | 187 | int |
188 | GNUNET_TRANSPORT_hello_parse (const struct GNUNET_MessageHeader *hello, | 188 | GNUNET_TRANSPORT_hello_parse (const struct GNUNET_MessageHeader *hello, |
189 | GNUNET_TRANSPORT_AddressCallback cb, | 189 | GNUNET_TRANSPORT_AddressCallback cb, |
190 | void *cb_cls); | 190 | void *cb_cls) __attribute__((deprecated)); |
191 | 191 | ||
192 | 192 | ||
193 | #if 0 /* keep Emacsens' auto-indent happy */ | 193 | #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" { | |||
60 | /** | 60 | /** |
61 | * Handle for a #GNUNET_TRANSPORT_offer_hello operation | 61 | * Handle for a #GNUNET_TRANSPORT_offer_hello operation |
62 | */ | 62 | */ |
63 | struct GNUNET_TRANSPORT_OfferHelloHandle; | 63 | struct GNUNET_TRANSPORT_OfferHelloHandle __attribute__((deprecated)); |
64 | 64 | ||
65 | 65 | ||
66 | /** | 66 | /** |
@@ -82,7 +82,7 @@ struct GNUNET_TRANSPORT_OfferHelloHandle * | |||
82 | GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, | 82 | GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, |
83 | const struct GNUNET_MessageHeader *hello, | 83 | const struct GNUNET_MessageHeader *hello, |
84 | GNUNET_SCHEDULER_TaskCallback cont, | 84 | GNUNET_SCHEDULER_TaskCallback cont, |
85 | void *cont_cls); | 85 | void *cont_cls) __attribute__((deprecated)); |
86 | 86 | ||
87 | 87 | ||
88 | /** | 88 | /** |
@@ -92,7 +92,7 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
92 | */ | 92 | */ |
93 | void | 93 | void |
94 | GNUNET_TRANSPORT_offer_hello_cancel ( | 94 | GNUNET_TRANSPORT_offer_hello_cancel ( |
95 | struct GNUNET_TRANSPORT_OfferHelloHandle *ohh); | 95 | struct GNUNET_TRANSPORT_OfferHelloHandle *ohh) __attribute__((deprecated)); |
96 | 96 | ||
97 | 97 | ||
98 | /* *********************** Address to String ******************* */ | 98 | /* *********************** Address to String ******************* */ |
@@ -285,7 +285,7 @@ enum GNUNET_TRANSPORT_PeerState | |||
285 | * freed (the exception being the cleanup code in #free_neighbour()). | 285 | * freed (the exception being the cleanup code in #free_neighbour()). |
286 | */ | 286 | */ |
287 | GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED | 287 | GNUNET_TRANSPORT_PS_DISCONNECT_FINISHED |
288 | }; | 288 | } __attribute__((deprecated)); |
289 | 289 | ||
290 | 290 | ||
291 | /** | 291 | /** |
@@ -294,7 +294,7 @@ enum GNUNET_TRANSPORT_PeerState | |||
294 | * @param state the state | 294 | * @param state the state |
295 | */ | 295 | */ |
296 | const char * | 296 | const char * |
297 | GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state); | 297 | GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state) __attribute__((deprecated)); |
298 | 298 | ||
299 | 299 | ||
300 | /** | 300 | /** |
@@ -304,13 +304,13 @@ GNUNET_TRANSPORT_ps2s (enum GNUNET_TRANSPORT_PeerState state); | |||
304 | * @return #GNUNET_YES or #GNUNET_NO | 304 | * @return #GNUNET_YES or #GNUNET_NO |
305 | */ | 305 | */ |
306 | int | 306 | int |
307 | GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state); | 307 | GNUNET_TRANSPORT_is_connected (enum GNUNET_TRANSPORT_PeerState state) __attribute__((deprecated)); |
308 | 308 | ||
309 | 309 | ||
310 | /** | 310 | /** |
311 | * Handle for a #GNUNET_TRANSPORT_monitor_peers operation. | 311 | * Handle for a #GNUNET_TRANSPORT_monitor_peers operation. |
312 | */ | 312 | */ |
313 | struct GNUNET_TRANSPORT_PeerMonitoringContext; | 313 | struct GNUNET_TRANSPORT_PeerMonitoringContext __attribute__((deprecated)); |
314 | 314 | ||
315 | 315 | ||
316 | /** | 316 | /** |
@@ -337,7 +337,7 @@ typedef void | |||
337 | const struct GNUNET_PeerIdentity *peer, | 337 | const struct GNUNET_PeerIdentity *peer, |
338 | const struct GNUNET_HELLO_Address *address, | 338 | const struct GNUNET_HELLO_Address *address, |
339 | enum GNUNET_TRANSPORT_PeerState state, | 339 | enum GNUNET_TRANSPORT_PeerState state, |
340 | struct GNUNET_TIME_Absolute state_timeout); | 340 | struct GNUNET_TIME_Absolute state_timeout) __attribute__((deprecated)); |
341 | 341 | ||
342 | 342 | ||
343 | /** | 343 | /** |
@@ -373,7 +373,7 @@ GNUNET_TRANSPORT_monitor_peers ( | |||
373 | const struct GNUNET_PeerIdentity *peer, | 373 | const struct GNUNET_PeerIdentity *peer, |
374 | int one_shot, | 374 | int one_shot, |
375 | GNUNET_TRANSPORT_PeerIterateCallback peer_callback, | 375 | GNUNET_TRANSPORT_PeerIterateCallback peer_callback, |
376 | void *peer_callback_cls); | 376 | void *peer_callback_cls) __attribute__((deprecated)) __attribute__((deprecated)); |
377 | 377 | ||
378 | 378 | ||
379 | /** | 379 | /** |
@@ -383,7 +383,7 @@ GNUNET_TRANSPORT_monitor_peers ( | |||
383 | */ | 383 | */ |
384 | void | 384 | void |
385 | GNUNET_TRANSPORT_monitor_peers_cancel ( | 385 | GNUNET_TRANSPORT_monitor_peers_cancel ( |
386 | struct GNUNET_TRANSPORT_PeerMonitoringContext *pic); | 386 | struct GNUNET_TRANSPORT_PeerMonitoringContext *pic) __attribute__((deprecated)) __attribute__((deprecated)); |
387 | 387 | ||
388 | 388 | ||
389 | /* *********************** Blacklisting ************************ */ | 389 | /* *********************** Blacklisting ************************ */ |
@@ -391,7 +391,7 @@ GNUNET_TRANSPORT_monitor_peers_cancel ( | |||
391 | /** | 391 | /** |
392 | * Handle for blacklisting peers. | 392 | * Handle for blacklisting peers. |
393 | */ | 393 | */ |
394 | struct GNUNET_TRANSPORT_Blacklist; | 394 | struct GNUNET_TRANSPORT_Blacklist __attribute__((deprecated)); |
395 | 395 | ||
396 | 396 | ||
397 | /** | 397 | /** |
@@ -404,7 +404,7 @@ struct GNUNET_TRANSPORT_Blacklist; | |||
404 | typedef int | 404 | typedef int |
405 | (*GNUNET_TRANSPORT_BlacklistCallback) ( | 405 | (*GNUNET_TRANSPORT_BlacklistCallback) ( |
406 | void *cls, | 406 | void *cls, |
407 | const struct GNUNET_PeerIdentity *pid); | 407 | const struct GNUNET_PeerIdentity *pid) __attribute__((deprecated)); |
408 | 408 | ||
409 | 409 | ||
410 | /** | 410 | /** |
@@ -424,7 +424,7 @@ typedef int | |||
424 | struct GNUNET_TRANSPORT_Blacklist * | 424 | struct GNUNET_TRANSPORT_Blacklist * |
425 | GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg, | 425 | GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg, |
426 | GNUNET_TRANSPORT_BlacklistCallback cb, | 426 | GNUNET_TRANSPORT_BlacklistCallback cb, |
427 | void *cb_cls); | 427 | void *cb_cls) __attribute__((deprecated)); |
428 | 428 | ||
429 | 429 | ||
430 | /** | 430 | /** |
@@ -434,19 +434,19 @@ GNUNET_TRANSPORT_blacklist (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
434 | * @param br handle of the request that is to be cancelled | 434 | * @param br handle of the request that is to be cancelled |
435 | */ | 435 | */ |
436 | void | 436 | void |
437 | GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br); | 437 | GNUNET_TRANSPORT_blacklist_cancel (struct GNUNET_TRANSPORT_Blacklist *br) __attribute__((deprecated)); |
438 | 438 | ||
439 | 439 | ||
440 | /** | 440 | /** |
441 | * Handle for a plugin session state monitor. | 441 | * Handle for a plugin session state monitor. |
442 | */ | 442 | */ |
443 | struct GNUNET_TRANSPORT_PluginMonitor; | 443 | struct GNUNET_TRANSPORT_PluginMonitor __attribute__((deprecated)); |
444 | 444 | ||
445 | /** | 445 | /** |
446 | * Abstract representation of a plugin's session. | 446 | * Abstract representation of a plugin's session. |
447 | * Corresponds to the `struct GNUNET_ATS_Session` within the TRANSPORT service. | 447 | * Corresponds to the `struct GNUNET_ATS_Session` within the TRANSPORT service. |
448 | */ | 448 | */ |
449 | struct GNUNET_TRANSPORT_PluginSession; | 449 | struct GNUNET_TRANSPORT_PluginSession __attribute__((deprecated)); |
450 | 450 | ||
451 | 451 | ||
452 | /** | 452 | /** |
@@ -480,7 +480,7 @@ enum GNUNET_TRANSPORT_SessionState | |||
480 | * Last call for each session object. | 480 | * Last call for each session object. |
481 | */ | 481 | */ |
482 | GNUNET_TRANSPORT_SS_DONE | 482 | GNUNET_TRANSPORT_SS_DONE |
483 | }; | 483 | } __attribute__((deprecated)); |
484 | 484 | ||
485 | 485 | ||
486 | /** | 486 | /** |
@@ -529,7 +529,7 @@ struct GNUNET_TRANSPORT_SessionInfo | |||
529 | * Address used by the session. Can be NULL if none is available. | 529 | * Address used by the session. Can be NULL if none is available. |
530 | */ | 530 | */ |
531 | const struct GNUNET_HELLO_Address *address; | 531 | const struct GNUNET_HELLO_Address *address; |
532 | }; | 532 | } __attribute__((deprecated)); |
533 | 533 | ||
534 | 534 | ||
535 | /** | 535 | /** |
@@ -554,7 +554,7 @@ typedef void | |||
554 | void *cls, | 554 | void *cls, |
555 | struct GNUNET_TRANSPORT_PluginSession *session, | 555 | struct GNUNET_TRANSPORT_PluginSession *session, |
556 | void **session_ctx, | 556 | void **session_ctx, |
557 | const struct GNUNET_TRANSPORT_SessionInfo *info); | 557 | const struct GNUNET_TRANSPORT_SessionInfo *info) __attribute__((deprecated)); |
558 | 558 | ||
559 | 559 | ||
560 | /** | 560 | /** |
@@ -569,7 +569,7 @@ typedef void | |||
569 | struct GNUNET_TRANSPORT_PluginMonitor * | 569 | struct GNUNET_TRANSPORT_PluginMonitor * |
570 | GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg, | 570 | GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg, |
571 | GNUNET_TRANSPORT_SessionMonitorCallback cb, | 571 | GNUNET_TRANSPORT_SessionMonitorCallback cb, |
572 | void *cb_cls); | 572 | void *cb_cls) __attribute__((deprecated)); |
573 | 573 | ||
574 | 574 | ||
575 | /** | 575 | /** |
@@ -581,7 +581,7 @@ GNUNET_TRANSPORT_monitor_plugins (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
581 | */ | 581 | */ |
582 | void | 582 | void |
583 | GNUNET_TRANSPORT_monitor_plugins_cancel ( | 583 | GNUNET_TRANSPORT_monitor_plugins_cancel ( |
584 | struct GNUNET_TRANSPORT_PluginMonitor *pm); | 584 | struct GNUNET_TRANSPORT_PluginMonitor *pm) __attribute__((deprecated)); |
585 | 585 | ||
586 | 586 | ||
587 | /** | 587 | /** |
@@ -647,7 +647,7 @@ typedef void | |||
647 | (*GNUNET_TRANSPORT_NotifyExcessBandwidth) ( | 647 | (*GNUNET_TRANSPORT_NotifyExcessBandwidth) ( |
648 | void *cls, | 648 | void *cls, |
649 | const struct GNUNET_PeerIdentity *neighbour, | 649 | const struct GNUNET_PeerIdentity *neighbour, |
650 | void *handlers_cls); | 650 | void *handlers_cls) __attribute__((deprecated)); |
651 | 651 | ||
652 | 652 | ||
653 | /** | 653 | /** |
@@ -674,7 +674,7 @@ GNUNET_TRANSPORT_core_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
674 | void *cls, | 674 | void *cls, |
675 | GNUNET_TRANSPORT_NotifyConnect nc, | 675 | GNUNET_TRANSPORT_NotifyConnect nc, |
676 | GNUNET_TRANSPORT_NotifyDisconnect nd, | 676 | GNUNET_TRANSPORT_NotifyDisconnect nd, |
677 | GNUNET_TRANSPORT_NotifyExcessBandwidth neb); | 677 | GNUNET_TRANSPORT_NotifyExcessBandwidth neb) __attribute__((deprecated)); |
678 | 678 | ||
679 | 679 | ||
680 | /** | 680 | /** |