[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r14230 - in gnunet: . src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r14230 - in gnunet: . src/util |
Date: |
Mon, 24 Jan 2011 12:13:39 +0100 |
Author: grothoff
Date: 2011-01-24 12:13:39 +0100 (Mon, 24 Jan 2011)
New Revision: 14230
Modified:
gnunet/TODO
gnunet/src/util/client.c
Log:
do not try TCP if port is 0
Modified: gnunet/TODO
===================================================================
--- gnunet/TODO 2011-01-23 17:15:21 UTC (rev 14229)
+++ gnunet/TODO 2011-01-24 11:13:39 UTC (rev 14230)
@@ -7,6 +7,9 @@
+ implement UDP, HTTP/HTTPS
* Transport:
- UDP fragmentation
+* UTIL / FS:
+ - gnunet-publish tires to connect to service even if
+ run with 'simulation' option (-s)
* DHT: [Nate]
- track paths content travels (PUT, reply-to-get) in messages,
pass to client (client API & protocol already support this!)
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2011-01-23 17:15:21 UTC (rev 14229)
+++ gnunet/src/util/client.c 2011-01-24 11:13:39 UTC (rev 14230)
@@ -253,6 +253,7 @@
};
+
/**
* Try to connect to the service.
*
@@ -272,7 +273,7 @@
unsigned long long port;
#if AF_UNIX
- if (0 == attempt % 2)
+ if (0 == (attempt % 2))
{
/* on even rounds, try UNIX */
if (GNUNET_OK ==
@@ -314,6 +315,27 @@
service_name);
return NULL;
}
+ if (port == 0)
+ {
+#if AF_UNIX
+ if (0 != (attempt % 2))
+ {
+ /* try UNIX */
+ if (GNUNET_OK ==
+ GNUNET_CONFIGURATION_get_value_string (cfg,
+ service_name,
+ "UNIXPATH", &unixpath))
+ {
+ sock = GNUNET_CONNECTION_create_from_connect_to_unixpath (cfg,
+
unixpath);
+ GNUNET_free (unixpath);
+ if (sock != NULL)
+ return sock;
+ }
+ }
+#endif
+ return NULL;
+ }
sock = GNUNET_CONNECTION_create_from_connect (cfg,
hostname,
port);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r14230 - in gnunet: . src/util,
gnunet <=