[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36159 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36159 - gnunet/src/util |
Date: |
Fri, 31 Jul 2015 14:22:34 +0200 |
Author: burdges
Date: 2015-07-31 14:22:34 +0200 (Fri, 31 Jul 2015)
New Revision: 36159
Modified:
gnunet/src/util/Makefile.am
gnunet/src/util/client.c
Log:
Build socks.c and call it from client.c
It still won't work yet, now debugging.
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2015-07-31 12:20:36 UTC (rev 36158)
+++ gnunet/src/util/Makefile.am 2015-07-31 12:22:34 UTC (rev 36159)
@@ -111,6 +111,7 @@
signal.c \
strings.c \
time.c \
+ socks.c \
speedup.c speedup.h
libgnunetutil_la_LIBADD = \
Modified: gnunet/src/util/client.c
===================================================================
--- gnunet/src/util/client.c 2015-07-31 12:20:36 UTC (rev 36158)
+++ gnunet/src/util/client.c 2015-07-31 12:22:34 UTC (rev 36159)
@@ -29,6 +29,7 @@
#include "platform.h"
#include "gnunet_protocols.h"
#include "gnunet_util_lib.h"
+#include "gnunet_socks.h"
/**
@@ -339,6 +340,10 @@
char *hostname;
unsigned long long port;
+ /* Never use a local source if a proxy is configured */
+ if (GNUNET_YES == GNUNET_SOCKS_check_service (service_name,cfg))
+ return GNUNET_SOCKS_do_connect (service_name,cfg);
+
connection = NULL;
if (0 == (attempt % 2))
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36159 - gnunet/src/util,
gnunet <=