irc: fix send of split messages when server option "anti_flood" set to 0 (issue #2172)

This fixes generation of TOTP and tests on FreeBSD.

ChangeLog.adoc

@@ -8,6 +8,32 @@
 :see-release-notes: If you are upgrading: please see release notes.
 :breaking: pass:quotes[*[breaking]*]
 
+[[v4.3.7]]
+== Version 4.3.7 (under dev)
+
+[[v4.3.7_fixed]]
+=== Fixed
+
+* irc: fix send of split messages when server option "anti_flood" set to 0 (issue #2172)
+
+[[v4.3.6]]
+== Version 4.3.6 (2024-08-15)
+
+[[v4.3.6_fixed]]
+=== Fixed
+
+* core: fix generation of TOTP on FreeBSD (issue #2171)
+* relay/api: fix crash when sending data to a remote buffer when the remote has been deleted (issue #2157)
+* relay/api: fix timezone of dates sent to clients (issue #2151)
+
+[[v4.3.5]]
+== Version 4.3.5 (2024-07-16)
+
+[[v4.3.5_fixed]]
+=== Fixed
+
+* ruby: fix crash in plugin initialization (issue #2163)
+
 [[v4.3.4]]
 == Version 4.3.4 (2024-07-03)
 

ReleaseNotes.adoc

@@ -11,6 +11,16 @@ It is recommended to read it when upgrading to a new stable version. +
 For a complete list of changes, please look at ChangeLog.
 
 
+[[v4.3.6]]
+== Version 4.3.6 (2024-08-15)
+
+No release notes.
+
+[[v4.3.5]]
+== Version 4.3.5 (2024-07-16)
+
+No release notes.
+
 [[v4.3.4]]
 == Version 4.3.4 (2024-07-03)
 

src/core/core-crypto.c

@@ -38,6 +38,10 @@
 #include "core-string.h"
 #include "../plugins/plugin.h"
 
+#ifdef htonll
+#define htobe64 htonll
+#endif
+
 char *weecrypto_hash_algo_string[] = {
     "crc32",
     "md5",
@@ -520,20 +524,7 @@ weecrypto_totp_generate_internal (const char *secret, int length_secret,
     int rc, offset, length;
     unsigned long bin_code;
 
-#if __BYTE_ORDER == __BIG_ENDIAN
+    moving_factor_swapped = htobe64 (moving_factor);
-    /* Big endian does not need to swap bytes here! */
-    moving_factor_swapped = moving_factor;
-#else
-    moving_factor_swapped = (moving_factor >> 56)
-        | ((moving_factor << 40) & 0x00FF000000000000)
-        | ((moving_factor << 24) & 0x0000FF0000000000)
-        | ((moving_factor << 8) & 0x000000FF00000000)
-        | ((moving_factor >> 8) & 0x00000000FF000000)
-        | ((moving_factor >> 24) & 0x0000000000FF0000)
-        | ((moving_factor >> 40) & 0x000000000000FF00)
-        | (moving_factor << 56);
-#endif
-
     rc = weecrypto_hmac (secret, length_secret,
                          &moving_factor_swapped, sizeof (moving_factor_swapped),
                          GCRY_MD_SHA1,

src/plugins/irc/irc-server.c

@@ -2988,8 +2988,14 @@ irc_server_outqueue_send (struct t_irc_server *server)
         if (!server->outqueue[priority])
             continue;
 
-        irc_server_outqueue_send_one_msg (server, server->outqueue[priority]);
+        /* send all messages with anti_flood == 0, or just one */
-        irc_server_outqueue_free (server, priority, server->outqueue[priority]);
+        while (server->outqueue[priority])
+        {
+            irc_server_outqueue_send_one_msg (server, server->outqueue[priority]);
+            irc_server_outqueue_free (server, priority, server->outqueue[priority]);
+            if (anti_flood > 0)
+                break;
+        }
 
         /*
          * continue to send for immediate priority (= 0),

src/plugins/relay/api/relay-api-msg.c

@@ -55,16 +55,13 @@
         cJSON_Create##__json_type (                                     \
             weechat_hdata_##__var_type (hdata, pointer, __var_name)));
 
-#define MSG_ADD_HDATA_TIME(__json_name, __var_name)                     \
-    date = weechat_hdata_time (hdata, pointer, __var_name);             \
-    strftime (str_time, sizeof (str_time), "%FT%TZ", gmtime (&date));   \
-    MSG_ADD_STR_BUF(__json_name, str_time);
-
 #define MSG_ADD_HDATA_TIME_USEC(__json_name,                            \
                                 __var_name, __var_name_usec)            \
     time_value = weechat_hdata_time (hdata, pointer, __var_name);       \
-    gmtime_r (&time_value, &gm_time);                                   \
+    local_time = localtime (&time_value);                               \
-    tv.tv_sec = mktime (&gm_time);                                      \
+    time_value -= local_time->tm_gmtoff;                                \
+    local_time = localtime (&time_value);                               \
+    tv.tv_sec = mktime (local_time);                                    \
     tv.tv_usec = weechat_hdata_integer (hdata, pointer,                 \
                                         __var_name_usec);               \
     weechat_util_strftimeval (str_time, sizeof (str_time),              \
@@ -497,7 +494,7 @@ relay_api_msg_line_data_to_json (struct t_gui_line_data *line_data,
     int i, tags_count;
     time_t time_value;
     struct timeval tv;
-    struct tm gm_time;
+    struct tm *local_time;
 
     hdata = relay_hdata_line_data;
     pointer = line_data;
@@ -736,7 +733,7 @@ relay_api_msg_hotlist_to_json (struct t_gui_hotlist *hotlist)
     cJSON *json, *json_count;
     time_t time_value;
     struct timeval tv;
-    struct tm gm_time;
+    struct tm *local_time;
     char str_time[256], str_key[32];
     int i, array_size;
     long long buffer_id;

src/plugins/relay/api/remote/relay-remote-event.c

@@ -444,14 +444,17 @@ relay_remote_event_buffer_input_cb (const void *pointer,
                                     struct t_gui_buffer *buffer,
                                     const char *input_data)
 {
-    struct t_relay_remote *remote;
+    struct t_relay_remote *ptr_remote;
     cJSON *json, *json_body;
     long long buffer_id;
 
     /* make C compiler happy */
+    (void) pointer;
     (void) data;
 
-    remote = (struct t_relay_remote *)pointer;
+    ptr_remote = relay_remote_search (weechat_buffer_get_string (buffer, "localvar_relay_remote"));
+    if (!ptr_remote)
+        return WEECHAT_RC_OK;
 
     json = NULL;
 
@@ -475,7 +478,7 @@ relay_remote_event_buffer_input_cb (const void *pointer,
                            cJSON_CreateString (input_data));
     cJSON_AddItemToObject (json, "body", json_body);
 
-    relay_remote_network_send_json (remote, json);
+    relay_remote_network_send_json (ptr_remote, json);
 
     cJSON_Delete (json);
 
@@ -643,7 +646,7 @@ RELAY_REMOTE_EVENT_CALLBACK(buffer)
             {
                 ptr_buffer = weechat_buffer_new_props (
                     full_name, buffer_props,
-                    &relay_remote_event_buffer_input_cb, event->remote, NULL,
+                    &relay_remote_event_buffer_input_cb, NULL, NULL,
                     NULL, NULL, NULL);
                 apply_props = 0;
             }

src/plugins/ruby/weechat-ruby.c

@@ -1266,7 +1266,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
 {
     int ruby_error, old_ruby_quiet;
     VALUE err;
-    char* process_options_argv[] = { "ruby", "-enil", NULL };
+    char* ruby_options_argv[] = { "ruby", "-enil", NULL };
     char *weechat_ruby_code = {
         "$stdout = WeechatOutputs\n"
         "$stderr = WeechatOutputs\n"
@@ -1365,7 +1365,7 @@ weechat_plugin_init (struct t_weechat_plugin *plugin, int argc, char *argv[])
 
     ruby_init ();
 
-    ruby_process_options (2, process_options_argv);
+    ruby_options (2, ruby_options_argv);
 
     /* redirect stdin and stdout */
     ruby_mWeechatOutputs = rb_define_module ("WeechatOutputs");

version.sh

@@ -39,8 +39,8 @@
 #     devel-number   the devel version as hex number ("0x04010000" for "4.1.0-dev")
 #
 
-weechat_stable="4.3.4"
+weechat_stable="4.3.6"
-weechat_devel="4.3.4"
+weechat_devel="4.3.7-dev"
 
 stable_major=$(echo "${weechat_stable}" | cut -d"." -f1)
 stable_minor=$(echo "${weechat_stable}" | cut -d"." -f2)