make really loud unable to communicate with peerinfo messages go away

diff --git a/src/core/gnunet-service-core.c b/src/core/gnunet-service-core.c
index 088ec8ba6dfbc7bb928e0ce28057ec51d673731c..dbf927dd5cc2bc69786a6e679843d3c78a7f124a 100644 (file)
--- 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 223b95fedd3af3d957ab629bd4a48bc98316eb1e..a4c78a94228a8400ba200040e314351170d2e964 100644 (file)
--- 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 654be490e6e42fd8aa5557830bf8c07a81b6f2d9..2e609d79034038d533274161e547b987ee3a52e3 100644 (file)
--- 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 a3a396d90154f32427635026641e43c803f8ce42..3ec34c7055288040c00da87c16519415e86d5da2 100644 (file)
--- 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 7cab16d15a7b89de04d0c4a09a6ba0bcada03de3..0eb6869e8dc7b1816be7021a484f638b21b0e6fe 100644 (file)
--- 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 55aba048e43fd37a7bcbea65b8a9f9c867f6e669..b2dec8f9a5781f8f027edfed1dd037c532a0d25d 100644 (file)
--- 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; */
   }