summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/server-setup-rec.h1
-rw-r--r--src/core/servers-setup.c3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/core/server-setup-rec.h b/src/core/server-setup-rec.h
index 4352bef7..f94ec9ae 100644
--- a/src/core/server-setup-rec.h
+++ b/src/core/server-setup-rec.h
@@ -14,6 +14,7 @@ IPADDR *own_ip4, *own_ip6; /* resolved own_address if not NULL */
time_t last_connect; /* to avoid reconnecting too fast.. */
unsigned int autoconnect:1;
+unsigned int no_proxy:1;
unsigned int last_failed:1; /* if last connection attempt failed */
unsigned int banned:1; /* if we're banned from this server */
unsigned int dns_error:1; /* DNS said the host doesn't exist */
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index 3f500a07..a8dd8467 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -156,6 +156,9 @@ static void server_setup_fill_server(SERVER_CONNECT_REC *conn,
sserver->last_connect = time(NULL);
+ if (sserver->no_proxy)
+ g_free_and_null(conn->proxy);
+
if (sserver->family != 0 && conn->family == 0)
conn->family = sserver->family;
if (sserver->port > 0 && conn->port <= 0)