diff options
author | Christian Grothoff <christian@grothoff.org> | 2013-12-22 15:09:48 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2013-12-22 15:09:48 +0000 |
commit | 816907b6881e3f25a41e845ddd34cc01f79b1a2b (patch) | |
tree | f36926133873ea65b559b868167feed11978ef49 /src | |
parent | caf3ec1710d8e0964790fb8691a7ea8d51690513 (diff) | |
download | gnunet-816907b6881e3f25a41e845ddd34cc01f79b1a2b.tar.gz gnunet-816907b6881e3f25a41e845ddd34cc01f79b1a2b.zip |
-reduce log level
Diffstat (limited to 'src')
-rw-r--r-- | src/core/gnunet-service-core_kx.c | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/src/core/gnunet-service-core_kx.c b/src/core/gnunet-service-core_kx.c index d1990f8f4..8e4beac7b 100644 --- a/src/core/gnunet-service-core_kx.c +++ b/src/core/gnunet-service-core_kx.c | |||
@@ -941,7 +941,7 @@ GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx, | |||
941 | } | 941 | } |
942 | m = (const struct PingMessage *) msg; | 942 | m = (const struct PingMessage *) msg; |
943 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 943 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
944 | "Core service receives `%s' request from `%4s'.\n", "PING", | 944 | "Core service receives PING request from `%4s'.\n", |
945 | GNUNET_i2s (&kx->peer)); | 945 | GNUNET_i2s (&kx->peer)); |
946 | derive_iv (&iv, &kx->decrypt_key, m->iv_seed, &GSC_my_identity); | 946 | derive_iv (&iv, &kx->decrypt_key, m->iv_seed, &GSC_my_identity); |
947 | if (GNUNET_OK != | 947 | if (GNUNET_OK != |
@@ -953,18 +953,29 @@ GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx, | |||
953 | return; | 953 | return; |
954 | } | 954 | } |
955 | if (0 != | 955 | if (0 != |
956 | memcmp (&t.target, &GSC_my_identity, sizeof (struct GNUNET_PeerIdentity))) | 956 | memcmp (&t.target, |
957 | &GSC_my_identity, | ||
958 | sizeof (struct GNUNET_PeerIdentity))) | ||
957 | { | 959 | { |
958 | char sender[9]; | 960 | char sender[5]; |
959 | char peer[9]; | 961 | char peer[5]; |
960 | 962 | ||
961 | GNUNET_snprintf (sender, sizeof (sender), "%8s", GNUNET_i2s (&kx->peer)); | 963 | GNUNET_snprintf (sender, |
962 | GNUNET_snprintf (peer, sizeof (peer), "%8s", GNUNET_i2s (&t.target)); | 964 | sizeof (sender), |
963 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 965 | "%4s", |
964 | _ | 966 | GNUNET_i2s (&kx->peer)); |
965 | ("Received PING from `%s' for different identity: I am `%s', PONG identity: `%s'\n"), | 967 | GNUNET_snprintf (peer, |
966 | sender, GNUNET_i2s (&GSC_my_identity), peer); | 968 | sizeof (peer), |
967 | GNUNET_break_op (0); | 969 | "%4s", |
970 | GNUNET_i2s (&t.target)); | ||
971 | /* demoted ERROR to 'info' for now, as peers running < 0.10 | ||
972 | might be causing these, and we don't want to confuse users */ | ||
973 | GNUNET_log (GNUNET_ERROR_TYPE_INFO, | ||
974 | _("Received PING from `%s' for different identity: I am `%s', PONG identity: `%s'\n"), | ||
975 | sender, | ||
976 | GNUNET_i2s (&GSC_my_identity), | ||
977 | peer); | ||
978 | /* GNUNET_break_op (0); */ | ||
968 | return; | 979 | return; |
969 | } | 980 | } |
970 | /* construct PONG */ | 981 | /* construct PONG */ |
@@ -982,7 +993,7 @@ GSC_KX_handle_ping (struct GSC_KeyExchangeInfo *kx, | |||
982 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages created"), | 993 | GNUNET_STATISTICS_update (GSC_stats, gettext_noop ("# PONG messages created"), |
983 | 1, GNUNET_NO); | 994 | 1, GNUNET_NO); |
984 | GSC_NEIGHBOURS_transmit (&kx->peer, &tp.header, | 995 | GSC_NEIGHBOURS_transmit (&kx->peer, &tp.header, |
985 | GNUNET_TIME_UNIT_FOREVER_REL /* FIXME: timeout */ ); | 996 | GNUNET_TIME_UNIT_FOREVER_REL); |
986 | } | 997 | } |
987 | 998 | ||
988 | 999 | ||