[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14158 - in gnunet/src: core dv nat peerinfo topology trans
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14158 - in gnunet/src: core dv nat peerinfo topology transport |
Date: |
Wed, 12 Jan 2011 17:41:54 +0100 |
Author: nevans
Date: 2011-01-12 17:41:54 +0100 (Wed, 12 Jan 2011)
New Revision: 14158
Modified:
gnunet/src/core/gnunet-service-core.c
gnunet/src/dv/gnunet-service-dv.c
gnunet/src/nat/upnp-discover.c
gnunet/src/peerinfo/peerinfo_api.c
gnunet/src/topology/gnunet-daemon-topology.c
gnunet/src/transport/gnunet-service-transport.c
Log:
make really loud unable to communicate with peerinfo messages go away
Modified: gnunet/src/core/gnunet-service-core.c
===================================================================
--- gnunet/src/core/gnunet-service-core.c 2011-01-12 14:02:55 UTC (rev
14157)
+++ gnunet/src/core/gnunet-service-core.c 2011-01-12 16:41:54 UTC (rev
14158)
@@ -2944,8 +2944,8 @@
&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 @@
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 @@
if (err_msg != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Error in communication with PEERINFO service\n"));
/* return; */
}
Modified: gnunet/src/dv/gnunet-service-dv.c
===================================================================
--- gnunet/src/dv/gnunet-service-dv.c 2011-01-12 14:02:55 UTC (rev 14157)
+++ gnunet/src/dv/gnunet-service-dv.c 2011-01-12 16:41:54 UTC (rev 14158)
@@ -2823,7 +2823,7 @@
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; */
}
Modified: gnunet/src/nat/upnp-discover.c
===================================================================
--- gnunet/src/nat/upnp-discover.c 2011-01-12 14:02:55 UTC (rev 14157)
+++ gnunet/src/nat/upnp-discover.c 2011-01-12 16:41:54 UTC (rev 14158)
@@ -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,8 +70,8 @@
#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 @@
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,
Modified: gnunet/src/peerinfo/peerinfo_api.c
===================================================================
--- gnunet/src/peerinfo/peerinfo_api.c 2011-01-12 14:02:55 UTC (rev 14157)
+++ gnunet/src/peerinfo/peerinfo_api.c 2011-01-12 16:41:54 UTC (rev 14158)
@@ -539,7 +539,7 @@
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);
Modified: gnunet/src/topology/gnunet-daemon-topology.c
===================================================================
--- gnunet/src/topology/gnunet-daemon-topology.c 2011-01-12 14:02:55 UTC
(rev 14157)
+++ gnunet/src/topology/gnunet-daemon-topology.c 2011-01-12 16:41:54 UTC
(rev 14158)
@@ -936,7 +936,7 @@
if (err_msg != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Error in communication with PEERINFO service\n"));
/* return; */
}
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2011-01-12 14:02:55 UTC
(rev 14157)
+++ gnunet/src/transport/gnunet-service-transport.c 2011-01-12 16:41:54 UTC
(rev 14158)
@@ -2725,7 +2725,7 @@
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 @@
if (err_msg != NULL)
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
_("Error in communication with PEERINFO service\n"));
/* return; */
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14158 - in gnunet/src: core dv nat peerinfo topology transport,
gnunet <=