diff options
22 files changed, 14 insertions, 332 deletions
diff --git a/src/include/gnunet_transport_communication_service.h b/src/include/gnunet_transport_communication_service.h index 9b536297e..7bab86e1a 100644 --- a/src/include/gnunet_transport_communication_service.h +++ b/src/include/gnunet_transport_communication_service.h | |||
@@ -138,7 +138,8 @@ typedef void (*GNUNET_TRANSPORT_CommunicatorNotify) ( | |||
138 | * Connect to the transport service. | 138 | * Connect to the transport service. |
139 | * | 139 | * |
140 | * @param cfg configuration to use | 140 | * @param cfg configuration to use |
141 | * @param config_section section of the configuration to use for options | 141 | * @param config_section_name section of the configuration to use for |
142 | * options | ||
142 | * @param addr_prefix address prefix for addresses supported by this | 143 | * @param addr_prefix address prefix for addresses supported by this |
143 | * communicator, could be NULL for incoming-only communicators | 144 | * communicator, could be NULL for incoming-only communicators |
144 | * @param cc what characteristics does the communicator have? | 145 | * @param cc what characteristics does the communicator have? |
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index 99246f136..daa79bf1c 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h | |||
@@ -360,8 +360,9 @@ typedef void | |||
360 | * @param cfg configuration to use | 360 | * @param cfg configuration to use |
361 | * @param peer a specific peer identity to obtain information for, | 361 | * @param peer a specific peer identity to obtain information for, |
362 | * NULL for all peers | 362 | * NULL for all peers |
363 | * @param one_shot #GNUNET_YES to return the current state and then end (with | 363 | * @param one_shot #GNUNET_YES to return the current state and |
364 | * NULL+NULL), #GNUNET_NO to monitor peers continuously | 364 | * then end (with NULL+NULL), |
365 | * #GNUNET_NO to monitor peers continuously | ||
365 | * @param peer_callback function to call with the results | 366 | * @param peer_callback function to call with the results |
366 | * @param peer_callback_cls closure for @a peer_callback | 367 | * @param peer_callback_cls closure for @a peer_callback |
367 | */ | 368 | */ |
diff --git a/src/transport/gnunet-service-tng.c b/src/transport/gnunet-service-tng.c index 7ea34735b..9b2b920d1 100644 --- a/src/transport/gnunet-service-tng.c +++ b/src/transport/gnunet-service-tng.c | |||
@@ -4668,7 +4668,7 @@ dv_hmac (const struct DVKeyState *key, | |||
4668 | * Perform backchannel encryption using symmetric secret in @a key | 4668 | * Perform backchannel encryption using symmetric secret in @a key |
4669 | * to encrypt data from @a in to @a dst. | 4669 | * to encrypt data from @a in to @a dst. |
4670 | * | 4670 | * |
4671 | * @param key[in,out] key material to use | 4671 | * @param[in,out] key key material to use |
4672 | * @param dst where to write the result | 4672 | * @param dst where to write the result |
4673 | * @param in input data to encrypt (plaintext) | 4673 | * @param in input data to encrypt (plaintext) |
4674 | * @param in_size number of bytes of input in @a in and available at @a dst | 4674 | * @param in_size number of bytes of input in @a in and available at @a dst |
@@ -4685,9 +4685,9 @@ dv_encrypt (struct DVKeyState *key, const void *in, void *dst, size_t in_size) | |||
4685 | * Perform backchannel encryption using symmetric secret in @a key | 4685 | * Perform backchannel encryption using symmetric secret in @a key |
4686 | * to encrypt data from @a in to @a dst. | 4686 | * to encrypt data from @a in to @a dst. |
4687 | * | 4687 | * |
4688 | * @param key[in,out] key material to use | 4688 | * @param[in,out] key key material to use |
4689 | * @param ciph cipher text to decrypt | 4689 | * @param ciph cipher text to decrypt |
4690 | * @param out[out] output data to generate (plaintext) | 4690 | * @param[out] out output data to generate (plaintext) |
4691 | * @param out_size number of bytes of input in @a ciph and available in @a out | 4691 | * @param out_size number of bytes of input in @a ciph and available in @a out |
4692 | */ | 4692 | */ |
4693 | static void | 4693 | static void |
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 345a0d949..463bcc628 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -2486,11 +2486,6 @@ GST_blacklist_test_allowed (const struct GNUNET_PeerIdentity *peer, | |||
2486 | } | 2486 | } |
2487 | 2487 | ||
2488 | 2488 | ||
2489 | /** | ||
2490 | * Cancel a blacklist check. | ||
2491 | * | ||
2492 | * @param bc check to cancel | ||
2493 | */ | ||
2494 | void | 2489 | void |
2495 | GST_blacklist_test_cancel (struct GST_BlacklistCheck *bc) | 2490 | GST_blacklist_test_cancel (struct GST_BlacklistCheck *bc) |
2496 | { | 2491 | { |
diff --git a/src/transport/gnunet-service-transport_ats.c b/src/transport/gnunet-service-transport_ats.c index 130311e15..2438a0a48 100644 --- a/src/transport/gnunet-service-transport_ats.c +++ b/src/transport/gnunet-service-transport_ats.c | |||
@@ -477,13 +477,6 @@ GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address, | |||
477 | } | 477 | } |
478 | 478 | ||
479 | 479 | ||
480 | /** | ||
481 | * Notify ATS about the new address including the network this address is | ||
482 | * located in. The address must NOT be inbound and must be new to ATS. | ||
483 | * | ||
484 | * @param address the address | ||
485 | * @param prop performance information | ||
486 | */ | ||
487 | void | 480 | void |
488 | GST_ats_add_address (const struct GNUNET_HELLO_Address *address, | 481 | GST_ats_add_address (const struct GNUNET_HELLO_Address *address, |
489 | const struct GNUNET_ATS_Properties *prop) | 482 | const struct GNUNET_ATS_Properties *prop) |
@@ -755,13 +748,6 @@ GST_ats_update_distance (const struct GNUNET_HELLO_Address *address, | |||
755 | } | 748 | } |
756 | 749 | ||
757 | 750 | ||
758 | /** | ||
759 | * Notify ATS about @a delay changes to properties of an @a address. | ||
760 | * Does nothing if the @a address is not known to us. | ||
761 | * | ||
762 | * @param address the address | ||
763 | * @param delay new delay value | ||
764 | */ | ||
765 | void | 751 | void |
766 | GST_ats_update_delay (const struct GNUNET_HELLO_Address *address, | 752 | GST_ats_update_delay (const struct GNUNET_HELLO_Address *address, |
767 | struct GNUNET_TIME_Relative delay) | 753 | struct GNUNET_TIME_Relative delay) |
diff --git a/src/transport/gnunet-service-transport_ats.h b/src/transport/gnunet-service-transport_ats.h index d536714ec..ca972d1cc 100644 --- a/src/transport/gnunet-service-transport_ats.h +++ b/src/transport/gnunet-service-transport_ats.h | |||
@@ -110,7 +110,7 @@ GST_ats_add_inbound_address (const struct GNUNET_HELLO_Address *address, | |||
110 | 110 | ||
111 | 111 | ||
112 | /** | 112 | /** |
113 | * Notify ATS about a new address including the network this address is | 113 | * Notify ATS about a new address including the network the address is |
114 | * located in. The address must NOT be inbound and must be new to ATS. | 114 | * located in. The address must NOT be inbound and must be new to ATS. |
115 | * | 115 | * |
116 | * @param address the address | 116 | * @param address the address |
@@ -154,7 +154,6 @@ GST_ats_update_utilization (const struct GNUNET_HELLO_Address *address, | |||
154 | * Does nothing if the @a address is not known to us. | 154 | * Does nothing if the @a address is not known to us. |
155 | * | 155 | * |
156 | * @param address the address | 156 | * @param address the address |
157 | * @param session the session | ||
158 | * @param delay new delay value | 157 | * @param delay new delay value |
159 | */ | 158 | */ |
160 | void | 159 | void |
diff --git a/src/transport/gnunet-service-transport_hello.c b/src/transport/gnunet-service-transport_hello.c index 472c77c27..1e5e8a225 100644 --- a/src/transport/gnunet-service-transport_hello.c +++ b/src/transport/gnunet-service-transport_hello.c | |||
@@ -334,16 +334,6 @@ GST_hello_modify_addresses (int addremove, | |||
334 | } | 334 | } |
335 | 335 | ||
336 | 336 | ||
337 | /** | ||
338 | * Test if a particular address is one of ours. | ||
339 | * | ||
340 | * @param address address to test | ||
341 | * @param sig location where to cache PONG signatures for this address [set] | ||
342 | * @param sig_expiration how long until the current 'sig' expires? | ||
343 | * (ZERO if sig was never created) [set] | ||
344 | * @return #GNUNET_YES if this is one of our addresses, | ||
345 | * #GNUNET_NO if not | ||
346 | */ | ||
347 | int | 337 | int |
348 | GST_hello_test_address (const struct GNUNET_HELLO_Address *address, | 338 | GST_hello_test_address (const struct GNUNET_HELLO_Address *address, |
349 | struct GNUNET_CRYPTO_EddsaSignature **sig, | 339 | struct GNUNET_CRYPTO_EddsaSignature **sig, |
diff --git a/src/transport/gnunet-service-transport_neighbours.c b/src/transport/gnunet-service-transport_neighbours.c index ca1b4d1da..e61441d9f 100644 --- a/src/transport/gnunet-service-transport_neighbours.c +++ b/src/transport/gnunet-service-transport_neighbours.c | |||
@@ -1768,16 +1768,6 @@ GST_neighbours_calculate_receive_delay (const struct | |||
1768 | } | 1768 | } |
1769 | 1769 | ||
1770 | 1770 | ||
1771 | /** | ||
1772 | * Transmit a message to the given target using the active connection. | ||
1773 | * | ||
1774 | * @param target destination | ||
1775 | * @param msg message to send | ||
1776 | * @param msg_size number of bytes in msg | ||
1777 | * @param timeout when to fail with timeout | ||
1778 | * @param cont function to call when done | ||
1779 | * @param cont_cls closure for @a cont | ||
1780 | */ | ||
1781 | void | 1771 | void |
1782 | GST_neighbours_send (const struct GNUNET_PeerIdentity *target, | 1772 | GST_neighbours_send (const struct GNUNET_PeerIdentity *target, |
1783 | const void *msg, | 1773 | const void *msg, |
@@ -3019,13 +3009,6 @@ GST_neighbours_notify_data_sent (const struct GNUNET_HELLO_Address *address, | |||
3019 | } | 3009 | } |
3020 | 3010 | ||
3021 | 3011 | ||
3022 | /** | ||
3023 | * Master task run for every neighbour. Performs all of the time-related | ||
3024 | * activities (keep alive, send next message, disconnect if idle, finish | ||
3025 | * clean up after disconnect). | ||
3026 | * | ||
3027 | * @param cls the 'struct NeighbourMapEntry' for which we are running | ||
3028 | */ | ||
3029 | static void | 3012 | static void |
3030 | master_task (void *cls) | 3013 | master_task (void *cls) |
3031 | { | 3014 | { |
@@ -3646,13 +3629,6 @@ delayed_disconnect (void *cls) | |||
3646 | } | 3629 | } |
3647 | 3630 | ||
3648 | 3631 | ||
3649 | /** | ||
3650 | * We received a quota message from the given peer, | ||
3651 | * validate and process. | ||
3652 | * | ||
3653 | * @param peer sender of the message | ||
3654 | * @param msg the quota message | ||
3655 | */ | ||
3656 | void | 3632 | void |
3657 | GST_neighbours_handle_quota_message (const struct GNUNET_PeerIdentity *peer, | 3633 | GST_neighbours_handle_quota_message (const struct GNUNET_PeerIdentity *peer, |
3658 | const struct GNUNET_MessageHeader *msg) | 3634 | const struct GNUNET_MessageHeader *msg) |
diff --git a/src/transport/gnunet-service-transport_neighbours.h b/src/transport/gnunet-service-transport_neighbours.h index 13aeab4e6..7ce911aa1 100644 --- a/src/transport/gnunet-service-transport_neighbours.h +++ b/src/transport/gnunet-service-transport_neighbours.h | |||
@@ -292,7 +292,7 @@ GST_neighbour_get_current_address (const struct GNUNET_PeerIdentity *peer); | |||
292 | 292 | ||
293 | 293 | ||
294 | /** | 294 | /** |
295 | * We received a quoat message from the given peer, | 295 | * We received a quota message from the given peer, |
296 | * validate and process. | 296 | * validate and process. |
297 | * | 297 | * |
298 | * @param peer sender of the message | 298 | * @param peer sender of the message |
diff --git a/src/transport/gnunet-service-transport_plugins.c b/src/transport/gnunet-service-transport_plugins.c index c88532806..1a22335f4 100644 --- a/src/transport/gnunet-service-transport_plugins.c +++ b/src/transport/gnunet-service-transport_plugins.c | |||
@@ -121,18 +121,6 @@ plugin_env_address_to_type (void *cls, | |||
121 | } | 121 | } |
122 | 122 | ||
123 | 123 | ||
124 | /** | ||
125 | * Load and initialize all plugins. The respective functions will be | ||
126 | * invoked by the plugins when the respective events happen. The | ||
127 | * closure will be set to a 'const char*' containing the name of the | ||
128 | * plugin that caused the call. | ||
129 | * | ||
130 | * @param recv_cb function to call when data is received | ||
131 | * @param address_cb function to call when our public addresses changed | ||
132 | * @param session_start_cb function to call when a session was created | ||
133 | * @param session_end_cb function to call when a session was terminated | ||
134 | * @param address_type_cb function to call when a address type is requested | ||
135 | */ | ||
136 | void | 124 | void |
137 | GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb, | 125 | GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb, |
138 | GNUNET_TRANSPORT_AddressNotification address_cb, | 126 | GNUNET_TRANSPORT_AddressNotification address_cb, |
@@ -431,12 +419,6 @@ GST_plugins_a2s (const struct GNUNET_HELLO_Address *address) | |||
431 | } | 419 | } |
432 | 420 | ||
433 | 421 | ||
434 | /** | ||
435 | * Register callback with all plugins to monitor their status. | ||
436 | * | ||
437 | * @param cb callback to register, NULL to unsubscribe | ||
438 | * @param cb_cls closure for @a cb | ||
439 | */ | ||
440 | void | 422 | void |
441 | GST_plugins_monitor_subscribe (GNUNET_TRANSPORT_SessionInfoCallback cb, | 423 | GST_plugins_monitor_subscribe (GNUNET_TRANSPORT_SessionInfoCallback cb, |
442 | void *cb_cls) | 424 | void *cb_cls) |
diff --git a/src/transport/gnunet-service-transport_plugins.h b/src/transport/gnunet-service-transport_plugins.h index 0e69da074..fdd819fc5 100644 --- a/src/transport/gnunet-service-transport_plugins.h +++ b/src/transport/gnunet-service-transport_plugins.h | |||
@@ -40,13 +40,9 @@ | |||
40 | * plugin that caused the call. | 40 | * plugin that caused the call. |
41 | * | 41 | * |
42 | * @param recv_cb function to call when data is received | 42 | * @param recv_cb function to call when data is received |
43 | * @param register_quota_cb function to call to register a quota callback | ||
44 | * @param unregister_quota_cb function to call to unregister a quota callback | ||
45 | * @param address_cb function to call when our public addresses changed | 43 | * @param address_cb function to call when our public addresses changed |
46 | * @param session_start_cb function to call when a session was created | 44 | * @param session_start_cb function to call when a session was created |
47 | * @param session_end_cb function to call when a session was terminated | 45 | * @param session_end_cb function to call when a session was terminated |
48 | * @param address_type_cb function to call when a address type is requested | ||
49 | * @param metric_update_cb function to call when address metrics change | ||
50 | */ | 46 | */ |
51 | void | 47 | void |
52 | GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb, | 48 | GST_plugins_load (GNUNET_TRANSPORT_PluginReceiveCallback recv_cb, |
diff --git a/src/transport/plugin_transport_http_client.c b/src/transport/plugin_transport_http_client.c index 476a3cd52..82468992b 100644 --- a/src/transport/plugin_transport_http_client.c +++ b/src/transport/plugin_transport_http_client.c | |||
@@ -556,7 +556,6 @@ client_reschedule_session_timeout (struct GNUNET_ATS_Session *s) | |||
556 | * Task performing curl operations | 556 | * Task performing curl operations |
557 | * | 557 | * |
558 | * @param cls plugin as closure | 558 | * @param cls plugin as closure |
559 | * @param tc gnunet scheduler task context | ||
560 | */ | 559 | */ |
561 | static void | 560 | static void |
562 | client_run (void *cls); | 561 | client_run (void *cls); |
@@ -1289,11 +1288,6 @@ client_receive (void *stream, | |||
1289 | } | 1288 | } |
1290 | 1289 | ||
1291 | 1290 | ||
1292 | /** | ||
1293 | * Task performing curl operations | ||
1294 | * | ||
1295 | * @param cls plugin as closure | ||
1296 | */ | ||
1297 | static void | 1291 | static void |
1298 | client_run (void *cls) | 1292 | client_run (void *cls) |
1299 | { | 1293 | { |
diff --git a/src/transport/plugin_transport_http_common.c b/src/transport/plugin_transport_http_common.c index 75bf8b74a..40353daeb 100644 --- a/src/transport/plugin_transport_http_common.c +++ b/src/transport/plugin_transport_http_common.c | |||
@@ -407,20 +407,6 @@ http_common_dns_ip_lookup (const char *name, | |||
407 | } | 407 | } |
408 | 408 | ||
409 | 409 | ||
410 | /** | ||
411 | * Convert the transports address to a nice, human-readable | ||
412 | * format. | ||
413 | * | ||
414 | * @param cls closure | ||
415 | * @param type name of the transport that generated the address | ||
416 | * @param addr one of the addresses of the host, NULL for the last address | ||
417 | * the specific address format depends on the transport | ||
418 | * @param addrlen length of the @a addr | ||
419 | * @param numeric should (IP) addresses be displayed in numeric form? | ||
420 | * @param timeout after how long should we give up? | ||
421 | * @param asc function to call on each string | ||
422 | * @param asc_cls closure for @a asc | ||
423 | */ | ||
424 | void | 410 | void |
425 | http_common_plugin_address_pretty_printer (void *cls, const char *type, | 411 | http_common_plugin_address_pretty_printer (void *cls, const char *type, |
426 | const void *addr, | 412 | const void *addr, |
@@ -597,17 +583,6 @@ http_common_plugin_address_to_url (void *cls, | |||
597 | } | 583 | } |
598 | 584 | ||
599 | 585 | ||
600 | /** | ||
601 | * Function called for a quick conversion of the binary address to | ||
602 | * a numeric address. Note that the caller must not free the | ||
603 | * address and that the next call to this function is allowed | ||
604 | * to override the address again. | ||
605 | * | ||
606 | * @param plugin the name of the plugin | ||
607 | * @param addr binary address | ||
608 | * @param addrlen length of the address | ||
609 | * @return string representing the same address | ||
610 | */ | ||
611 | const char * | 586 | const char * |
612 | http_common_plugin_address_to_string (const char *plugin, | 587 | http_common_plugin_address_to_string (const char *plugin, |
613 | const void *addr, | 588 | const void *addr, |
@@ -642,18 +617,6 @@ http_common_plugin_address_to_string (const char *plugin, | |||
642 | } | 617 | } |
643 | 618 | ||
644 | 619 | ||
645 | /** | ||
646 | * Function called to convert a string address to | ||
647 | * a binary address. | ||
648 | * | ||
649 | * @param cls closure ('struct Plugin*') | ||
650 | * @param addr string address | ||
651 | * @param addrlen length of the @a addr | ||
652 | * @param buf location to store the buffer | ||
653 | * If the function returns #GNUNET_SYSERR, its contents are undefined. | ||
654 | * @param added length of created address | ||
655 | * @return #GNUNET_OK on success, #GNUNET_SYSERR on failure | ||
656 | */ | ||
657 | int | 620 | int |
658 | http_common_plugin_string_to_address (void *cls, | 621 | http_common_plugin_string_to_address (void *cls, |
659 | const char *addr, | 622 | const char *addr, |
@@ -721,14 +684,6 @@ http_common_plugin_string_to_address (void *cls, | |||
721 | } | 684 | } |
722 | 685 | ||
723 | 686 | ||
724 | /** | ||
725 | * Create a HTTP address from a socketaddr | ||
726 | * | ||
727 | * @param protocol protocol | ||
728 | * @param addr sockaddr * address | ||
729 | * @param addrlen length of the address | ||
730 | * @return the HttpAddress | ||
731 | */ | ||
732 | struct HttpAddress * | 687 | struct HttpAddress * |
733 | http_common_address_from_socket (const char *protocol, | 688 | http_common_address_from_socket (const char *protocol, |
734 | const struct sockaddr *addr, | 689 | const struct sockaddr *addr, |
diff --git a/src/transport/plugin_transport_http_common.h b/src/transport/plugin_transport_http_common.h index 299dc0e68..7a532249d 100644 --- a/src/transport/plugin_transport_http_common.h +++ b/src/transport/plugin_transport_http_common.h | |||
@@ -137,7 +137,7 @@ http_split_address (const char *addr); | |||
137 | * @param type name of the transport that generated the address | 137 | * @param type name of the transport that generated the address |
138 | * @param addr one of the addresses of the host, NULL for the last address | 138 | * @param addr one of the addresses of the host, NULL for the last address |
139 | * the specific address format depends on the transport | 139 | * the specific address format depends on the transport |
140 | * @param addrlen length of the address | 140 | * @param addrlen length of @a addr |
141 | * @param numeric should (IP) addresses be displayed in numeric form? | 141 | * @param numeric should (IP) addresses be displayed in numeric form? |
142 | * @param timeout after how long should we give up? | 142 | * @param timeout after how long should we give up? |
143 | * @param asc function to call on each string | 143 | * @param asc function to call on each string |
@@ -178,7 +178,7 @@ http_common_plugin_address_to_string (const char *plugin, | |||
178 | * | 178 | * |
179 | * @param cls closure (`struct Plugin*`) | 179 | * @param cls closure (`struct Plugin*`) |
180 | * @param addr string address | 180 | * @param addr string address |
181 | * @param addrlen length of the address | 181 | * @param addrlen length of @a addr |
182 | * @param buf location to store the buffer | 182 | * @param buf location to store the buffer |
183 | * If the function returns #GNUNET_SYSERR, its contents are undefined. | 183 | * If the function returns #GNUNET_SYSERR, its contents are undefined. |
184 | * @param added length of created address | 184 | * @param added length of created address |
@@ -198,7 +198,7 @@ http_common_plugin_string_to_address (void *cls, | |||
198 | * @param protocol protocol | 198 | * @param protocol protocol |
199 | * @param addr `sockaddr *` address | 199 | * @param addr `sockaddr *` address |
200 | * @param addrlen length of the @a addr | 200 | * @param addrlen length of the @a addr |
201 | * @return the string | 201 | * @return A pointer to a `struct HttpAddress` derived from @a addr |
202 | */ | 202 | */ |
203 | struct HttpAddress * | 203 | struct HttpAddress * |
204 | http_common_address_from_socket (const char *protocol, | 204 | http_common_address_from_socket (const char *protocol, |
diff --git a/src/transport/tcp_server_legacy.c b/src/transport/tcp_server_legacy.c index f4d48d4f6..bb572c843 100644 --- a/src/transport/tcp_server_legacy.c +++ b/src/transport/tcp_server_legacy.c | |||
@@ -699,11 +699,6 @@ GNUNET_SERVER_suspend (struct GNUNET_SERVER_Handle *server) | |||
699 | } | 699 | } |
700 | 700 | ||
701 | 701 | ||
702 | /** | ||
703 | * Resume accepting connections from the listen socket. | ||
704 | * | ||
705 | * @param server server to stop accepting connections. | ||
706 | */ | ||
707 | void | 702 | void |
708 | GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server) | 703 | GNUNET_SERVER_resume (struct GNUNET_SERVER_Handle *server) |
709 | { | 704 | { |
@@ -1620,21 +1615,6 @@ transmit_ready_callback_wrapper (void *cls, size_t size, void *buf) | |||
1620 | } | 1615 | } |
1621 | 1616 | ||
1622 | 1617 | ||
1623 | /** | ||
1624 | * Notify us when the server has enough space to transmit | ||
1625 | * a message of the given size to the given client. | ||
1626 | * | ||
1627 | * @param client client to transmit message to | ||
1628 | * @param size requested amount of buffer space | ||
1629 | * @param timeout after how long should we give up (and call | ||
1630 | * notify with buf NULL and size 0)? | ||
1631 | * @param callback function to call when space is available | ||
1632 | * @param callback_cls closure for @a callback | ||
1633 | * @return non-NULL if the notify callback was queued; can be used | ||
1634 | * to cancel the request using | ||
1635 | * #GNUNET_SERVER_notify_transmit_ready_cancel(). | ||
1636 | * NULL if we are already going to notify someone else (busy) | ||
1637 | */ | ||
1638 | struct GNUNET_SERVER_TransmitHandle * | 1618 | struct GNUNET_SERVER_TransmitHandle * |
1639 | GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, | 1619 | GNUNET_SERVER_notify_transmit_ready (struct GNUNET_SERVER_Client *client, |
1640 | size_t size, | 1620 | size_t size, |
diff --git a/src/transport/transport-testing-filenames.c b/src/transport/transport-testing-filenames.c index 7c136b690..70c1ee55a 100644 --- a/src/transport/transport-testing-filenames.c +++ b/src/transport/transport-testing-filenames.c | |||
@@ -61,13 +61,6 @@ extract_filename (const char *file) | |||
61 | } | 61 | } |
62 | 62 | ||
63 | 63 | ||
64 | /** | ||
65 | * Extracts the test filename from an absolute file name and removes | ||
66 | * the extension | ||
67 | * | ||
68 | * @param file absolute file name | ||
69 | * @return the result | ||
70 | */ | ||
71 | char * | 64 | char * |
72 | GNUNET_TRANSPORT_TESTING_get_test_name (const char *file) | 65 | GNUNET_TRANSPORT_TESTING_get_test_name (const char *file) |
73 | { | 66 | { |
@@ -96,12 +89,6 @@ GNUNET_TRANSPORT_TESTING_get_test_name (const char *file) | |||
96 | } | 89 | } |
97 | 90 | ||
98 | 91 | ||
99 | /** | ||
100 | * Extracts the filename from an absolute file name and removes the extension | ||
101 | * | ||
102 | * @param file absolute file name | ||
103 | * @return the result | ||
104 | */ | ||
105 | char * | 92 | char * |
106 | GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file) | 93 | GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file) |
107 | { | 94 | { |
@@ -115,13 +102,6 @@ GNUNET_TRANSPORT_TESTING_get_test_source_name (const char *file) | |||
115 | } | 102 | } |
116 | 103 | ||
117 | 104 | ||
118 | /** | ||
119 | * Extracts the plugin name from an absolute file name and the test name | ||
120 | * | ||
121 | * @param file absolute file name | ||
122 | * @param test test name | ||
123 | * @return the result | ||
124 | */ | ||
125 | char * | 105 | char * |
126 | GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file, | 106 | GNUNET_TRANSPORT_TESTING_get_test_plugin_name (const char *file, |
127 | const char *test) | 107 | const char *test) |
@@ -161,14 +141,6 @@ suc: | |||
161 | } | 141 | } |
162 | 142 | ||
163 | 143 | ||
164 | /** | ||
165 | * This function takes the filename (e.g. argv[0), removes a "lt-"-prefix and | ||
166 | * if existing ".exe"-prefix and adds the peer-number | ||
167 | * | ||
168 | * @param file filename of the test, e.g. argv[0] | ||
169 | * @param count peer number | ||
170 | * @return the result | ||
171 | */ | ||
172 | char * | 144 | char * |
173 | GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, | 145 | GNUNET_TRANSPORT_TESTING_get_config_name (const char *file, |
174 | int count) | 146 | int count) |
diff --git a/src/transport/transport-testing2.c b/src/transport/transport-testing2.c index 6d41ec098..f0dee7388 100644 --- a/src/transport/transport-testing2.c +++ b/src/transport/transport-testing2.c | |||
@@ -379,19 +379,6 @@ retrieve_hello (void *cls) | |||
379 | } | 379 | } |
380 | 380 | ||
381 | 381 | ||
382 | /** | ||
383 | * Start a peer with the given configuration | ||
384 | * @param tth the testing handle | ||
385 | * @param cfgname configuration file | ||
386 | * @param peer_id a unique number to identify the peer | ||
387 | * @param handlers functions for receiving messages | ||
388 | * @param nc connect callback | ||
389 | * @param nd disconnect callback | ||
390 | * @param cb_cls closure for callback | ||
391 | * @param start_cb start callback | ||
392 | * @param start_cb_cls closure for callback | ||
393 | * @return the peer context | ||
394 | */ | ||
395 | struct GNUNET_TRANSPORT_TESTING_PeerContext * | 382 | struct GNUNET_TRANSPORT_TESTING_PeerContext * |
396 | GNUNET_TRANSPORT_TESTING_start_peer (struct | 383 | GNUNET_TRANSPORT_TESTING_start_peer (struct |
397 | GNUNET_TRANSPORT_TESTING_Handle *tth, | 384 | GNUNET_TRANSPORT_TESTING_Handle *tth, |
@@ -545,14 +532,6 @@ GNUNET_TRANSPORT_TESTING_start_peer (struct | |||
545 | } | 532 | } |
546 | 533 | ||
547 | 534 | ||
548 | /** | ||
549 | * Stops and restarts the given peer, sleeping (!) for 5s in between. | ||
550 | * | ||
551 | * @param p the peer | ||
552 | * @param restart_cb callback to call when restarted | ||
553 | * @param restart_cb_cls callback closure | ||
554 | * @return #GNUNET_OK in success otherwise #GNUNET_SYSERR | ||
555 | */ | ||
556 | int | 535 | int |
557 | GNUNET_TRANSPORT_TESTING_restart_peer (struct | 536 | GNUNET_TRANSPORT_TESTING_restart_peer (struct |
558 | GNUNET_TRANSPORT_TESTING_PeerContext *p, | 537 | GNUNET_TRANSPORT_TESTING_PeerContext *p, |
@@ -751,11 +730,6 @@ GNUNET_TRANSPORT_TESTING_stop_peer (struct | |||
751 | }*/ | 730 | }*/ |
752 | 731 | ||
753 | 732 | ||
754 | /** | ||
755 | * Offer the current HELLO of P2 to P1. | ||
756 | * | ||
757 | * @param cls our `struct GNUNET_TRANSPORT_TESTING_ConnectRequest` | ||
758 | */ | ||
759 | static void | 733 | static void |
760 | offer_hello (void *cls) | 734 | offer_hello (void *cls) |
761 | { | 735 | { |
@@ -859,13 +833,6 @@ GNUNET_TRANSPORT_TESTING_connect_peers (struct | |||
859 | } | 833 | } |
860 | 834 | ||
861 | 835 | ||
862 | /** | ||
863 | * Cancel the request to connect two peers | ||
864 | * Tou MUST cancel the request if you stop the peers before the peers connected successfully | ||
865 | * | ||
866 | * @param tth transport testing handle | ||
867 | * @param cc a connect request handle | ||
868 | */ | ||
869 | void | 836 | void |
870 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct | 837 | GNUNET_TRANSPORT_TESTING_connect_peers_cancel (struct |
871 | GNUNET_TRANSPORT_TESTING_ConnectRequest | 838 | GNUNET_TRANSPORT_TESTING_ConnectRequest |
diff --git a/src/transport/transport-testing2.h b/src/transport/transport-testing2.h index e2167ca7e..b5db28500 100644 --- a/src/transport/transport-testing2.h +++ b/src/transport/transport-testing2.h | |||
@@ -288,7 +288,7 @@ GNUNET_TRANSPORT_TESTING_done (struct GNUNET_TRANSPORT_TESTING_Handle *tth); | |||
288 | * | 288 | * |
289 | * @param tth the testing handle | 289 | * @param tth the testing handle |
290 | * @param cfgname configuration file | 290 | * @param cfgname configuration file |
291 | * @param peer_id the peer_id | 291 | * @param peer_id an identification number for the peer |
292 | * @param handlers functions for receiving messages | 292 | * @param handlers functions for receiving messages |
293 | * @param nc connect callback | 293 | * @param nc connect callback |
294 | * @param nd disconnect callback | 294 | * @param nd disconnect callback |
diff --git a/src/transport/transport_api2_communication.c b/src/transport/transport_api2_communication.c index 2a80db87b..aaab5df1c 100644 --- a/src/transport/transport_api2_communication.c +++ b/src/transport/transport_api2_communication.c | |||
@@ -793,24 +793,6 @@ reconnect (struct GNUNET_TRANSPORT_CommunicatorHandle *ch) | |||
793 | } | 793 | } |
794 | 794 | ||
795 | 795 | ||
796 | /** | ||
797 | * Connect to the transport service. | ||
798 | * | ||
799 | * @param cfg configuration to use | ||
800 | * @param config_section section of the configuration to use for options | ||
801 | * @param addr_prefix address prefix for addresses supported by this | ||
802 | * communicator, could be NULL for incoming-only communicators | ||
803 | * @param cc what characteristics does the communicator have? | ||
804 | * @param mtu maximum message size supported by communicator, 0 if | ||
805 | * sending is not supported, SIZE_MAX for no MTU | ||
806 | * @param mq_init function to call to initialize a message queue given | ||
807 | * the address of another peer, can be NULL if the | ||
808 | * communicator only supports receiving messages | ||
809 | * @param mq_init_cls closure for @a mq_init | ||
810 | * @param notify_cb function to pass backchannel messages to communicator | ||
811 | * @param notify_cb_cls closure for @a notify_cb | ||
812 | * @return NULL on error | ||
813 | */ | ||
814 | struct GNUNET_TRANSPORT_CommunicatorHandle * | 796 | struct GNUNET_TRANSPORT_CommunicatorHandle * |
815 | GNUNET_TRANSPORT_communicator_connect ( | 797 | GNUNET_TRANSPORT_communicator_connect ( |
816 | const struct GNUNET_CONFIGURATION_Handle *cfg, | 798 | const struct GNUNET_CONFIGURATION_Handle *cfg, |
@@ -871,26 +853,6 @@ GNUNET_TRANSPORT_communicator_disconnect ( | |||
871 | /* ************************* Receiving *************************** */ | 853 | /* ************************* Receiving *************************** */ |
872 | 854 | ||
873 | 855 | ||
874 | /** | ||
875 | * Notify transport service that the communicator has received | ||
876 | * a message. | ||
877 | * | ||
878 | * @param ch connection to transport service | ||
879 | * @param sender presumed sender of the message (details to be checked | ||
880 | * by higher layers) | ||
881 | * @param msg the message | ||
882 | * @param expected_addr_validity how long does the communicator believe it | ||
883 | * will continue to be able to receive messages from the same address | ||
884 | * on which it received this message? | ||
885 | * @param cb function to call once handling the message is done, NULL if | ||
886 | * flow control is not supported by this communicator | ||
887 | * @param cb_cls closure for @a cb | ||
888 | * @return #GNUNET_OK if all is well, #GNUNET_NO if the message was | ||
889 | * immediately dropped due to memory limitations (communicator | ||
890 | * should try to apply back pressure), | ||
891 | * #GNUNET_SYSERR if the message could not be delivered because | ||
892 | * the transport service is not yet up | ||
893 | */ | ||
894 | int | 856 | int |
895 | GNUNET_TRANSPORT_communicator_receive ( | 857 | GNUNET_TRANSPORT_communicator_receive ( |
896 | struct GNUNET_TRANSPORT_CommunicatorHandle *ch, | 858 | struct GNUNET_TRANSPORT_CommunicatorHandle *ch, |
@@ -957,25 +919,6 @@ GNUNET_TRANSPORT_communicator_receive ( | |||
957 | /* ************************* Discovery *************************** */ | 919 | /* ************************* Discovery *************************** */ |
958 | 920 | ||
959 | 921 | ||
960 | /** | ||
961 | * Notify transport service that an MQ became available due to an | ||
962 | * "inbound" connection or because the communicator discovered the | ||
963 | * presence of another peer. | ||
964 | * | ||
965 | * @param ch connection to transport service | ||
966 | * @param peer peer with which we can now communicate | ||
967 | * @param address address in human-readable format, 0-terminated, UTF-8 | ||
968 | * @param mtu maximum message size supported by queue, 0 if | ||
969 | * sending is not supported, SIZE_MAX for no MTU | ||
970 | * @param q_len number of messages that can be send through this queue | ||
971 | * @param priority queue priority. Queues with highest priority should be | ||
972 | * used | ||
973 | * @param nt which network type does the @a address belong to? | ||
974 | * @param cc what characteristics does the communicator have? | ||
975 | * @param cs what is the connection status of the queue? | ||
976 | * @param mq message queue of the @a peer | ||
977 | * @return API handle identifying the new MQ | ||
978 | */ | ||
979 | struct GNUNET_TRANSPORT_QueueHandle * | 922 | struct GNUNET_TRANSPORT_QueueHandle * |
980 | GNUNET_TRANSPORT_communicator_mq_add ( | 923 | GNUNET_TRANSPORT_communicator_mq_add ( |
981 | struct GNUNET_TRANSPORT_CommunicatorHandle *ch, | 924 | struct GNUNET_TRANSPORT_CommunicatorHandle *ch, |
@@ -1124,20 +1067,6 @@ GNUNET_TRANSPORT_communicator_address_remove_all ( | |||
1124 | /* ************************* Backchannel *************************** */ | 1067 | /* ************************* Backchannel *************************** */ |
1125 | 1068 | ||
1126 | 1069 | ||
1127 | /** | ||
1128 | * The communicator asks the transport service to route a message via | ||
1129 | * a different path to another communicator service at another peer. | ||
1130 | * This must only be done for special control traffic (as there is no | ||
1131 | * flow control for this API), such as acknowledgements, and generally | ||
1132 | * only be done if the communicator is uni-directional (i.e. cannot | ||
1133 | * send the message back itself). | ||
1134 | * | ||
1135 | * @param ch handle of this communicator | ||
1136 | * @param pid peer to send the message to | ||
1137 | * @param comm name of the communicator to send the message to | ||
1138 | * @param header header of the message to transmit and pass via the | ||
1139 | * notify-API to @a pid's communicator @a comm | ||
1140 | */ | ||
1141 | void | 1070 | void |
1142 | GNUNET_TRANSPORT_communicator_notify ( | 1071 | GNUNET_TRANSPORT_communicator_notify ( |
1143 | struct GNUNET_TRANSPORT_CommunicatorHandle *ch, | 1072 | struct GNUNET_TRANSPORT_CommunicatorHandle *ch, |
diff --git a/src/transport/transport_api_cmd_send_simple.c b/src/transport/transport_api_cmd_send_simple.c index ade0cc914..1ddb81f17 100644 --- a/src/transport/transport_api_cmd_send_simple.c +++ b/src/transport/transport_api_cmd_send_simple.c | |||
@@ -175,16 +175,6 @@ send_simple_run (void *cls, | |||
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||
178 | /** | ||
179 | * Create command. | ||
180 | * | ||
181 | * @param label name for command. | ||
182 | * @param start_peer_label Label of the cmd to start a peer. | ||
183 | * @param start_peer_label Label of the cmd which started the test system. | ||
184 | * @param num Number globally identifying the node. | ||
185 | * @param The topology for the test setup. | ||
186 | * @return command. | ||
187 | */ | ||
188 | struct GNUNET_TESTING_Command | 178 | struct GNUNET_TESTING_Command |
189 | GNUNET_TRANSPORT_cmd_send_simple (const char *label, | 179 | GNUNET_TRANSPORT_cmd_send_simple (const char *label, |
190 | const char *start_peer_label, | 180 | const char *start_peer_label, |
diff --git a/src/transport/transport_api_monitor_peers.c b/src/transport/transport_api_monitor_peers.c index 2f0f07f23..ef1dc6087 100644 --- a/src/transport/transport_api_monitor_peers.c +++ b/src/transport/transport_api_monitor_peers.c | |||
@@ -389,32 +389,6 @@ do_peer_connect (void *cls) | |||
389 | } | 389 | } |
390 | 390 | ||
391 | 391 | ||
392 | /** | ||
393 | * Return information about a specific peer or all peers currently known to | ||
394 | * transport service once or in monitoring mode. To obtain information about | ||
395 | * a specific peer, a peer identity can be passed. To obtain information about | ||
396 | * all peers currently known to transport service, NULL can be passed as peer | ||
397 | * identity. | ||
398 | * | ||
399 | * For each peer, the callback is called with information about the address used | ||
400 | * to communicate with this peer, the state this peer is currently in and the | ||
401 | * the current timeout for this state. | ||
402 | * | ||
403 | * Upon completion, the 'GNUNET_TRANSPORT_PeerIterateCallback' is called one | ||
404 | * more time with 'NULL'. After this, the operation must no longer be | ||
405 | * explicitly canceled. | ||
406 | * | ||
407 | * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called in the | ||
408 | * the peer_callback! | ||
409 | * | ||
410 | * @param cfg configuration to use | ||
411 | * @param peer a specific peer identity to obtain information for, | ||
412 | * NULL for all peers | ||
413 | * @param one_shot #GNUNET_YES to return the current state and then end (with NULL+NULL), | ||
414 | * #GNUNET_NO to monitor peers continuously | ||
415 | * @param peer_callback function to call with the results | ||
416 | * @param peer_callback_cls closure for @a peer_address_callback | ||
417 | */ | ||
418 | struct GNUNET_TRANSPORT_PeerMonitoringContext * | 392 | struct GNUNET_TRANSPORT_PeerMonitoringContext * |
419 | GNUNET_TRANSPORT_monitor_peers (const struct GNUNET_CONFIGURATION_Handle *cfg, | 393 | GNUNET_TRANSPORT_monitor_peers (const struct GNUNET_CONFIGURATION_Handle *cfg, |
420 | const struct GNUNET_PeerIdentity *peer, | 394 | const struct GNUNET_PeerIdentity *peer, |
diff --git a/src/transport/transport_api_offer_hello.c b/src/transport/transport_api_offer_hello.c index eb342f57c..1b611aa6b 100644 --- a/src/transport/transport_api_offer_hello.c +++ b/src/transport/transport_api_offer_hello.c | |||
@@ -125,11 +125,6 @@ GNUNET_TRANSPORT_offer_hello (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
125 | } | 125 | } |
126 | 126 | ||
127 | 127 | ||
128 | /** | ||
129 | * Cancel the request to transport to offer the HELLO message | ||
130 | * | ||
131 | * @param ohh the handle for the operation to cancel | ||
132 | */ | ||
133 | void | 128 | void |
134 | GNUNET_TRANSPORT_offer_hello_cancel (struct | 129 | GNUNET_TRANSPORT_offer_hello_cancel (struct |
135 | GNUNET_TRANSPORT_OfferHelloHandle *ohh) | 130 | GNUNET_TRANSPORT_OfferHelloHandle *ohh) |