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

Allow servers with the same server and port to be part of multiple networks. This should make life much easier for znc users. Thanks to Tykling, Bazerka and znx.

Browse source 
git-svn-id: file:///var/www/svn.irssi.org/SVN/irssi/trunk@5125 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Alexander Færøy 2010-03-21 20:06:10 +00:00 • committed by ahf
commit e37be456cd
5 changed files with 29 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/fe-common/core/fe-common-core.c
View file

@ -346,10 +346,13 @@ static void autoconnect_servers(void)
if (rec->autoconnect &&
(rec->chatnet == NULL ||
gslist_find_icase_string(chatnets, rec->chatnet) == NULL)) {
if (rec->chatnet != NULL)
if (rec->chatnet != NULL) {
chatnets = g_slist_append(chatnets, rec->chatnet);
str = g_strdup_printf("-network %s %s %d", rec->chatnet, rec->address, rec->port);
} else {
str = g_strdup_printf("%s %d", rec->address, rec->port);
}
str = g_strdup_printf("%s %d", rec->address, rec->port);
signal_emit("command connect", 1, str);
g_free(str);
}

28
src/fe-common/core/fe-server.c
View file

@ -108,7 +108,7 @@ static void cmd_server_add(const char *data)
{
GHashTable *optlist;
SERVER_SETUP_REC *rec;
char *addr, *portstr, *password, *value;
char *addr, *portstr, *password, *value, *chatnet;
void *free_arg;
int port;
@ -119,7 +119,10 @@ static void cmd_server_add(const char *data)
if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
port = *portstr == '\0' ? DEFAULT_SERVER_ADD_PORT : atoi(portstr);
rec = server_setup_find_port(addr, port);
chatnet = g_hash_table_lookup(optlist, "network");
rec = server_setup_find(addr, port, chatnet);
if (rec == NULL) {
rec = create_server_setup(optlist);
if (rec == NULL) {
@ -194,21 +197,30 @@ static void cmd_server_add(const char *data)
cmd_params_free(free_arg);
}
/* SYNTAX: SERVER REMOVE <address> [<port>] */
/* SYNTAX: SERVER REMOVE <address> [<port>] [<network>] */
static void cmd_server_remove(const char *data)
{
SERVER_SETUP_REC *rec;
char *addr, *port;
char *addr, *port, *chatnet;
void *free_arg;
if (!cmd_get_params(data, &free_arg, 2, &addr, &port))
if (!cmd_get_params(data, &free_arg, 3, &addr, &port, &chatnet))
return;
if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
if (*port == '\0')
rec = server_setup_find(addr, -1, NULL);
if (*port == '\0') {
if (*chatnet == '\0')
rec = server_setup_find(addr, -1, NULL);
else
rec = server_setup_find(addr, -1, chatnet);
}
else
rec = server_setup_find_port(addr, atoi(port));
{
if (*chatnet == '\0')
rec = server_setup_find(addr, atoi(port), NULL);
else
rec = server_setup_find(addr, atoi(port), chatnet);
}
if (rec == NULL)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr, port);