Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

version: start development towards 7.0.9 #12274

Merged
merged 2 commits into from
Dec 13, 2024
Merged

version: start development towards 7.0.9 #12274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
51bc167
version: start development towards 7.0.9
inashivb Dec 13, 2024
e5ebe36
stream: apply clang formatting
inashivb Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions src/stream-tcp-private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
10 changes: 6 additions & 4 deletions src/stream-tcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand All @@ -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));
}
}

Expand Down
Loading