SOCKS: various fixes to API and code
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user