diff options
-rw-r--r-- | src/util/Makefile.am | 1 | ||||
-rw-r--r-- | src/util/client.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 13a16448b..737726e3f 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am | |||
@@ -111,6 +111,7 @@ libgnunetutil_la_SOURCES = \ | |||
111 | signal.c \ | 111 | signal.c \ |
112 | strings.c \ | 112 | strings.c \ |
113 | time.c \ | 113 | time.c \ |
114 | socks.c \ | ||
114 | speedup.c speedup.h | 115 | speedup.c speedup.h |
115 | 116 | ||
116 | libgnunetutil_la_LIBADD = \ | 117 | libgnunetutil_la_LIBADD = \ |
diff --git a/src/util/client.c b/src/util/client.c index f74b8b161..88c43d4a1 100644 --- a/src/util/client.c +++ b/src/util/client.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "platform.h" | 29 | #include "platform.h" |
30 | #include "gnunet_protocols.h" | 30 | #include "gnunet_protocols.h" |
31 | #include "gnunet_util_lib.h" | 31 | #include "gnunet_util_lib.h" |
32 | #include "gnunet_socks.h" | ||
32 | 33 | ||
33 | 34 | ||
34 | /** | 35 | /** |
@@ -339,6 +340,10 @@ do_connect (const char *service_name, | |||
339 | char *hostname; | 340 | char *hostname; |
340 | unsigned long long port; | 341 | unsigned long long port; |
341 | 342 | ||
343 | /* Never use a local source if a proxy is configured */ | ||
344 | if (GNUNET_YES == GNUNET_SOCKS_check_service (service_name,cfg)) | ||
345 | return GNUNET_SOCKS_do_connect (service_name,cfg); | ||
346 | |||
342 | connection = NULL; | 347 | connection = NULL; |
343 | if (0 == (attempt % 2)) | 348 | if (0 == (attempt % 2)) |
344 | { | 349 | { |