diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-12-14 20:52:16 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-12-14 20:52:16 +0000 |
commit | a8e5b09df9ce6f090ab4ecfde02fc7ab3b667c13 (patch) | |
tree | dd96afbbe0cfb435c94a377d6762100d4a205d05 /src/include | |
parent | ea17e83e666b0104b43d04423cef193f92199c26 (diff) | |
download | gnunet-a8e5b09df9ce6f090ab4ecfde02fc7ab3b667c13.tar.gz gnunet-a8e5b09df9ce6f090ab4ecfde02fc7ab3b667c13.zip |
-fixing peerinfo part of #3559
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_core_service.h | 1 | ||||
-rw-r--r-- | src/include/gnunet_hello_lib.h | 5 | ||||
-rw-r--r-- | src/include/gnunet_peerinfo_service.h | 2 | ||||
-rw-r--r-- | src/include/gnunet_transport_service.h | 15 |
4 files changed, 13 insertions, 10 deletions
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index c06e3c1f6..f65d94eee 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -17,7 +17,6 @@ | |||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
18 | Boston, MA 02111-1307, USA. | 18 | Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | |||
21 | /** | 20 | /** |
22 | * @file include/gnunet_core_service.h | 21 | * @file include/gnunet_core_service.h |
23 | * @brief core service; this is the main API for encrypted P2P | 22 | * @brief core service; this is the main API for encrypted P2P |
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h index a8a565695..6962e6945 100644 --- a/src/include/gnunet_hello_lib.h +++ b/src/include/gnunet_hello_lib.h | |||
@@ -411,6 +411,11 @@ struct GNUNET_MessageHeader * | |||
411 | GNUNET_HELLO_get_header (struct GNUNET_HELLO_Message *hello); | 411 | GNUNET_HELLO_get_header (struct GNUNET_HELLO_Message *hello); |
412 | 412 | ||
413 | 413 | ||
414 | /** | ||
415 | * FIXME. | ||
416 | * | ||
417 | * @param name | ||
418 | */ | ||
414 | typedef struct GNUNET_TRANSPORT_PluginFunctions * | 419 | typedef struct GNUNET_TRANSPORT_PluginFunctions * |
415 | (*GNUNET_HELLO_TransportPluginsFind) (const char *name); | 420 | (*GNUNET_HELLO_TransportPluginsFind) (const char *name); |
416 | 421 | ||
diff --git a/src/include/gnunet_peerinfo_service.h b/src/include/gnunet_peerinfo_service.h index ff8700861..caa659065 100644 --- a/src/include/gnunet_peerinfo_service.h +++ b/src/include/gnunet_peerinfo_service.h | |||
@@ -62,7 +62,7 @@ GNUNET_PEERINFO_connect (const struct GNUNET_CONFIGURATION_Handle *cfg); | |||
62 | * Disconnect from the peerinfo service. Note that all iterators must | 62 | * Disconnect from the peerinfo service. Note that all iterators must |
63 | * have completed or have been cancelled by the time this function is | 63 | * have completed or have been cancelled by the time this function is |
64 | * called (otherwise, calling this function is a serious error). | 64 | * called (otherwise, calling this function is a serious error). |
65 | * Furthermore, if 'GNUNET_PEERINFO_add_peer' operations are still | 65 | * Furthermore, if #GNUNET_PEERINFO_add_peer() operations are still |
66 | * pending, they will be cancelled silently on disconnect. | 66 | * pending, they will be cancelled silently on disconnect. |
67 | * | 67 | * |
68 | * @param h handle to disconnect | 68 | * @param h handle to disconnect |
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h index b3ab4d01e..cfa5fdbe0 100644 --- a/src/include/gnunet_transport_service.h +++ b/src/include/gnunet_transport_service.h | |||
@@ -176,7 +176,7 @@ struct GNUNET_TRANSPORT_TryConnectHandle; | |||
176 | */ | 176 | */ |
177 | typedef void | 177 | typedef void |
178 | (*GNUNET_TRANSPORT_TryConnectCallback) (void *cls, | 178 | (*GNUNET_TRANSPORT_TryConnectCallback) (void *cls, |
179 | const int result); | 179 | int result); |
180 | 180 | ||
181 | 181 | ||
182 | /** | 182 | /** |
@@ -296,7 +296,6 @@ void | |||
296 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct GNUNET_TRANSPORT_TransmitHandle *th); | 296 | GNUNET_TRANSPORT_notify_transmit_ready_cancel (struct GNUNET_TRANSPORT_TransmitHandle *th); |
297 | 297 | ||
298 | 298 | ||
299 | |||
300 | /** | 299 | /** |
301 | * Checks if a given peer is connected to us | 300 | * Checks if a given peer is connected to us |
302 | * | 301 | * |
@@ -397,6 +396,7 @@ GNUNET_TRANSPORT_get_hello_cancel (struct GNUNET_TRANSPORT_GetHelloHandle *ghh); | |||
397 | */ | 396 | */ |
398 | struct GNUNET_TRANSPORT_OfferHelloHandle; | 397 | struct GNUNET_TRANSPORT_OfferHelloHandle; |
399 | 398 | ||
399 | |||
400 | /** | 400 | /** |
401 | * Offer the transport service the HELLO of another peer. Note that | 401 | * Offer the transport service the HELLO of another peer. Note that |
402 | * the transport service may just ignore this message if the HELLO is | 402 | * the transport service may just ignore this message if the HELLO is |
@@ -648,7 +648,7 @@ struct GNUNET_TRANSPORT_PeerMonitoringContext; | |||
648 | * a final call with NULL for peer and address will follow when done. | 648 | * a final call with NULL for peer and address will follow when done. |
649 | * In this case state and timeout do not contain valid values. | 649 | * In this case state and timeout do not contain valid values. |
650 | * | 650 | * |
651 | * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called from | 651 | * The #GNUNET_TRANSPORT_monitor_peers_cancel() call MUST not be called from |
652 | * within this function! | 652 | * within this function! |
653 | * | 653 | * |
654 | * | 654 | * |
@@ -678,8 +678,8 @@ typedef void | |||
678 | * to communicate with this peer, the state this peer is currently in and the | 678 | * to communicate with this peer, the state this peer is currently in and the |
679 | * the current timeout for this state. | 679 | * the current timeout for this state. |
680 | * | 680 | * |
681 | * Upon completion, the 'GNUNET_TRANSPORT_PeerIterateCallback' is called one | 681 | * Upon completion, the #GNUNET_TRANSPORT_PeerIterateCallback is called one |
682 | * more time with 'NULL'. After this, the operation must no longer be | 682 | * more time with `NULL`. After this, the operation must no longer be |
683 | * explicitly canceled. | 683 | * explicitly canceled. |
684 | * | 684 | * |
685 | * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called in the | 685 | * The #GNUNET_TRANSPORT_monitor_peers_cancel call MUST not be called in the |
@@ -771,8 +771,8 @@ enum GNUNET_TRANSPORT_ValidationState | |||
771 | * indicate a change to a validation entry. The information included represent | 771 | * indicate a change to a validation entry. The information included represent |
772 | * the current state of the validation entry, | 772 | * the current state of the validation entry, |
773 | * | 773 | * |
774 | * If the monitoring was called with one_shot=GNUNET_YES, a final callback | 774 | * If the monitoring was called with `one_shot==GNUNET_YES`, a final callback |
775 | * with peer==NULL and address==NULL is executed. | 775 | * with `peer==NULL` and `address==NULL` is executed. |
776 | * | 776 | * |
777 | * @param cls closure | 777 | * @param cls closure |
778 | * @param peer peer this update is about, | 778 | * @param peer peer this update is about, |
@@ -1007,7 +1007,6 @@ typedef void | |||
1007 | const struct GNUNET_TRANSPORT_SessionInfo *info); | 1007 | const struct GNUNET_TRANSPORT_SessionInfo *info); |
1008 | 1008 | ||
1009 | 1009 | ||
1010 | |||
1011 | /** | 1010 | /** |
1012 | * Install a plugin session state monitor callback. The callback | 1011 | * Install a plugin session state monitor callback. The callback |
1013 | * will be notified whenever the session changes. | 1012 | * will be notified whenever the session changes. |