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/fs | |
parent | 0a15f777a19feea3937264b6acf96685b76bbc45 (diff) | |
download | gnunet-4e49d814f8c52d784e8aa7bd57a40eda7656d3c0.tar.gz gnunet-4e49d814f8c52d784e8aa7bd57a40eda7656d3c0.zip |
another core API simplification due to ATS introduction
Diffstat (limited to 'src/fs')
-rw-r--r-- | src/fs/gnunet-service-fs.c | 2 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cp.c | 26 | ||||
-rw-r--r-- | src/fs/gnunet-service-fs_cp.h | 19 |
3 files changed, 1 insertions, 46 deletions
diff --git a/src/fs/gnunet-service-fs.c b/src/fs/gnunet-service-fs.c index f2770df3e..d4728760d 100644 --- a/src/fs/gnunet-service-fs.c +++ b/src/fs/gnunet-service-fs.c | |||
@@ -508,7 +508,7 @@ main_init (struct GNUNET_SERVER_Handle *server, | |||
508 | NULL, &peer_init_handler, | 508 | NULL, &peer_init_handler, |
509 | &peer_connect_handler, | 509 | &peer_connect_handler, |
510 | &GSF_peer_disconnect_handler_, | 510 | &GSF_peer_disconnect_handler_, |
511 | &GSF_peer_status_handler_, NULL, GNUNET_NO, | 511 | NULL, GNUNET_NO, |
512 | NULL, GNUNET_NO, p2p_handlers); | 512 | NULL, GNUNET_NO, p2p_handlers); |
513 | if (NULL == GSF_core) | 513 | if (NULL == GSF_core) |
514 | { | 514 | { |
diff --git a/src/fs/gnunet-service-fs_cp.c b/src/fs/gnunet-service-fs_cp.c index 05e5bedef..0fed7b855 100644 --- a/src/fs/gnunet-service-fs_cp.c +++ b/src/fs/gnunet-service-fs_cp.c | |||
@@ -1503,32 +1503,6 @@ GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp, | |||
1503 | 1503 | ||
1504 | 1504 | ||
1505 | /** | 1505 | /** |
1506 | * Method called whenever a given peer has a status change. | ||
1507 | * | ||
1508 | * @param cls closure | ||
1509 | * @param peer peer identity this notification is about | ||
1510 | * @param bandwidth_in available amount of inbound bandwidth | ||
1511 | * @param bandwidth_out available amount of outbound bandwidth | ||
1512 | * @param timeout absolute time when this peer will time out | ||
1513 | * unless we see some further activity from it | ||
1514 | * @param atsi status information | ||
1515 | */ | ||
1516 | void | ||
1517 | GSF_peer_status_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
1518 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
1519 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, | ||
1520 | struct GNUNET_TIME_Absolute timeout, | ||
1521 | const struct GNUNET_TRANSPORT_ATS_Information *atsi) | ||
1522 | { | ||
1523 | struct GSF_ConnectedPeer *cp; | ||
1524 | |||
1525 | cp = GNUNET_CONTAINER_multihashmap_get (cp_map, &peer->hashPubKey); | ||
1526 | GNUNET_assert (NULL != cp); | ||
1527 | update_atsi (cp, atsi); | ||
1528 | } | ||
1529 | |||
1530 | |||
1531 | /** | ||
1532 | * A peer disconnected from us. Tear down the connected peer | 1506 | * A peer disconnected from us. Tear down the connected peer |
1533 | * record. | 1507 | * record. |
1534 | * | 1508 | * |
diff --git a/src/fs/gnunet-service-fs_cp.h b/src/fs/gnunet-service-fs_cp.h index 0f22b0280..4a238dce8 100644 --- a/src/fs/gnunet-service-fs_cp.h +++ b/src/fs/gnunet-service-fs_cp.h | |||
@@ -253,25 +253,6 @@ GSF_peer_update_responder_peer_ (struct GSF_ConnectedPeer *cp, | |||
253 | 253 | ||
254 | 254 | ||
255 | /** | 255 | /** |
256 | * Method called whenever a given peer has a status change. | ||
257 | * | ||
258 | * @param cls closure | ||
259 | * @param peer peer identity this notification is about | ||
260 | * @param bandwidth_in available amount of inbound bandwidth | ||
261 | * @param bandwidth_out available amount of outbound bandwidth | ||
262 | * @param timeout absolute time when this peer will time out | ||
263 | * unless we see some further activity from it | ||
264 | * @param atsi status information | ||
265 | */ | ||
266 | void | ||
267 | GSF_peer_status_handler_ (void *cls, const struct GNUNET_PeerIdentity *peer, | ||
268 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in, | ||
269 | struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out, | ||
270 | struct GNUNET_TIME_Absolute timeout, | ||
271 | const struct GNUNET_TRANSPORT_ATS_Information *atsi); | ||
272 | |||
273 | |||
274 | /** | ||
275 | * Handle P2P "MIGRATION_STOP" message. | 256 | * Handle P2P "MIGRATION_STOP" message. |
276 | * | 257 | * |
277 | * @param cls closure, always NULL | 258 | * @param cls closure, always NULL |