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

Jump to bottom

Next/60x/20230123/v4 #8424

Closed
wants to merge 10 commits into from
Closed

Next/60x/20230123/v4 #8424

wants to merge 10 commits into from

Conversation

victorjulien
Copy link
Member

catenacyber and others added 10 commits January 21, 2023 10:10
@catenacyber
dcerpc: store consumed_bytes as i32
b5131da 
As it can grow bigger than u16

(cherry picked from commit 704bc87)
@catenacyber @victorjulien
ftp: completely resets port_line
5c0bb7a 
In the case port_line is first allocated and port_line_len is set,
Then a second request reaches memcap and frees port_line,
port_line_len should also be reset, because both will get used
by the response parsing.

Ticket: OISF#5701
(cherry picked from commit 1660172)
@jmtaylor90 @victorjulien
userguide: update http2 config header syntax
088cc71 
Signed-off-by: jason taylor <[email protected]>
@victorjulien
src: fix strict-prototype warnings
8ec4cf6 
Tested on Fedora 37 with clang 15.

app-layer.c:1055:27: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
void AppLayerSetupCounters()
                          ^
                           void
app-layer.c:1176:29: error: a function declaration without a prototype is deprecated in all versions of C [-Werror,-Wstrict-prototypes]
void AppLayerDeSetupCounters()
                            ^
                             void
2 errors generated.

(cherry picked from commit ebd8728)
@victorjulien
src: fix unused-but-set-variable compile warnings
8877903 
Tested on Fedora 37 with clang 15.

datasets.c:852:9: error: variable 'n' set but not used [-Werror,-Wunused-but-set-variable]
    int n = 0;
        ^
1 error generated.

(cherry picked from commit 1bc6976)
@victorjulien
src: fix deprecated-non-prototype compile warnings
129b289 
Tested on Fedora 37 with clang 15.

util-strlcatu.c:45:8: error: a function definition without a prototype is deprecated in all versions of C and is not supported in C2x [-Werror,-Wdeprecated-non-prototype]
size_t strlcat(dst, src, siz)
           ^
1 error generated.

(cherry picked from commit 41ca206)
@victorjulien
stream: remove bug on from packet path
cb2bd2a 
(cherry picked from commit a00db15)
@victorjulien
streaming/sbb: fix debug message
935d191 
(cherry picked from commit 989e5c7)
@victorjulien
smb: fix post-trunc chunk behavior
2eaf7b7 
After a gap in a file transaction, the file tracker is truncated. However
this did not clear any stored out of order chunks from memory or stop more
chunks to be stored, leading to accumulation of a large number of chunks.

This patches fixes this be clearing the stored chunks on trunc. It also
makes sure no more chunks are stored in the tracker after the trunc.

Bug: OISF#5781.
(cherry picked from commit a24d7dc)
@jasonish @victorjulien
doc/userguide: ubuntu: install software-properties-common
d6f9c3d 
This package likely needs to be installed when starting with an Ubuntu
container or other minimal Ubuntu install.

Ticket: OISF#5616
(cherry picked from commit 0a4e3d0)
@victorjulien victorjulien requested review from jasonish, norg and a team as code owners January 23, 2023 10:54
@suricata-qa
Copy link

Information:

ERROR: QA failed on SURI_TLPR1_alerts_cmp.

field baseline test %
TREX_GENERIC_stats_chk
.capture.kernel_drops 0 44554 0.01

Pipeline 11856

@victorjulien victorjulien mentioned this pull request Jan 24, 2023
Merged
@victorjulien
Copy link
Member Author

replaced by #8428

@victorjulien victorjulien deleted the next/60x/20230123/v4 branch January 31, 2023 18:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jasonish jasonish Awaiting requested review from jasonish jasonish is a code owner

@norg norg Awaiting requested review from norg norg is a code owner

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@victorjulien @suricata-qa @catenacyber @jmtaylor90 @jasonish