aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-11-03 04:27:19 -05:00
Code

Make sure port is only set on /server modify if specified

Browse Source
This commit is contained in:
Jari Matilainen 2017-05-15 23:07:01 +02:00
parent 4a6fbdbe78
commit 0c26aeb9fc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/fe-common/core/fe-server.c
View File

@ -120,7 +120,8 @@ static void cmd_server_add_modify(const char *data, gboolean add)
value = g_hash_table_lookup(optlist, "port"); value = g_hash_table_lookup(optlist, "port");
port = *portstr == '\0' ? port = *portstr == '\0' ?
(value != NULL && *value != '\0' ? atoi(value) : DEFAULT_SERVER_ADD_PORT) (value != NULL && *value != '\0' ?
atoi(value) : DEFAULT_SERVER_ADD_PORT)
: atoi(portstr); : atoi(portstr);
chatnet = g_hash_table_lookup(optlist, "network"); chatnet = g_hash_table_lookup(optlist, "network");
@ -141,7 +142,11 @@ static void cmd_server_add_modify(const char *data, gboolean add)
return; return;
} }
rec->address = g_strdup(addr); rec->address = g_strdup(addr);
rec->port = port;
} else { } else {
if (*portstr != '\0' || g_hash_table_lookup(optlist, "port"))
rec->port = port;
if (*password != '\0') g_free_and_null(rec->password); if (*password != '\0') g_free_and_null(rec->password);
if (g_hash_table_lookup(optlist, "host")) { if (g_hash_table_lookup(optlist, "host")) {
g_free_and_null(rec->own_host); g_free_and_null(rec->own_host);
@ -149,8 +154,6 @@ static void cmd_server_add_modify(const char *data, gboolean add)
} }
} }
rec->port = port;
if (g_hash_table_lookup(optlist, "6")) if (g_hash_table_lookup(optlist, "6"))
rec->family = AF_INET6; rec->family = AF_INET6;
else if (g_hash_table_lookup(optlist, "4")) else if (g_hash_table_lookup(optlist, "4"))