zynk/irssi
2
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2026-08-23 10:32:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 9caed63b21 into 2b7f32633c

Browse source
This commit is contained in:
Bob Mottram 2016-08-24 21:02:02 +00:00 • committed by GitHub
commit 5b6b9f1af8
20 changed files with 1063 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/irc/core/irc-servers.c
View file

@ -41,6 +41,7 @@
#include "servers-reconnect.h"
#include "servers-redirect.h"
#include "modes.h"
#include "network-proxy.h"
#include "settings.h"
#include "recode.h"
@ -213,22 +214,19 @@ static void server_init(IRC_SERVER_REC *server)
IRC_SERVER_CONNECT_REC *conn;
char *address, *ptr, *username, *cmd;
const struct network_proxy_send_string_info send_info = {
.host = server->connrec->address,
.port = server->connrec->port,
.func = irc_send_cmd_now_wrapper,
.obj = server
};
g_return_if_fail(server != NULL);
conn = server->connrec;
if (conn->proxy != NULL && conn->proxy_password != NULL &&
*conn->proxy_password != '\0') {
cmd = g_strdup_printf("PASS %s", conn->proxy_password);
irc_send_cmd_now(server, cmd);
g_free(cmd);
}
if (conn->proxy != NULL && conn->proxy_string != NULL) {
cmd = g_strdup_printf(conn->proxy_string, conn->address, conn->port);
irc_send_cmd_now(server, cmd);
g_free(cmd);
}
if (conn->proxy && conn->proxy->send_string)
conn->proxy->send_string(conn->proxy, &send_info);
if (conn->sasl_mechanism != SASL_MECHANISM_NONE)
cap_toggle(server, "sasl", TRUE);
@ -269,11 +267,8 @@ static void server_init(IRC_SERVER_REC *server)
g_free(cmd);
g_free(username);
if (conn->proxy != NULL && conn->proxy_string_after != NULL) {
cmd = g_strdup_printf(conn->proxy_string_after, conn->address, conn->port);
irc_send_cmd_now(server, cmd);
g_free(cmd);
}
if (conn->proxy && conn->proxy->send_string_after)
conn->proxy->send_string_after(conn->proxy, &send_info);
server->isupport = g_hash_table_new((GHashFunc) g_istr_hash,
(GCompareFunc) g_istr_equal);
@ -344,6 +339,11 @@ void irc_server_connect(SERVER_REC *server)
}
}
void irc_send_cmd_now_wrapper(void *server, const char *cmd)
{
return irc_send_cmd_now((IRC_SERVER_REC *)server, cmd);
}
/* Returns TRUE if `command' is sent to `target' */
static int command_has_target(const char *cmd, const char *target)
{