diff --git a/configure.ac b/configure.ac index 0b7ca961b648..44f75453e167 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ - AC_INIT([suricata],[7.0.8]) + AC_INIT([suricata],[7.0.9-dev]) m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([src/autoconf.h]) AC_CONFIG_SRCDIR([src/suricata.c]) diff --git a/requirements.txt b/requirements.txt index 97d7ff80f9fd..6df1358f075f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,5 +3,5 @@ # Format: # # name {repo} {branch|tag} -libhtp https://github.com/OISF/libhtp 0.5.49 -suricata-update https://github.com/OISF/suricata-update 1.3.4 +libhtp https://github.com/OISF/libhtp 0.5.x +suricata-update https://github.com/OISF/suricata-update master diff --git a/src/stream-tcp-private.h b/src/stream-tcp-private.h index d39bb91a88da..2da93f6ce964 100644 --- a/src/stream-tcp-private.h +++ b/src/stream-tcp-private.h @@ -288,8 +288,8 @@ typedef struct TcpSession_ { int8_t data_first_seen_dir; /** track all the tcp flags we've seen */ uint8_t tcp_packet_flags; - uint16_t urg_offset_ts; /**< SEQ offset from accepted OOB urg bytes */ - uint16_t urg_offset_tc; /**< SEQ offset from accepted OOB urg bytes */ + uint16_t urg_offset_ts; /**< SEQ offset from accepted OOB urg bytes */ + uint16_t urg_offset_tc; /**< SEQ offset from accepted OOB urg bytes */ /* coccinelle: TcpSession:flags:STREAMTCP_FLAG */ uint32_t flags; uint32_t reassembly_depth; /**< reassembly depth for the stream */ diff --git a/src/stream-tcp.c b/src/stream-tcp.c index 6aff1537c151..46b379f7de16 100644 --- a/src/stream-tcp.c +++ b/src/stream-tcp.c @@ -376,7 +376,6 @@ static const char *UrgentPolicyToString(enum TcpStreamUrgentHandling pol) return NULL; } - /** \brief To initialize the stream global configuration data * * \param quiet It tells the mode of operation, if it is true nothing will @@ -543,7 +542,8 @@ void StreamTcpInitConfig(bool quiet) stream_config.urgent_policy = TCP_STREAM_URGENT_DEFAULT; } if (!quiet) { - SCLogConfig("stream.reassembly.urgent.policy\": %s", UrgentPolicyToString(stream_config.urgent_policy)); + SCLogConfig("stream.reassembly.urgent.policy\": %s", + UrgentPolicyToString(stream_config.urgent_policy)); } if (stream_config.urgent_policy == TCP_STREAM_URGENT_OOB) { const char *temp_urgoobpol = NULL; @@ -556,13 +556,15 @@ void StreamTcpInitConfig(bool quiet) } else if (strcmp(temp_urgoobpol, "gap") == 0) { stream_config.urgent_oob_limit_policy = TCP_STREAM_URGENT_GAP; } else { - FatalError("stream.reassembly.urgent.oob-limit-policy: invalid value '%s'", temp_urgoobpol); + FatalError("stream.reassembly.urgent.oob-limit-policy: invalid value '%s'", + temp_urgoobpol); } } else { stream_config.urgent_oob_limit_policy = TCP_STREAM_URGENT_DEFAULT; } if (!quiet) { - SCLogConfig("stream.reassembly.urgent.oob-limit-policy\": %s", UrgentPolicyToString(stream_config.urgent_oob_limit_policy)); + SCLogConfig("stream.reassembly.urgent.oob-limit-policy\": %s", + UrgentPolicyToString(stream_config.urgent_oob_limit_policy)); } }