diff options
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 12 | ||||
-rw-r--r-- | src/core/gnunet-service-core_sessions.c | 7 |
2 files changed, 14 insertions, 5 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index dfc304226..767554398 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -665,6 +665,10 @@ GSC_KX_start (const struct GNUNET_PeerIdentity *pid) | |||
665 | "Initiating key exchange with `%s'\n", | 665 | "Initiating key exchange with `%s'\n", |
666 | GNUNET_i2s (pid)); | 666 | GNUNET_i2s (pid)); |
667 | #endif | 667 | #endif |
668 | GNUNET_STATISTICS_update (GSC_stats, | ||
669 | gettext_noop ("# key exchanges initiated"), | ||
670 | 1, | ||
671 | GNUNET_NO); | ||
668 | kx = GNUNET_malloc (sizeof (struct GSC_KeyExchangeInfo)); | 672 | kx = GNUNET_malloc (sizeof (struct GSC_KeyExchangeInfo)); |
669 | kx->peer = *pid; | 673 | kx->peer = *pid; |
670 | kx->set_key_retry_frequency = INITIAL_SET_KEY_RETRY_FREQUENCY; | 674 | kx->set_key_retry_frequency = INITIAL_SET_KEY_RETRY_FREQUENCY; |
@@ -685,6 +689,10 @@ GSC_KX_start (const struct GNUNET_PeerIdentity *pid) | |||
685 | void | 689 | void |
686 | GSC_KX_stop (struct GSC_KeyExchangeInfo *kx) | 690 | GSC_KX_stop (struct GSC_KeyExchangeInfo *kx) |
687 | { | 691 | { |
692 | GNUNET_STATISTICS_update (GSC_stats, | ||
693 | gettext_noop ("# key exchanges stopped"), | ||
694 | 1, | ||
695 | GNUNET_NO); | ||
688 | if (kx->pitr != NULL) | 696 | if (kx->pitr != NULL) |
689 | { | 697 | { |
690 | GNUNET_PEERINFO_iterate_cancel (kx->pitr); | 698 | GNUNET_PEERINFO_iterate_cancel (kx->pitr); |
@@ -1026,6 +1034,10 @@ send_keep_alive (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | |||
1026 | "Sending KEEPALIVE to `%s'\n", | 1034 | "Sending KEEPALIVE to `%s'\n", |
1027 | GNUNET_i2s (&kx->peer)); | 1035 | GNUNET_i2s (&kx->peer)); |
1028 | #endif | 1036 | #endif |
1037 | GNUNET_STATISTICS_update (GSC_stats, | ||
1038 | gettext_noop ("# keepalive messages sent"), | ||
1039 | 1, | ||
1040 | GNUNET_NO); | ||
1029 | setup_fresh_ping (kx); | 1041 | setup_fresh_ping (kx); |
1030 | GSC_NEIGHBOURS_transmit (&kx->peer, | 1042 | GSC_NEIGHBOURS_transmit (&kx->peer, |
1031 | &kx->ping.header, | 1043 | &kx->ping.header, |
diff --git a/src/core/gnunet-service-core_sessions.c b/src/core/gnunet-service-core_sessions.c index c239f27c1..24aa2f9bc 100644 --- a/src/core/gnunet-service-core_sessions.c +++ b/src/core/gnunet-service-core_sessions.c | |||
@@ -185,7 +185,7 @@ GSC_SESSIONS_end (const struct GNUNET_PeerIdentity *pid) | |||
185 | GNUNET_CONTAINER_multihashmap_remove (sessions, | 185 | GNUNET_CONTAINER_multihashmap_remove (sessions, |
186 | &session->peer.hashPubKey, session)); | 186 | &session->peer.hashPubKey, session)); |
187 | GNUNET_STATISTICS_set (GSC_stats, | 187 | GNUNET_STATISTICS_set (GSC_stats, |
188 | gettext_noop ("# established sessions"), | 188 | gettext_noop ("# entries in session map"), |
189 | GNUNET_CONTAINER_multihashmap_size (sessions), | 189 | GNUNET_CONTAINER_multihashmap_size (sessions), |
190 | GNUNET_NO); | 190 | GNUNET_NO); |
191 | if (NULL != session->tmap) | 191 | if (NULL != session->tmap) |
@@ -223,7 +223,7 @@ GSC_SESSIONS_create (const struct GNUNET_PeerIdentity *peer, | |||
223 | &peer->hashPubKey, session, | 223 | &peer->hashPubKey, session, |
224 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); | 224 | GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY)); |
225 | GNUNET_STATISTICS_update (GSC_stats, | 225 | GNUNET_STATISTICS_update (GSC_stats, |
226 | gettext_noop ("# established sessions"), | 226 | gettext_noop ("# entries in session map"), |
227 | GNUNET_CONTAINER_multihashmap_size (sessions), | 227 | GNUNET_CONTAINER_multihashmap_size (sessions), |
228 | GNUNET_NO); | 228 | GNUNET_NO); |
229 | /* FIXME: we should probably do this periodically (in case | 229 | /* FIXME: we should probably do this periodically (in case |
@@ -811,9 +811,6 @@ GSC_SESSIONS_done () | |||
811 | NULL); | 811 | NULL); |
812 | GNUNET_CONTAINER_multihashmap_destroy (sessions); | 812 | GNUNET_CONTAINER_multihashmap_destroy (sessions); |
813 | sessions = NULL; | 813 | sessions = NULL; |
814 | GNUNET_STATISTICS_set (GSC_stats, | ||
815 | gettext_noop ("# established sessions"), | ||
816 | 0, GNUNET_NO); | ||
817 | } | 814 | } |
818 | 815 | ||
819 | /* end of gnunet-service-core_sessions.c */ | 816 | /* end of gnunet-service-core_sessions.c */ |