diff options
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/gnunet-service-core_clients.c | 10 | ||||
-rw-r--r-- | src/core/gnunet-service-core_clients.h | 8 | ||||
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 11 |
3 files changed, 6 insertions, 23 deletions
diff --git a/src/core/gnunet-service-core_clients.c b/src/core/gnunet-service-core_clients.c index 63c3b79be..eed890a8f 100644 --- a/src/core/gnunet-service-core_clients.c +++ b/src/core/gnunet-service-core_clients.c | |||
@@ -680,8 +680,6 @@ GSC_CLIENTS_reject_request (struct GSC_ClientActiveRequest *car) | |||
680 | * | 680 | * |
681 | * @param client client to notify | 681 | * @param client client to notify |
682 | * @param neighbour identity of the neighbour that changed status | 682 | * @param neighbour identity of the neighbour that changed status |
683 | * @param atsi performance information about neighbour | ||
684 | * @param atsi_count number of entries in 'ats' array | ||
685 | * @param tmap_old previous type map for the neighbour, NULL for disconnect | 683 | * @param tmap_old previous type map for the neighbour, NULL for disconnect |
686 | * @param tmap_new updated type map for the neighbour, NULL for disconnect | 684 | * @param tmap_new updated type map for the neighbour, NULL for disconnect |
687 | */ | 685 | */ |
@@ -689,8 +687,6 @@ void | |||
689 | GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, | 687 | GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, |
690 | const struct GNUNET_PeerIdentity | 688 | const struct GNUNET_PeerIdentity |
691 | *neighbour, | 689 | *neighbour, |
692 | const struct GNUNET_ATS_Information | ||
693 | *atsi, unsigned int atsi_count, | ||
694 | const struct GSC_TypeMap *tmap_old, | 690 | const struct GSC_TypeMap *tmap_old, |
695 | const struct GSC_TypeMap *tmap_new) | 691 | const struct GSC_TypeMap *tmap_new) |
696 | { | 692 | { |
@@ -755,23 +751,19 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, | |||
755 | * or types processed by the respective peer. | 751 | * or types processed by the respective peer. |
756 | * | 752 | * |
757 | * @param neighbour identity of the neighbour that changed status | 753 | * @param neighbour identity of the neighbour that changed status |
758 | * @param atsi performance information about neighbour | ||
759 | * @param atsi_count number of entries in 'ats' array | ||
760 | * @param tmap_old previous type map for the neighbour, NULL for disconnect | 754 | * @param tmap_old previous type map for the neighbour, NULL for disconnect |
761 | * @param tmap_new updated type map for the neighbour, NULL for disconnect | 755 | * @param tmap_new updated type map for the neighbour, NULL for disconnect |
762 | */ | 756 | */ |
763 | void | 757 | void |
764 | GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity | 758 | GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity |
765 | *neighbour, | 759 | *neighbour, |
766 | const struct GNUNET_ATS_Information | ||
767 | *atsi, unsigned int atsi_count, | ||
768 | const struct GSC_TypeMap *tmap_old, | 760 | const struct GSC_TypeMap *tmap_old, |
769 | const struct GSC_TypeMap *tmap_new) | 761 | const struct GSC_TypeMap *tmap_new) |
770 | { | 762 | { |
771 | struct GSC_Client *c; | 763 | struct GSC_Client *c; |
772 | 764 | ||
773 | for (c = client_head; c != NULL; c = c->next) | 765 | for (c = client_head; c != NULL; c = c->next) |
774 | GSC_CLIENTS_notify_client_about_neighbour (c, neighbour, atsi, atsi_count, | 766 | GSC_CLIENTS_notify_client_about_neighbour (c, neighbour, |
775 | tmap_old, tmap_new); | 767 | tmap_old, tmap_new); |
776 | } | 768 | } |
777 | 769 | ||
diff --git a/src/core/gnunet-service-core_clients.h b/src/core/gnunet-service-core_clients.h index fd06c1fc7..8fd83128a 100644 --- a/src/core/gnunet-service-core_clients.h +++ b/src/core/gnunet-service-core_clients.h | |||
@@ -52,8 +52,6 @@ GSC_CLIENTS_send_to_client (struct GNUNET_SERVER_Client *client, | |||
52 | * | 52 | * |
53 | * @param client client to notify | 53 | * @param client client to notify |
54 | * @param neighbour identity of the neighbour that changed status | 54 | * @param neighbour identity of the neighbour that changed status |
55 | * @param atsi performance information about neighbour | ||
56 | * @param atsi_count number of entries in 'ats' array | ||
57 | * @param tmap_old previous type map for the neighbour, NULL for disconnect | 55 | * @param tmap_old previous type map for the neighbour, NULL for disconnect |
58 | * @param tmap_new updated type map for the neighbour, NULL for disconnect | 56 | * @param tmap_new updated type map for the neighbour, NULL for disconnect |
59 | */ | 57 | */ |
@@ -61,8 +59,6 @@ void | |||
61 | GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, | 59 | GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, |
62 | const struct GNUNET_PeerIdentity | 60 | const struct GNUNET_PeerIdentity |
63 | *neighbour, | 61 | *neighbour, |
64 | const struct GNUNET_ATS_Information | ||
65 | *atsi, unsigned int atsi_count, | ||
66 | const struct GSC_TypeMap *tmap_old, | 62 | const struct GSC_TypeMap *tmap_old, |
67 | const struct GSC_TypeMap *tmap_new); | 63 | const struct GSC_TypeMap *tmap_new); |
68 | 64 | ||
@@ -73,16 +69,12 @@ GSC_CLIENTS_notify_client_about_neighbour (struct GSC_Client *client, | |||
73 | * or types processed by the respective peer. | 69 | * or types processed by the respective peer. |
74 | * | 70 | * |
75 | * @param neighbour identity of the neighbour that changed status | 71 | * @param neighbour identity of the neighbour that changed status |
76 | * @param atsi performance information about neighbour | ||
77 | * @param atsi_count number of entries in 'ats' array | ||
78 | * @param tmap_old previous type map for the neighbour, NULL for disconnect | 72 | * @param tmap_old previous type map for the neighbour, NULL for disconnect |
79 | * @param tmap_new updated type map for the neighbour, NULL for disconnect | 73 | * @param tmap_new updated type map for the neighbour, NULL for disconnect |
80 | */ | 74 | */ |
81 | void | 75 | void |
82 | GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity | 76 | GSC_CLIENTS_notify_clients_about_neighbour (const struct GNUNET_PeerIdentity |
83 | *neighbour, | 77 | *neighbour, |
84 | const struct GNUNET_ATS_Information | ||
85 | *atsi, unsigned int atsi_count, | ||
86 | const struct GSC_TypeMap *tmap_old, | 78 | const struct GSC_TypeMap *tmap_old, |
87 | const struct GSC_TypeMap *tmap_new); | 79 | const struct GSC_TypeMap *tmap_new); |
88 | 80 | ||
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index a77919bde..161ce81a8 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -199,8 +199,7 @@ GSC_SESSIONS_end (const struct GNUNET_PeerIdentity *pid) | |||
199 | GNUNET_free (sme); | 199 | GNUNET_free (sme); |
200 | } | 200 | } |
201 | GNUNET_SCHEDULER_cancel (session->typemap_task); | 201 | GNUNET_SCHEDULER_cancel (session->typemap_task); |
202 | GSC_CLIENTS_notify_clients_about_neighbour (&session->peer, NULL, | 202 | GSC_CLIENTS_notify_clients_about_neighbour (&session->peer, |
203 | 0 /* FIXME: ATSI */ , | ||
204 | session->tmap, NULL); | 203 | session->tmap, NULL); |
205 | GNUNET_assert (GNUNET_YES == | 204 | GNUNET_assert (GNUNET_YES == |
206 | GNUNET_CONTAINER_multihashmap_remove (sessions, | 205 | GNUNET_CONTAINER_multihashmap_remove (sessions, |
@@ -280,7 +279,7 @@ GSC_SESSIONS_create (const struct GNUNET_PeerIdentity *peer, | |||
280 | GNUNET_STATISTICS_set (GSC_stats, gettext_noop ("# peers connected"), | 279 | GNUNET_STATISTICS_set (GSC_stats, gettext_noop ("# peers connected"), |
281 | GNUNET_CONTAINER_multihashmap_size (sessions), | 280 | GNUNET_CONTAINER_multihashmap_size (sessions), |
282 | GNUNET_NO); | 281 | GNUNET_NO); |
283 | GSC_CLIENTS_notify_clients_about_neighbour (peer, NULL, 0 /* FIXME: ATSI */ , | 282 | GSC_CLIENTS_notify_clients_about_neighbour (peer, |
284 | NULL, session->tmap); | 283 | NULL, session->tmap); |
285 | } | 284 | } |
286 | 285 | ||
@@ -300,7 +299,7 @@ notify_client_about_session (void *cls, const struct GNUNET_HashCode * key, | |||
300 | struct GSC_Client *client = cls; | 299 | struct GSC_Client *client = cls; |
301 | struct Session *session = value; | 300 | struct Session *session = value; |
302 | 301 | ||
303 | GSC_CLIENTS_notify_client_about_neighbour (client, &session->peer, NULL, 0, /* FIXME: ATS!? */ | 302 | GSC_CLIENTS_notify_client_about_neighbour (client, &session->peer, |
304 | NULL, /* old TMAP: none */ | 303 | NULL, /* old TMAP: none */ |
305 | session->tmap); | 304 | session->tmap); |
306 | return GNUNET_OK; | 305 | return GNUNET_OK; |
@@ -749,7 +748,7 @@ GSC_SESSIONS_set_typemap (const struct GNUNET_PeerIdentity *peer, | |||
749 | GNUNET_break (0); | 748 | GNUNET_break (0); |
750 | return; | 749 | return; |
751 | } | 750 | } |
752 | GSC_CLIENTS_notify_clients_about_neighbour (peer, NULL, 0, /* FIXME: ATS */ | 751 | GSC_CLIENTS_notify_clients_about_neighbour (peer, |
753 | session->tmap, nmap); | 752 | session->tmap, nmap); |
754 | GSC_TYPEMAP_destroy (session->tmap); | 753 | GSC_TYPEMAP_destroy (session->tmap); |
755 | session->tmap = nmap; | 754 | session->tmap = nmap; |
@@ -778,7 +777,7 @@ GSC_SESSIONS_add_to_typemap (const struct GNUNET_PeerIdentity *peer, | |||
778 | if (GNUNET_YES == GSC_TYPEMAP_test_match (session->tmap, &type, 1)) | 777 | if (GNUNET_YES == GSC_TYPEMAP_test_match (session->tmap, &type, 1)) |
779 | return; /* already in it */ | 778 | return; /* already in it */ |
780 | nmap = GSC_TYPEMAP_extend (session->tmap, &type, 1); | 779 | nmap = GSC_TYPEMAP_extend (session->tmap, &type, 1); |
781 | GSC_CLIENTS_notify_clients_about_neighbour (peer, NULL, 0, /* FIXME: ATS */ | 780 | GSC_CLIENTS_notify_clients_about_neighbour (peer, |
782 | session->tmap, nmap); | 781 | session->tmap, nmap); |
783 | GSC_TYPEMAP_destroy (session->tmap); | 782 | GSC_TYPEMAP_destroy (session->tmap); |
784 | session->tmap = nmap; | 783 | session->tmap = nmap; |