next/1290/80x/20260331/v1

.github/workflows/builds.yml

@@ -1336,6 +1336,10 @@ jobs:
       - run: make install-headers
       - run: make install-library
 
+      - run: TZ="UTC" ./src/suricata -u -U LogCustomFormatTest01
+      - run: TZ="Brazil/East" ./src/suricata -u -U LogCustomFormatTest01
+      - run: TZ="Saskatchewan/Regina" ./src/suricata -u -U LogCustomFormatTest01
+
   ubuntu-24-04-rust-vars:
     name: Ubuntu 24.04 (RUSTC+CARGO vars)
     runs-on: ubuntu-latest

configure.ac

@@ -539,7 +539,7 @@
 
   # enable qa-simulation mode -- disabled by default
     AC_ARG_ENABLE(qa-simulation,
-           AS_HELP_STRING([--enable-qa-simulation], [Enable qa-simulation mode]))
+           AS_HELP_STRING([--enable-qa-simulation], [Enable qa-simulation mode]), [enable_qa_simulation=$enableval],[enable_qa_simulation=no])
     AS_IF([test "x$enable_qa_simulation" = "xyes"], [
         AC_DEFINE([QA_SIMULATION],[1],[Enable qa-simulation mode])
     ])

examples/lib/live/main.c

@@ -284,10 +284,10 @@ int main(int argc, char **argv)
     /* Register our own library run mode. At this time, the ThreadVars
      * for each capture thread need to be created in the provided
      * callback to meet thread synchronization requirements. */
-    RunModeRegisterNewRunMode(
-            RUNMODE_LIB, "live", "Live capture application run mode", AppRunModeSetup, NULL);
+    RunModeRegisterNewRunMode(RUNMODE_LIB, "live-example", "Live capture application run mode",
+            AppRunModeSetup, NULL);
 
-    if (!SCConfSetFromString("runmode=live", 1)) {
+    if (!SCConfSetFromString("runmode=live-example", 1)) {
         exit(EXIT_FAILURE);
     }
 

rust/src/http2/http2.rs

@@ -1148,7 +1148,11 @@ impl HTTP2State {
                             );
                         } else {
                             self.set_event(HTTP2Event::LongFrameData);
-                            self.request_frame_size = head.length - (rem.len() as u32);
+                            if dir == Direction::ToServer {
+                                self.request_frame_size = head.length - (rem.len() as u32);
+                            } else {
+                                self.response_frame_size = head.length - (rem.len() as u32);
+                            }
                         }
                     }
 

rust/src/websocket/websocket.rs

@@ -220,7 +220,7 @@ impl WebSocketState {
                         (&mut self.c2s_buf, &mut self.c2s_dec)
                     };
                     let mut compress = pdu.compress;
-                    if !buf.data.is_empty() || !pdu.fin {
+                    if pdu.opcode < 8 && (!buf.data.is_empty() || !pdu.fin) {
                         if buf.data.is_empty() {
                             buf.compress = pdu.compress;
                         }
@@ -234,7 +234,7 @@ impl WebSocketState {
                         }
                     }
                     tx.pdu = pdu;
-                    if tx.pdu.fin && !buf.data.is_empty() {
+                    if tx.pdu.opcode < 8 && tx.pdu.fin && !buf.data.is_empty() {
                         // the final PDU gets the full reassembled payload
                         compress = buf.compress;
                         std::mem::swap(&mut tx.pdu.payload, &mut buf.data);

src/log-cf-common.c

@@ -245,7 +245,7 @@ static int LogCustomFormatTest01(void)
     tm.tm_year = 114;
     tm.tm_wday = 1;
     tm.tm_yday = 13;
-    tm.tm_isdst = 0;
+    tm.tm_isdst = -1;
     SCTime_t ts = SCTIME_FROM_SECS(mktime(&tm));
 
     MemBuffer *buffer = MemBufferCreateNew(62);