summaryrefslogtreecommitdiff
path: root/zyklonb.c
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2015-07-23 04:07:30 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2015-07-23 04:26:59 +0200
commit4a8957208909ec9bd496af9455f2c6f65f470269 (patch)
tree5b87fe059713d78f3e2eaa3e5941a6666237ba99 /zyklonb.c
parentc34bb483cab1bffec6449c4363d5099114c5cbe5 (diff)
downloadxK-4a8957208909ec9bd496af9455f2c6f65f470269.tar.gz
xK-4a8957208909ec9bd496af9455f2c6f65f470269.tar.xz
xK-4a8957208909ec9bd496af9455f2c6f65f470269.zip
SOCKS: various fixes to API and code
Diffstat (limited to 'zyklonb.c')
-rw-r--r--zyklonb.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/zyklonb.c b/zyklonb.c
index 991ef13..2efc794 100644
--- a/zyklonb.c
+++ b/zyklonb.c
@@ -1708,11 +1708,6 @@ irc_establish_connection_socks (struct bot_context *ctx,
socks_connector_init (connector, poller);
data.succeeded = false;
- connector->hostname = socks_host;
- connector->service = socks_port;
- connector->username = str_map_find (&ctx->config, "socks_username");
- connector->password = str_map_find (&ctx->config, "socks_password");
-
connector->on_connected = irc_on_socks_connected;
connector->on_connecting = irc_on_socks_connecting;
connector->on_error = irc_on_socks_error;
@@ -1721,7 +1716,9 @@ irc_establish_connection_socks (struct bot_context *ctx,
if (socks_connector_add_target (connector, host, service, e))
{
- socks_connector_run (connector);
+ socks_connector_run (connector, socks_host, socks_port,
+ str_map_find (&ctx->config, "socks_username"),
+ str_map_find (&ctx->config, "socks_password"));
while (data.polling)
poller_run (poller);
}