diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-10-10 11:29:59 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-10-10 11:29:59 +0000 |
commit | 4e49d814f8c52d784e8aa7bd57a40eda7656d3c0 (patch) | |
tree | 86f9971794e0d72f8de9ac2886fd11e85ccde7c1 /src/include | |
parent | 0a15f777a19feea3937264b6acf96685b76bbc45 (diff) | |
download | gnunet-4e49d814f8c52d784e8aa7bd57a40eda7656d3c0.tar.gz gnunet-4e49d814f8c52d784e8aa7bd57a40eda7656d3c0.zip |
another core API simplification due to ATS introduction
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/gnunet_ats_service.h | 3 | ||||
-rw-r--r-- | src/include/gnunet_core_service.h | 29 | ||||
-rw-r--r-- | src/include/gnunet_protocols.h | 6 |
3 files changed, 2 insertions, 36 deletions
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h index eb785afdd..33539bdaf 100644 --- a/src/include/gnunet_ats_service.h +++ b/src/include/gnunet_ats_service.h | |||
@@ -282,7 +282,8 @@ struct GNUNET_ATS_InformationRequestContext; | |||
282 | * @param preference increase incoming traffic share preference by this amount; | 282 | * @param preference increase incoming traffic share preference by this amount; |
283 | * in the absence of "amount" reservations, we use this | 283 | * in the absence of "amount" reservations, we use this |
284 | * preference value to assign proportional bandwidth shares | 284 | * preference value to assign proportional bandwidth shares |
285 | * to all connected peers | 285 | * to all connected peers; in the future, this should be |
286 | * replaced with more specific QoS expressions... | ||
286 | * @param info function to call with the resulting configuration information | 287 | * @param info function to call with the resulting configuration information |
287 | * @param info_cls closure for info | 288 | * @param info_cls closure for info |
288 | * @return NULL on error | 289 | * @return NULL on error |
diff --git a/src/include/gnunet_core_service.h b/src/include/gnunet_core_service.h index 366986b4b..24083f1a1 100644 --- a/src/include/gnunet_core_service.h +++ b/src/include/gnunet_core_service.h | |||
@@ -67,33 +67,6 @@ typedef void (*GNUNET_CORE_ConnectEventHandler) (void *cls, | |||
67 | 67 | ||
68 | 68 | ||
69 | /** | 69 | /** |
70 | * Method called whenever a given peer has a status change. | ||
71 | * | ||
72 | * @param cls closure | ||
73 | * @param peer peer identity this notification is about | ||
74 | * @param timeout absolute time when this peer will time out | ||
75 | * unless we see some further activity from it | ||
76 | * @param bandwidth_in available amount of inbound bandwidth | ||
77 | * @param bandwidth_out available amount of outbound bandwidth | ||
78 | * @param atsi performance data for the connection | ||
79 | */ | ||
80 | typedef void (*GNUNET_CORE_PeerStatusEventHandler) (void *cls, | ||
81 | const struct | ||
82 | GNUNET_PeerIdentity * peer, | ||
83 | struct | ||
84 | GNUNET_BANDWIDTH_Value32NBO | ||
85 | bandwidth_in, | ||
86 | struct | ||
87 | GNUNET_BANDWIDTH_Value32NBO | ||
88 | bandwidth_out, | ||
89 | struct GNUNET_TIME_Absolute | ||
90 | timeout, | ||
91 | const struct | ||
92 | GNUNET_TRANSPORT_ATS_Information | ||
93 | * atsi); | ||
94 | |||
95 | |||
96 | /** | ||
97 | * Method called whenever a peer disconnects. | 70 | * Method called whenever a peer disconnects. |
98 | * | 71 | * |
99 | * @param cls closure | 72 | * @param cls closure |
@@ -186,7 +159,6 @@ typedef void (*GNUNET_CORE_StartupCallback) (void *cls, | |||
186 | * connected to the core service; note that timeout is only meaningful if init is not NULL | 159 | * connected to the core service; note that timeout is only meaningful if init is not NULL |
187 | * @param connects function to call on peer connect, can be NULL | 160 | * @param connects function to call on peer connect, can be NULL |
188 | * @param disconnects function to call on peer disconnect / timeout, can be NULL | 161 | * @param disconnects function to call on peer disconnect / timeout, can be NULL |
189 | * @param status_events function to call on peer status changes, can be NULL | ||
190 | * @param inbound_notify function to call for all inbound messages, can be NULL | 162 | * @param inbound_notify function to call for all inbound messages, can be NULL |
191 | * note that the core is allowed to drop notifications about inbound | 163 | * note that the core is allowed to drop notifications about inbound |
192 | * messages if the client does not process them fast enough (for this | 164 | * messages if the client does not process them fast enough (for this |
@@ -220,7 +192,6 @@ GNUNET_CORE_connect (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
220 | GNUNET_CORE_StartupCallback init, | 192 | GNUNET_CORE_StartupCallback init, |
221 | GNUNET_CORE_ConnectEventHandler connects, | 193 | GNUNET_CORE_ConnectEventHandler connects, |
222 | GNUNET_CORE_DisconnectEventHandler disconnects, | 194 | GNUNET_CORE_DisconnectEventHandler disconnects, |
223 | GNUNET_CORE_PeerStatusEventHandler status_events, | ||
224 | GNUNET_CORE_MessageCallback inbound_notify, | 195 | GNUNET_CORE_MessageCallback inbound_notify, |
225 | int inbound_hdr_only, | 196 | int inbound_hdr_only, |
226 | GNUNET_CORE_MessageCallback outbound_notify, | 197 | GNUNET_CORE_MessageCallback outbound_notify, |
diff --git a/src/include/gnunet_protocols.h b/src/include/gnunet_protocols.h index 1b95d847b..31f6e0b4c 100644 --- a/src/include/gnunet_protocols.h +++ b/src/include/gnunet_protocols.h | |||
@@ -402,12 +402,6 @@ extern "C" | |||
402 | #define GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND 71 | 402 | #define GNUNET_MESSAGE_TYPE_CORE_NOTIFY_OUTBOUND 71 |
403 | 403 | ||
404 | /** | 404 | /** |
405 | * Response from server about (possibly updated) P2P | ||
406 | * connection configuration. | ||
407 | */ | ||
408 | #define GNUNET_MESSAGE_TYPE_CORE_CONFIGURATION_INFO 73 | ||
409 | |||
410 | /** | ||
411 | * Request from client to transmit message. | 405 | * Request from client to transmit message. |
412 | */ | 406 | */ |
413 | #define GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST 74 | 407 | #define GNUNET_MESSAGE_TYPE_CORE_SEND_REQUEST 74 |