diff options
author | Nathan S. Evans <evans@in.tum.de> | 2011-01-12 16:41:54 +0000 |
---|---|---|
committer | Nathan S. Evans <evans@in.tum.de> | 2011-01-12 16:41:54 +0000 |
commit | 4704ec77ff485e876ddbde73a7df755d061465eb (patch) | |
tree | c2eed7346292b83f6561273c9b9862d3d278f5e2 /src | |
parent | 02bec4889c79f4edcb1ce216c7ad52c4b663de32 (diff) | |
download | gnunet-4704ec77ff485e876ddbde73a7df755d061465eb.tar.gz gnunet-4704ec77ff485e876ddbde73a7df755d061465eb.zip |
make really loud unable to communicate with peerinfo messages go away
Diffstat (limited to 'src')
-rw-r--r-- | src/core/gnunet-service-core.c | 8 | ||||
-rw-r--r-- | src/dv/gnunet-service-dv.c | 2 | ||||
-rw-r--r-- | src/nat/upnp-discover.c | 6 | ||||
-rw-r--r-- | src/peerinfo/peerinfo_api.c | 2 | ||||
-rw-r--r-- | src/topology/gnunet-daemon-topology.c | 2 | ||||
-rw-r--r-- | src/transport/gnunet-service-transport.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c index 088ec8ba6..dbf927dd5 100644 --- a/src/core/gnunet-service-core.c +++ b/src/core/gnunet-service-core.c | |||
@@ -2944,8 +2944,8 @@ handle_client_request_connect (void *cls, | |||
2944 | &my_identity, | 2944 | &my_identity, |
2945 | sizeof (struct GNUNET_PeerIdentity))) | 2945 | sizeof (struct GNUNET_PeerIdentity))) |
2946 | { | 2946 | { |
2947 | GNUNET_break (0); | 2947 | /* In this case a client has asked us to connect to ourselves, not really an error! */ |
2948 | GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); | 2948 | GNUNET_SERVER_receive_done (client, GNUNET_OK); |
2949 | return; | 2949 | return; |
2950 | } | 2950 | } |
2951 | GNUNET_break (ntohl (cm->reserved) == 0); | 2951 | GNUNET_break (ntohl (cm->reserved) == 0); |
@@ -3014,7 +3014,7 @@ process_hello_retry_send_key (void *cls, | |||
3014 | 3014 | ||
3015 | if (err_msg != NULL) | 3015 | if (err_msg != NULL) |
3016 | { | 3016 | { |
3017 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3017 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3018 | _("Error in communication with PEERINFO service\n")); | 3018 | _("Error in communication with PEERINFO service\n")); |
3019 | /* return; */ | 3019 | /* return; */ |
3020 | } | 3020 | } |
@@ -3336,7 +3336,7 @@ process_hello_retry_handle_set_key (void *cls, | |||
3336 | 3336 | ||
3337 | if (err_msg != NULL) | 3337 | if (err_msg != NULL) |
3338 | { | 3338 | { |
3339 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 3339 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
3340 | _("Error in communication with PEERINFO service\n")); | 3340 | _("Error in communication with PEERINFO service\n")); |
3341 | /* return; */ | 3341 | /* return; */ |
3342 | } | 3342 | } |
diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 223b95fed..a4c78a942 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c | |||
@@ -2823,7 +2823,7 @@ process_peerinfo (void *cls, | |||
2823 | int sent; | 2823 | int sent; |
2824 | if (err_msg != NULL) | 2824 | if (err_msg != NULL) |
2825 | { | 2825 | { |
2826 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2826 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2827 | _("Error in communication with PEERINFO service\n")); | 2827 | _("Error in communication with PEERINFO service\n")); |
2828 | /* return; */ | 2828 | /* return; */ |
2829 | } | 2829 | } |
diff --git a/src/nat/upnp-discover.c b/src/nat/upnp-discover.c index 654be490e..2e609d790 100644 --- a/src/nat/upnp-discover.c +++ b/src/nat/upnp-discover.c | |||
@@ -22,7 +22,7 @@ | |||
22 | * Code in this file is originally based on the miniupnp library. | 22 | * Code in this file is originally based on the miniupnp library. |
23 | * Copyright (c) 2005-2009, Thomas BERNARD. All rights reserved. | 23 | * Copyright (c) 2005-2009, Thomas BERNARD. All rights reserved. |
24 | * | 24 | * |
25 | * Original licence: | 25 | * Original license: |
26 | * | 26 | * |
27 | * Redistribution and use in source and binary forms, with or without | 27 | * Redistribution and use in source and binary forms, with or without |
28 | * modification, are permitted provided that the following conditions are met: | 28 | * modification, are permitted provided that the following conditions are met: |
@@ -70,7 +70,7 @@ | |||
70 | #define DESCRIPTION_BUFSIZE 2048 | 70 | #define DESCRIPTION_BUFSIZE 2048 |
71 | #define CURL_EASY_SETOPT(c, a, b) do { ret = curl_easy_setopt(c, a, b); if (ret != CURLE_OK) GNUNET_log(GNUNET_ERROR_TYPE_WARNING, _("%s failed at %s:%d: `%s'\n"), "curl_easy_setopt", __FILE__, __LINE__, curl_easy_strerror(ret)); } while (0) | 71 | #define CURL_EASY_SETOPT(c, a, b) do { ret = curl_easy_setopt(c, a, b); if (ret != CURLE_OK) GNUNET_log(GNUNET_ERROR_TYPE_WARNING, _("%s failed at %s:%d: `%s'\n"), "curl_easy_setopt", __FILE__, __LINE__, curl_easy_strerror(ret)); } while (0) |
72 | #define PRINT_SOCKET_ERROR(a) GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "UPnP", _("%s failed at %s:%d: '%s'\n"), a, __FILE__, __LINE__, strerror (errno)); | 72 | #define PRINT_SOCKET_ERROR(a) GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "UPnP", _("%s failed at %s:%d: '%s'\n"), a, __FILE__, __LINE__, strerror (errno)); |
73 | 73 | #define PRINT_SOCKET_ERROR_STR(a, b) GNUNET_log_from(GNUNET_ERROR_TYPE_WARNING, "UPnP", _("%s failed at %s:%d: '%s' on `%s'\n"), a, __FILE__, __LINE__, strerror (errno), b); | |
74 | 74 | ||
75 | /** | 75 | /** |
76 | * Callback function called when download is finished. | 76 | * Callback function called when download is finished. |
@@ -1204,7 +1204,7 @@ UPNP_discover_ (const char *multicastif, | |||
1204 | if_index = 0; | 1204 | if_index = 0; |
1205 | #endif | 1205 | #endif |
1206 | if (!if_index) | 1206 | if (!if_index) |
1207 | PRINT_SOCKET_ERROR ("if_nametoindex"); | 1207 | PRINT_SOCKET_ERROR_STR ("if_nametoindex", multicastif); |
1208 | 1208 | ||
1209 | if (GNUNET_NETWORK_socket_setsockopt | 1209 | if (GNUNET_NETWORK_socket_setsockopt |
1210 | (sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &if_index, | 1210 | (sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &if_index, |
diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index a3a396d90..3ec34c705 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c | |||
@@ -539,7 +539,7 @@ signal_timeout (void *cls, | |||
539 | ic->h->tq_tail, | 539 | ic->h->tq_tail, |
540 | ic->tqe); | 540 | ic->tqe); |
541 | reconnect (ic->h); | 541 | reconnect (ic->h); |
542 | ic->callback (ic->callback_cls, NULL, NULL,err_msg); | 542 | ic->callback (ic->callback_cls, NULL, NULL, err_msg); |
543 | ic->callback = NULL; | 543 | ic->callback = NULL; |
544 | GNUNET_free_non_null (ic->tqe); | 544 | GNUNET_free_non_null (ic->tqe); |
545 | GNUNET_free (err_msg); | 545 | GNUNET_free (err_msg); |
diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 7cab16d15..0eb6869e8 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c | |||
@@ -936,7 +936,7 @@ process_peer (void *cls, | |||
936 | 936 | ||
937 | if (err_msg != NULL) | 937 | if (err_msg != NULL) |
938 | { | 938 | { |
939 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 939 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
940 | _("Error in communication with PEERINFO service\n")); | 940 | _("Error in communication with PEERINFO service\n")); |
941 | /* return; */ | 941 | /* return; */ |
942 | } | 942 | } |
diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 55aba048e..b2dec8f9a 100644 --- a/src/transport/gnunet-service-transport.c +++ b/src/transport/gnunet-service-transport.c | |||
@@ -2725,7 +2725,7 @@ add_hello_for_peer (void *cls, | |||
2725 | 2725 | ||
2726 | if (err_msg != NULL) | 2726 | if (err_msg != NULL) |
2727 | { | 2727 | { |
2728 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 2728 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
2729 | _("Error in communication with PEERINFO service\n")); | 2729 | _("Error in communication with PEERINFO service\n")); |
2730 | /* return; */ | 2730 | /* return; */ |
2731 | } | 2731 | } |
@@ -4056,7 +4056,7 @@ check_hello_validated (void *cls, | |||
4056 | 4056 | ||
4057 | if (err_msg != NULL) | 4057 | if (err_msg != NULL) |
4058 | { | 4058 | { |
4059 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | 4059 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
4060 | _("Error in communication with PEERINFO service\n")); | 4060 | _("Error in communication with PEERINFO service\n")); |
4061 | /* return; */ | 4061 | /* return; */ |
4062 | } | 4062 | } |