summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorTimo Sirainen <cras@irssi.org>2002-01-22 20:29:45 +0000
committercras <cras@dbcabf3a-b0e7-0310-adc4-f8d773084564>2002-01-22 20:29:45 +0000
commit0157d234f87337f51bb6e3fb285eb89dc44ac5ac (patch)
tree2c1f88ed3c07eec00888d3a5d1590d582a19007e /src/core
parent5202ef93147c71a746e31f656d9735077ee86fa2 (diff)
downloadirssi-0157d234f87337f51bb6e3fb285eb89dc44ac5ac.zip
Added /SET proxy_string_after setting which gets sent after NICK/USER, bnc
wants this. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2338 dbcabf3a-b0e7-0310-adc4-f8d773084564
Diffstat (limited to 'src/core')
-rw-r--r--src/core/server-connect-rec.h2
-rw-r--r--src/core/servers-reconnect.c1
-rw-r--r--src/core/servers-setup.c2
-rw-r--r--src/core/servers.c1
4 files changed, 5 insertions, 1 deletions
diff --git a/src/core/server-connect-rec.h b/src/core/server-connect-rec.h
index 4aeba819..a59880e4 100644
--- a/src/core/server-connect-rec.h
+++ b/src/core/server-connect-rec.h
@@ -8,7 +8,7 @@ int refcount;
/* if we're connecting via proxy, or just NULLs */
char *proxy;
int proxy_port;
-char *proxy_string, *proxy_password;
+char *proxy_string, *proxy_string_after, *proxy_password;
unsigned short family; /* 0 = don't care, AF_INET or AF_INET6 */
char *tag; /* try to keep this tag when connected to server */
diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c
index 8b59d06d..429ffc43 100644
--- a/src/core/servers-reconnect.c
+++ b/src/core/servers-reconnect.c
@@ -140,6 +140,7 @@ server_connect_copy_skeleton(SERVER_CONNECT_REC *src, int connect_info)
dest->proxy = g_strdup(src->proxy);
dest->proxy_port = src->proxy_port;
dest->proxy_string = g_strdup(src->proxy_string);
+ dest->proxy_string_after = g_strdup(src->proxy_string_after);
dest->proxy_password = g_strdup(src->proxy_password);
dest->tag = g_strdup(src->tag);
diff --git a/src/core/servers-setup.c b/src/core/servers-setup.c
index c1db7d1c..3f500a07 100644
--- a/src/core/servers-setup.c
+++ b/src/core/servers-setup.c
@@ -131,6 +131,7 @@ static void server_setup_fill(SERVER_CONNECT_REC *conn,
conn->proxy = g_strdup(settings_get_str("proxy_address"));
conn->proxy_port = settings_get_int("proxy_port");
conn->proxy_string = g_strdup(settings_get_str("proxy_string"));
+ conn->proxy_string_after = g_strdup(settings_get_str("proxy_string_after"));
conn->proxy_password = g_strdup(settings_get_str("proxy_password"));
}
@@ -515,6 +516,7 @@ void servers_setup_init(void)
settings_add_str("proxy", "proxy_address", "");
settings_add_int("proxy", "proxy_port", 6667);
settings_add_str("proxy", "proxy_string", "CONNECT %s %d");
+ settings_add_str("proxy", "proxy_string_after", "");
settings_add_str("proxy", "proxy_password", "");
setupservers = NULL;
diff --git a/src/core/servers.c b/src/core/servers.c
index 89f32aea..d31f64ad 100644
--- a/src/core/servers.c
+++ b/src/core/servers.c
@@ -467,6 +467,7 @@ void server_connect_unref(SERVER_CONNECT_REC *conn)
g_free_not_null(conn->proxy);
g_free_not_null(conn->proxy_string);
+ g_free_not_null(conn->proxy_string_after);
g_free_not_null(conn->proxy_password);
g_free_not_null(conn->tag);