diff options
| -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 088ec8ba6d..dbf927dd5c 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, &my_identity, sizeof (struct GNUNET_PeerIdentity))) { - GNUNET_break (0); - GNUNET_SERVER_receive_done (client, GNUNET_SYSERR); + /* In this case a client has asked us to connect to ourselves, not really an error! */ + GNUNET_SERVER_receive_done (client, GNUNET_OK); return; } GNUNET_break (ntohl (cm->reserved) == 0); @@ -3014,7 +3014,7 @@ process_hello_retry_send_key (void *cls, if (err_msg != NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Error in communication with PEERINFO service\n")); /* return; */ } @@ -3336,7 +3336,7 @@ process_hello_retry_handle_set_key (void *cls, if (err_msg != NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Error in communication with PEERINFO service\n")); /* return; */ } diff --git a/src/dv/gnunet-service-dv.c b/src/dv/gnunet-service-dv.c index 223b95fedd..a4c78a9422 100644 --- a/src/dv/gnunet-service-dv.c +++ b/src/dv/gnunet-service-dv.c @@ -2823,7 +2823,7 @@ process_peerinfo (void *cls, int sent; if (err_msg != NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Error in communication with PEERINFO service\n")); /* return; */ } diff --git a/src/nat/upnp-discover.c b/src/nat/upnp-discover.c index 654be490e6..2e609d7903 100644 --- a/src/nat/upnp-discover.c +++ b/src/nat/upnp-discover.c @@ -22,7 +22,7 @@ * Code in this file is originally based on the miniupnp library. * Copyright (c) 2005-2009, Thomas BERNARD. All rights reserved. * - * Original licence: + * Original license: * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -70,7 +70,7 @@ #define DESCRIPTION_BUFSIZE 2048 #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) #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)); - +#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); /** * Callback function called when download is finished. @@ -1204,7 +1204,7 @@ UPNP_discover_ (const char *multicastif, if_index = 0; #endif if (!if_index) - PRINT_SOCKET_ERROR ("if_nametoindex"); + PRINT_SOCKET_ERROR_STR ("if_nametoindex", multicastif); if (GNUNET_NETWORK_socket_setsockopt (sudp, IPPROTO_IPV6, IPV6_MULTICAST_IF, &if_index, diff --git a/src/peerinfo/peerinfo_api.c b/src/peerinfo/peerinfo_api.c index a3a396d901..3ec34c7055 100644 --- a/src/peerinfo/peerinfo_api.c +++ b/src/peerinfo/peerinfo_api.c @@ -539,7 +539,7 @@ signal_timeout (void *cls, ic->h->tq_tail, ic->tqe); reconnect (ic->h); - ic->callback (ic->callback_cls, NULL, NULL,err_msg); + ic->callback (ic->callback_cls, NULL, NULL, err_msg); ic->callback = NULL; GNUNET_free_non_null (ic->tqe); GNUNET_free (err_msg); diff --git a/src/topology/gnunet-daemon-topology.c b/src/topology/gnunet-daemon-topology.c index 7cab16d15a..0eb6869e8d 100644 --- a/src/topology/gnunet-daemon-topology.c +++ b/src/topology/gnunet-daemon-topology.c @@ -936,7 +936,7 @@ process_peer (void *cls, if (err_msg != NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Error in communication with PEERINFO service\n")); /* return; */ } diff --git a/src/transport/gnunet-service-transport.c b/src/transport/gnunet-service-transport.c index 55aba048e4..b2dec8f9a5 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, if (err_msg != NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Error in communication with PEERINFO service\n")); /* return; */ } @@ -4056,7 +4056,7 @@ check_hello_validated (void *cls, if (err_msg != NULL) { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, _("Error in communication with PEERINFO service\n")); /* return; */ } |