From c08685a1a3e4a719fcfe8f30a338a91db8c3b8d1 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Mon, 19 Mar 2018 16:06:46 +0100 Subject: [PATCH 1/8] also reconnect lookup_servers --- src/core/servers-reconnect.c | 15 +++++++++++++++ src/core/servers.c | 1 + 2 files changed, 16 insertions(+) diff --git a/src/core/servers-reconnect.c b/src/core/servers-reconnect.c index 1727704c..5f609cf5 100644 --- a/src/core/servers-reconnect.c +++ b/src/core/servers-reconnect.c @@ -111,6 +111,21 @@ static int server_reconnect_timeout(void) } } + for (tmp = lookup_servers; tmp != NULL; tmp = next) { + SERVER_REC *server = tmp->data; + + next = tmp->next; + if (server->connect_time + connect_timeout < now && + connect_timeout > 0) { + if (server->connect_tag != -1) { + g_source_remove(server->connect_tag); + server->connect_tag = -1; + } + server->connection_lost = TRUE; + server_connect_failed(server, "Timeout"); + } + } + /* If server_connect() removes the next reconnection in queue, we're screwed. I don't think this should happen anymore, but just to be sure we don't crash, do this safely. */ diff --git a/src/core/servers.c b/src/core/servers.c index 11eccc53..81bdb89e 100644 --- a/src/core/servers.c +++ b/src/core/servers.c @@ -426,6 +426,7 @@ int server_start_connect(SERVER_REC *server) server_connect_callback_readpipe, server); + server->connect_time = time(NULL); lookup_servers = g_slist_append(lookup_servers, server); signal_emit("server looking", 1, server); From 8607a5fa78ba44db51cc75a020e1a53c4e04a057 Mon Sep 17 00:00:00 2001 From: dequis Date: Sat, 7 Apr 2018 21:47:38 -0300 Subject: [PATCH 2/8] signals.txt: add missing 'server cap new|delete' signals Emitted by cap_emit_signal in irc/core/irc-cap.c, added as part of the CAP 3.2 PR merged recentlyish. --- docs/signals.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/signals.txt b/docs/signals.txt index 84d4518f..4dbfb2e2 100644 --- a/docs/signals.txt +++ b/docs/signals.txt @@ -132,6 +132,8 @@ irc-servers.c: irc-cap.c "server cap ack ", SERVER_REC "server cap nak ", SERVER_REC + "server cap new ", SERVER_REC + "server cap delete ", SERVER_REC "server cap end", SERVER_REC sasl.c From af5ee997e7544eb59ed509ef8fb79ec449756e90 Mon Sep 17 00:00:00 2001 From: dequis Date: Sun, 8 Apr 2018 01:24:48 -0300 Subject: [PATCH 3/8] Add "server cap req" signal, emitted before requesting caps --- docs/signals.txt | 1 + src/irc/core/irc-cap.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docs/signals.txt b/docs/signals.txt index 84d4518f..97ce6c69 100644 --- a/docs/signals.txt +++ b/docs/signals.txt @@ -133,6 +133,7 @@ irc-cap.c "server cap ack ", SERVER_REC "server cap nak ", SERVER_REC "server cap end", SERVER_REC + "server cap req", SERVER_REC, char *caps sasl.c "server sasl failure", SERVER_REC, char *reason diff --git a/src/irc/core/irc-cap.c b/src/irc/core/irc-cap.c index 1a60d99b..bcaeb10d 100644 --- a/src/irc/core/irc-cap.c +++ b/src/irc/core/irc-cap.c @@ -48,11 +48,17 @@ int cap_toggle (IRC_SERVER_REC *server, char *cap, int enable) if (!g_hash_table_lookup_extended(server->cap_supported, cap, NULL, NULL)) return FALSE; + signal_emit("server cap req", 2, server, cap); irc_send_cmdv(server, "CAP REQ %s", cap); return TRUE; } else if (!enable && gslist_find_string(server->cap_active, cap)) { - irc_send_cmdv(server, "CAP REQ -%s", cap); + char *negcap = g_strdup_printf("-%s", cap); + + signal_emit("server cap req", 2, server, negcap); + irc_send_cmdv(server, "CAP REQ %s", negcap); + + g_free(negcap); return TRUE; } @@ -194,10 +200,12 @@ static void event_cap (IRC_SERVER_REC *server, char *args, char *nick, char *add server->cap_queue = NULL; /* If the server doesn't support any cap we requested close the negotiation here */ - if (avail_caps > 0) + if (avail_caps > 0) { + signal_emit("server cap req", 2, server, cmd->str + sizeof("CAP REQ :") - 1); irc_send_cmd_now(server, cmd->str); - else + } else { cap_finish_negotiation(server); + } g_string_free(cmd, TRUE); } From d0151fd5a21cf026afa67239ad79f23bc26f0a10 Mon Sep 17 00:00:00 2001 From: dequis Date: Sun, 8 Apr 2018 01:26:11 -0300 Subject: [PATCH 4/8] Add fe-cap to show messages for CAP-related events in the UI Replaces cap.pl --- src/fe-common/irc/Makefile.am | 1 + src/fe-common/irc/fe-cap.c | 84 ++++++++++++++++++++++++++++++ src/fe-common/irc/fe-common-irc.c | 5 ++ src/fe-common/irc/module-formats.c | 7 +++ src/fe-common/irc/module-formats.h | 7 +++ 5 files changed, 104 insertions(+) create mode 100644 src/fe-common/irc/fe-cap.c diff --git a/src/fe-common/irc/Makefile.am b/src/fe-common/irc/Makefile.am index bf88f5cd..a5e95885 100644 --- a/src/fe-common/irc/Makefile.am +++ b/src/fe-common/irc/Makefile.am @@ -27,6 +27,7 @@ real_sources = \ fe-common-irc.c \ fe-whois.c \ fe-sasl.c \ + fe-cap.c \ irc-completion.c \ module-formats.c diff --git a/src/fe-common/irc/fe-cap.c b/src/fe-common/irc/fe-cap.c new file mode 100644 index 00000000..4f9d8ea9 --- /dev/null +++ b/src/fe-common/irc/fe-cap.c @@ -0,0 +1,84 @@ +/* + fe-cap.c : irssi + + Copyright (C) 2018 dequis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "module.h" +#include "module-formats.h" +#include "signals.h" +#include "levels.h" +#include "misc.h" + +#include "irc-servers.h" + +#include "printtext.h" + +static const struct { + const char *command; + const int template; +} fe_cap_messages[] = { + {"LS", IRCTXT_CAP_LS}, + {"ACK", IRCTXT_CAP_ACK}, + {"NAK", IRCTXT_CAP_NAK}, + {"LIST", IRCTXT_CAP_LIST}, + {"NEW", IRCTXT_CAP_NEW}, + {"DEL", IRCTXT_CAP_DEL}, +}; + +static void event_cap(IRC_SERVER_REC *server, char *args, char *nick, char *address) +{ + int i; + char *params, *evt, *list, *star; + + params = event_get_params(args, 4, NULL, &evt, &star, &list); + + if (params == NULL) { + return; + } + + /* With multiline CAP LS, if the '*' parameter isn't present, + * adjust the parameter pointer to compensate for this */ + if (strcmp(star, "*") != 0 && list[0] == '\0') { + list = star; + } + + for (i = 0; i < G_N_ELEMENTS(fe_cap_messages); i++) { + if (!g_ascii_strcasecmp(evt, fe_cap_messages[i].command)) { + printformat(server, NULL, MSGLEVEL_CRAP, fe_cap_messages[i].template, list); + } + } + + g_free(params); +} + +static void sig_server_cap_req(IRC_SERVER_REC *server, char *caps) +{ + printformat(server, NULL, MSGLEVEL_CRAP, IRCTXT_CAP_REQ, caps); +} + +void fe_cap_init(void) +{ + signal_add("event cap", (SIGNAL_FUNC) event_cap); + signal_add("server cap req", (SIGNAL_FUNC) sig_server_cap_req); +} + +void fe_cap_deinit(void) +{ + signal_remove("event cap", (SIGNAL_FUNC) event_cap); + signal_remove("server cap req", (SIGNAL_FUNC) sig_server_cap_req); +} diff --git a/src/fe-common/irc/fe-common-irc.c b/src/fe-common/irc/fe-common-irc.c index 4a3ef1d3..b1bfb525 100644 --- a/src/fe-common/irc/fe-common-irc.c +++ b/src/fe-common/irc/fe-common-irc.c @@ -72,6 +72,9 @@ void fe_whois_deinit(void); void fe_sasl_init(void); void fe_sasl_deinit(void); +void fe_cap_init(void); +void fe_cap_deinit(void); + void irc_completion_init(void); void irc_completion_deinit(void); @@ -95,6 +98,7 @@ void fe_common_irc_init(void) fe_netjoin_init(); fe_whois_init(); fe_sasl_init(); + fe_cap_init(); irc_completion_init(); settings_check(); @@ -121,6 +125,7 @@ void fe_common_irc_deinit(void) fe_netjoin_deinit(); fe_whois_deinit(); fe_sasl_deinit(); + fe_cap_deinit(); irc_completion_deinit(); theme_unregister(); diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c index f7b074ec..722aed73 100644 --- a/src/fe-common/irc/module-formats.c +++ b/src/fe-common/irc/module-formats.c @@ -46,6 +46,13 @@ FORMAT_REC fecommon_irc_formats[] = { { "setupserver_footer", "", 0 }, { "sasl_success", "SASL authentication succeeded", 0 }, { "sasl_error", "Cannot authenticate via SASL ($0)", 1, { 0 } }, + { "cap_req", "Capabilities requested: $0", 1, { 0 } }, + { "cap_ls", "Capabilities supported: $0", 1, { 0 } }, + { "cap_ack", "Capabilities acknowledged: $0", 1, { 0 } }, + { "cap_nak", "Capabilities refused: $0", 1, { 0 } }, + { "cap_list", "Capabilities currently enabled: $0", 1, { 0 } }, + { "cap_new", "Capabilities now available: $0", 1, { 0 } }, + { "cap_del", "Capabilities removed: $0", 1, { 0 } }, /* ---- */ { NULL, "Channels", 0 }, diff --git a/src/fe-common/irc/module-formats.h b/src/fe-common/irc/module-formats.h index c45f4562..7969b5ac 100644 --- a/src/fe-common/irc/module-formats.h +++ b/src/fe-common/irc/module-formats.h @@ -24,6 +24,13 @@ enum { IRCTXT_SETUPSERVER_FOOTER, IRCTXT_SASL_SUCCESS, IRCTXT_SASL_ERROR, + IRCTXT_CAP_REQ, + IRCTXT_CAP_LS, + IRCTXT_CAP_ACK, + IRCTXT_CAP_NAK, + IRCTXT_CAP_LIST, + IRCTXT_CAP_NEW, + IRCTXT_CAP_DEL, IRCTXT_FILL_2, From 8deb6182c692904733544568479035b31fe1007e Mon Sep 17 00:00:00 2001 From: dequis Date: Sun, 8 Apr 2018 15:52:09 -0300 Subject: [PATCH 5/8] Make config_write more atomic to prevent truncation when out of space This is modeled after glib's g_file_set_contents. It doesn't use that function directly because the writing is done with GIOChannel streaming-like writes and g_file_set_contents expects the whole thing to be in-memory. Main differences with g_file_set_contents: - complete lack of win32 special casing (cygwin/WSL should work though) - no fallocate() (linux only, but we don't know the size upfront, anyway) - always calls fsync (glib skips it on btrfs or when not overwriting) Other than that, it's the same old mkstemp + fsync + rename. --- src/lib-config/write.c | 45 ++++++++++++++++++++++++++++++++++++++---- 1 file changed, 41 insertions(+), 4 deletions(-) diff --git a/src/lib-config/write.c b/src/lib-config/write.c index 37e51f09..ab2c6975 100644 --- a/src/lib-config/write.c +++ b/src/lib-config/write.c @@ -301,30 +301,67 @@ int config_write(CONFIG_REC *rec, const char *fname, int create_mode) { int ret; int fd; + int save_errno; + char *tmp_name; + const char *dest_name; g_return_val_if_fail(rec != NULL, -1); g_return_val_if_fail(fname != NULL || rec->fname != NULL, -1); g_return_val_if_fail(create_mode != -1 || rec->create_mode != -1, -1); - fd = open(fname != NULL ? fname : rec->fname, + dest_name = fname != NULL ? fname : rec->fname; + tmp_name = g_strdup_printf("%s.XXXXXX", dest_name); + + fd = g_mkstemp_full(tmp_name, O_WRONLY | O_TRUNC | O_CREAT, create_mode != -1 ? create_mode : rec->create_mode); - if (fd == -1) - return config_error(rec, g_strerror(errno)); + if (fd == -1) { + config_error(rec, g_strerror(errno)); + ret = -1; + goto out; + } rec->handle = g_io_channel_unix_new(fd); g_io_channel_set_encoding(rec->handle, NULL, NULL); g_io_channel_set_close_on_unref(rec->handle, TRUE); + rec->tmp_indent_level = 0; rec->tmp_last_lf = TRUE; ret = config_write_block(rec, rec->mainnode, FALSE, TRUE); + save_errno = errno; + if (ret == -1) { /* write error */ - config_error(rec, errno == 0 ? "bug" : g_strerror(errno)); + unlink(tmp_name); + config_error(rec, save_errno == 0 ? "bug" : g_strerror(save_errno)); + goto out; + } + + ret = fsync(fd); + save_errno = errno; + + if (ret == -1) { + unlink(tmp_name); + config_error(rec, g_strerror(errno)); + goto out; } g_io_channel_unref(rec->handle); rec->handle = NULL; + if (rename(tmp_name, dest_name) == -1) { + unlink(tmp_name); + config_error(rec, g_strerror(errno)); + goto out; + } + +out: + if (rec->handle) { + g_io_channel_unref(rec->handle); + rec->handle = NULL; + } + + g_free(tmp_name); + return ret; } From 34b31e8451829e7b515a60cf12183203a059d1c4 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Mon, 16 Apr 2018 16:19:54 +0200 Subject: [PATCH 6/8] record line info on empty lines --- src/fe-common/core/formats.c | 9 +++++++++ src/fe-text/textbuffer.c | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 4c819c2d..8ad4b3af 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -1233,6 +1233,15 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) dup = str = g_strdup(text); flags = 0; fgcolor = theme->default_color; bgcolor = -1; + + if (*str == '\0') { + /* empty line, write line info only */ + signal_emit_id(signal_gui_print_text, 6, dest->window, + GINT_TO_POINTER(fgcolor), + GINT_TO_POINTER(bgcolor), + GINT_TO_POINTER(flags), str, + dest); + } while (*str != '\0') { type = '\0'; for (ptr = str; *ptr != '\0'; ptr++) { diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c index 01cdd118..9e1ace96 100644 --- a/src/fe-text/textbuffer.c +++ b/src/fe-text/textbuffer.c @@ -355,9 +355,6 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after, g_return_val_if_fail(buffer != NULL, NULL); g_return_val_if_fail(data != NULL, NULL); - if (len == 0) - return insert_after; - line = !buffer->last_eol ? insert_after : textbuffer_line_insert(buffer, insert_after); From 3075cbc6fb383024b87563611021f9fb712182fd Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Tue, 24 Apr 2018 14:00:30 +0200 Subject: [PATCH 7/8] Fix test compilation on old glib e.g. Debian 7 --- tests/irc/flood/test-796.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/irc/flood/test-796.c b/tests/irc/flood/test-796.c index 2e4affa0..0c98509b 100644 --- a/tests/irc/flood/test-796.c +++ b/tests/irc/flood/test-796.c @@ -165,7 +165,9 @@ int main(int argc, char **argv) server_destroy_flood_set_up, test_server_destroy_flood, server_destroy_flood_tear_down); +#if GLIB_CHECK_VERSION(2,38,0) g_test_set_nonfatal_assertions(); +#endif core_preinit(*argv); irssi_gui = IRSSI_GUI_NONE; From 631650bd8ab467af8347b5d9b51b2b0193adfe63 Mon Sep 17 00:00:00 2001 From: ailin-nemui Date: Mon, 7 May 2018 21:22:43 +0200 Subject: [PATCH 8/8] Revert "record line info on empty lines" --- src/fe-common/core/formats.c | 9 --------- src/fe-text/textbuffer.c | 3 +++ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/fe-common/core/formats.c b/src/fe-common/core/formats.c index 8ad4b3af..4c819c2d 100644 --- a/src/fe-common/core/formats.c +++ b/src/fe-common/core/formats.c @@ -1233,15 +1233,6 @@ void format_send_to_gui(TEXT_DEST_REC *dest, const char *text) dup = str = g_strdup(text); flags = 0; fgcolor = theme->default_color; bgcolor = -1; - - if (*str == '\0') { - /* empty line, write line info only */ - signal_emit_id(signal_gui_print_text, 6, dest->window, - GINT_TO_POINTER(fgcolor), - GINT_TO_POINTER(bgcolor), - GINT_TO_POINTER(flags), str, - dest); - } while (*str != '\0') { type = '\0'; for (ptr = str; *ptr != '\0'; ptr++) { diff --git a/src/fe-text/textbuffer.c b/src/fe-text/textbuffer.c index 9e1ace96..01cdd118 100644 --- a/src/fe-text/textbuffer.c +++ b/src/fe-text/textbuffer.c @@ -355,6 +355,9 @@ LINE_REC *textbuffer_insert(TEXT_BUFFER_REC *buffer, LINE_REC *insert_after, g_return_val_if_fail(buffer != NULL, NULL); g_return_val_if_fail(data != NULL, NULL); + if (len == 0) + return insert_after; + line = !buffer->last_eol ? insert_after : textbuffer_line_insert(buffer, insert_after);