aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

Merge pull request #41 from ailin-nemui/ports

Browse Source 
fix /server modify port argument order

(cherry picked from commit 235c5b0328)
This commit is contained in:
ailin-nemui 2021-09-29 18:59:09 +02:00 committed by Ailin Nemui
parent 0ba449d8be
commit 5bff40593f
2 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,17 +124,17 @@ static void cmd_server_add_modify(const char *data, gboolean add)
port = old_port = -1; port = old_port = -1;
if (*portstr != '\0') value = g_hash_table_lookup(optlist, "port");
port = add_port = atoi(portstr); if (value != NULL && *value != '\0')
port = add_port = atoi(value);
else if (g_hash_table_lookup(optlist, "tls") || else if (g_hash_table_lookup(optlist, "tls") ||
g_hash_table_lookup(optlist, "ssl")) g_hash_table_lookup(optlist, "ssl"))
add_port = DEFAULT_SERVER_ADD_TLS_PORT; add_port = DEFAULT_SERVER_ADD_TLS_PORT;
else else
add_port = DEFAULT_SERVER_ADD_PORT; add_port = DEFAULT_SERVER_ADD_PORT;
value = g_hash_table_lookup(optlist, "port"); if (*portstr != '\0')
if (value != NULL && *value != '\0') old_port = atoi(portstr);
old_port = atoi(value);
chatnet = g_hash_table_lookup(optlist, "network"); chatnet = g_hash_table_lookup(optlist, "network");
@ -307,12 +307,14 @@ static void cmd_server_remove(const char *data)
SERVER_SETUP_REC *rec; SERVER_SETUP_REC *rec;
char *addr, *port, *chatnet; char *addr, *port, *chatnet;
void *free_arg; void *free_arg;
int portnum;
if (!cmd_get_params(data, &free_arg, 3, &addr, &port, &chatnet)) if (!cmd_get_params(data, &free_arg, 3, &addr, &port, &chatnet))
return; return;
if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*addr == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
if (*port == '\0') { if (*port == '\0') {
portnum = DEFAULT_SERVER_ADD_PORT;
if (*chatnet == '\0') if (*chatnet == '\0')
rec = server_setup_find(addr, -1, NULL); rec = server_setup_find(addr, -1, NULL);
else else
@ -320,17 +322,21 @@ static void cmd_server_remove(const char *data)
} }
else else
{ {
portnum = atoi(port);
if (*chatnet == '\0') if (*chatnet == '\0')
rec = server_setup_find(addr, atoi(port), NULL); rec = server_setup_find(addr, portnum, NULL);
else else
rec = server_setup_find(addr, atoi(port), chatnet); rec = server_setup_find(addr, portnum, chatnet);
} }
if (rec == NULL) if (rec == NULL)
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr, port); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_NOT_FOUND, addr,
portnum);
else { else {
portnum = rec->port;
server_setup_remove(rec); server_setup_remove(rec);
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr, port); printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE, TXT_SETUPSERVER_REMOVED, addr,
portnum);
} }
cmd_params_free(free_arg); cmd_params_free(free_arg);

6
src/fe-common/core/module-formats.c
View File

@ -22,6 +22,7 @@
#include <irssi/src/fe-common/core/formats.h> #include <irssi/src/fe-common/core/formats.h>
FORMAT_REC fecommon_core_formats[] = { FORMAT_REC fecommon_core_formats[] = {
/* clang-format off */
{ MODULE_NAME, "Core", 0 }, { MODULE_NAME, "Core", 0 },
/* ---- */ /* ---- */
@ -87,8 +88,8 @@ FORMAT_REC fecommon_core_formats[] = {
{ "server_reconnect_removed", "Removed reconnection to server {server $0} port {hilight $1}", 3, { 0, 1, 0 } }, { "server_reconnect_removed", "Removed reconnection to server {server $0} port {hilight $1}", 3, { 0, 1, 0 } },
{ "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } }, { "server_reconnect_not_found", "Reconnection tag {server $0} not found", 1, { 0 } },
{ "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } }, { "setupserver_added", "Server {server $0} saved", 2, { 0, 1 } },
{ "setupserver_removed", "Server {server $0} removed", 2, { 0, 1 } }, { "setupserver_removed", "Server {server $0} {hilight $1} removed", 2, { 0, 1 } },
{ "setupserver_not_found", "Server {server $0} not found", 2, { 0, 1 } }, { "setupserver_not_found", "Server {server $0} {hilight $1} not found", 2, { 0, 1 } },
{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } }, { "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
/* ---- */ /* ---- */
@ -316,4 +317,5 @@ FORMAT_REC fecommon_core_formats[] = {
{ "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } }, { "tls_protocol_version", "Protocol: {hilight $0} ({hilight $1} bit, {hilight $2})", 3, { 0, 1, 0 } },
{ NULL, NULL, 0 } { NULL, NULL, 0 }
/* clang-format on */
}; };