[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r8500 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r8500 - gnunet/src/util |
Date: |
Tue, 9 Jun 2009 17:40:27 -0600 |
Author: grothoff
Date: 2009-06-09 17:40:27 -0600 (Tue, 09 Jun 2009)
New Revision: 8500
Modified:
gnunet/src/util/common_logging.c
gnunet/src/util/network.c
Log:
keep addr
Modified: gnunet/src/util/common_logging.c
===================================================================
--- gnunet/src/util/common_logging.c 2009-06-09 23:05:11 UTC (rev 8499)
+++ gnunet/src/util/common_logging.c 2009-06-09 23:40:27 UTC (rev 8500)
@@ -417,6 +417,9 @@
static char b2[6];
const struct sockaddr_in * v4;
const struct sockaddr_in6 *v6;
+
+ if (addr == NULL)
+ return _("unknown address");
switch (addr->sa_family)
{
case AF_INET:
Modified: gnunet/src/util/network.c
===================================================================
--- gnunet/src/util/network.c 2009-06-09 23:05:11 UTC (rev 8499)
+++ gnunet/src/util/network.c 2009-06-09 23:40:27 UTC (rev 8500)
@@ -40,7 +40,7 @@
#include "gnunet_network_lib.h"
#include "gnunet_scheduler_lib.h"
-#define DEBUG_NETWORK GNUNET_YES
+#define DEBUG_NETWORK GNUNET_NO
struct GNUNET_NETWORK_TransmitHandle
{
@@ -606,6 +606,7 @@
socklen_t addrlen, size_t maxbuf)
{
int s;
+ struct GNUNET_NETWORK_SocketHandle *ret;
s = SOCKET (af_family, SOCK_STREAM, 0);
if (s == -1)
@@ -633,7 +634,11 @@
GNUNET_break (0 == CLOSE (s));
return NULL;
}
- return GNUNET_NETWORK_socket_create_from_existing (sched, s, maxbuf);
+ ret = GNUNET_NETWORK_socket_create_from_existing (sched, s, maxbuf);
+ ret->addr = GNUNET_malloc (addrlen);
+ memcpy (ret->addr, serv_addr, addrlen);
+ ret->addrlen = addrlen;
+ return ret;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r8500 - gnunet/src/util,
gnunet <=