summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-01-24 20:57:16 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-01-24 20:57:16 +0000
commit182adb805c59a2469810789697821c70249438f8 (patch)
tree49c1a8b28fd2f0901724a9c1f88908f60671cbc7 /src/core
parentd74d284463d4aa490b789f9be45a3e478929b0f7 (diff)
downloadirssi-182adb805c59a2469810789697821c70249438f8.zip
/SERVER ADD: added -noproxy option and -proxy which just removes the
-noproxy. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2344 dbcabf3a-b0e7-0310-adc4-f8d773084564
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)