[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34776 - gnunet/src/hostlist
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34776 - gnunet/src/hostlist |
Date: |
Tue, 23 Dec 2014 23:39:55 +0100 |
Author: grothoff
Date: 2014-12-23 23:39:55 +0100 (Tue, 23 Dec 2014)
New Revision: 34776
Modified:
gnunet/src/hostlist/gnunet-daemon-hostlist_client.c
Log:
-actually, require proxy option to be empty, cleaner
Modified: gnunet/src/hostlist/gnunet-daemon-hostlist_client.c
===================================================================
--- gnunet/src/hostlist/gnunet-daemon-hostlist_client.c 2014-12-23 22:38:37 UTC
(rev 34775)
+++ gnunet/src/hostlist/gnunet-daemon-hostlist_client.c 2014-12-23 22:39:55 UTC
(rev 34776)
@@ -970,7 +970,7 @@
GNUNET_STATISTICS_update (stats,
gettext_noop ("# hostlist downloads initiated"), 1,
GNUNET_NO);
- if (proxy != NULL)
+ if (NULL != proxy)
{
CURL_EASY_SETOPT (curl, CURLOPT_PROXY, proxy);
CURL_EASY_SETOPT (curl, CURLOPT_PROXYTYPE, proxy_type);
@@ -1577,21 +1577,18 @@
proxy_type = CURLPROXY_SOCKS5_HOSTNAME;
else
{
- if (0 != strcasecmp (proxytype_str, "NONE"))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Invalid proxy type: `%s', disabling proxy! Check
configuration!\n"),
- proxytype_str);
- GNUNET_free (proxytype_str);
- GNUNET_free (proxy);
- proxy = NULL;
- GNUNET_free_non_null (proxy_username);
- proxy_username = NULL;
- GNUNET_free_non_null (proxy_password);
- proxy_password = NULL;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Invalid proxy type: `%s', disabling proxy! Check
configuration!\n"),
+ proxytype_str);
+ GNUNET_free (proxytype_str);
+ GNUNET_free (proxy);
+ proxy = NULL;
+ GNUNET_free_non_null (proxy_username);
+ proxy_username = NULL;
+ GNUNET_free_non_null (proxy_password);
+ proxy_password = NULL;
- return GNUNET_SYSERR;
- }
+ return GNUNET_SYSERR;
}
}
GNUNET_free_non_null (proxytype_str);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34776 - gnunet/src/hostlist,
gnunet <=