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

Merge pull request #22 from ailin-nemui/ports

Browse source 
Something with server add
This commit is contained in:
ailin-nemui 2021-08-31 15:30:48 +02:00 • committed by GitHub
commit b7b91ed2bf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 60 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -457,8 +457,9 @@ static SERVER_SETUP_REC *server_setup_read(CONFIG_NODE *node)
port = config_node_get_int(node, "port", 0);
chatnet = config_node_get_str(node, "chatnet", NULL);
if (server_setup_find(server, port, chatnet) != NULL) {
return NULL;
if ((rec = server_setup_find(server, port, chatnet)) != NULL && rec->port == port) {
/* duplicate server setup */
server_setup_remove(rec);
}
rec = NULL;
@ -549,7 +550,7 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
return -1;
address = config_node_get_str(node, "address", NULL);
chatnet = config_node_get_str(node, "chatnet", NULL);
chatnet = config_node_get_str(node, "chatnet", "");
port = config_node_get_int(node, "port", 0);
if (address == NULL || chatnet == NULL) {
@ -557,7 +558,7 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
}
if (g_ascii_strcasecmp(address, server->address) != 0 ||
g_ascii_strcasecmp(chatnet, server->chatnet) != 0 ||
g_ascii_strcasecmp(chatnet, server->chatnet != NULL ? server->chatnet : "") != 0 ||
port != server->port) {
return 1;
}
@ -565,16 +566,20 @@ static int compare_server_setup (CONFIG_NODE *node, SERVER_SETUP_REC *server)
return 0;
}
static void server_setup_save(SERVER_SETUP_REC *rec)
static void server_setup_save(SERVER_SETUP_REC *rec, int old_port, const char *old_chatnet)
{
CONFIG_NODE *parent_node, *node;
SERVER_SETUP_REC search_rec = { 0 };
GSList *config_node;
parent_node = iconfig_node_traverse("(servers", TRUE);
/* Try to find this channel in the configuration */
config_node = g_slist_find_custom(parent_node->value, rec,
(GCompareFunc)compare_server_setup);
search_rec.address = rec->address;
search_rec.chatnet = old_chatnet != NULL ? (char *) old_chatnet : rec->chatnet;
search_rec.port = old_port;
config_node = g_slist_find_custom(parent_node->value, &search_rec,
(GCompareFunc) compare_server_setup);
if (config_node != NULL)
/* Let's update this server record */
node = config_node->data;
@ -655,16 +660,23 @@ static void server_setup_destroy(SERVER_SETUP_REC *rec)
g_free(rec);
}
void server_setup_add(SERVER_SETUP_REC *rec)
void server_setup_modify(SERVER_SETUP_REC *rec, int old_port, const char *old_chatnet)
{
g_return_if_fail(g_slist_find(setupservers, rec) != NULL);
rec->type = module_get_uniq_id("SERVER SETUP", 0);
if (g_slist_find(setupservers, rec) == NULL)
setupservers = g_slist_append(setupservers, rec);
server_setup_save(rec);
server_setup_save(rec, old_port, old_chatnet);
signal_emit("server setup updated", 1, rec);
}
void server_setup_add(SERVER_SETUP_REC *rec)
{
if (g_slist_find(setupservers, rec) == NULL)
setupservers = g_slist_append(setupservers, rec);
server_setup_modify(rec, -1, NULL);
}
void server_setup_remove_chatnet(const char *chatnet)
{
GSList *tmp, *next;

1
src/core/servers-setup.h
View file

@ -41,6 +41,7 @@ SERVER_SETUP_REC *server_setup_find(const char *address, int port,
const char *chatnet);
void server_setup_add(SERVER_SETUP_REC *rec);
void server_setup_modify(SERVER_SETUP_REC *rec, int old_port, const char *old_chatnet);
void server_setup_remove(SERVER_SETUP_REC *rec);
/* Remove servers attached to chatne */