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

Dns over http2 5773 v14 #11376

Closed
wants to merge 11 commits into from
Closed

Dns over http2 5773 v14 #11376

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
96f038b
dns: prepare for dns over http2 support
catenacyber Dec 12, 2023
eeb2119
http2: rustfmt
catenacyber Dec 12, 2023
cf2b154
http2: log dns if DoH is recognized
catenacyber Dec 12, 2023
c94c60f
doh: implement dns over http2 app-proto
catenacyber Dec 12, 2023
4a4f412
doh: make dns and http keywords for doh2
catenacyber Dec 12, 2023
2c89706
util/profiling: remove assertion
catenacyber Jan 5, 2024
783e3ec
doh2: handle dns message in POST requests
catenacyber Mar 28, 2024
b71ab2e
doh2: use a central function DetectGetInnerTx
catenacyber Jun 25, 2024
358205b
doh: move fields into dedicated Optional struct
catenacyber Jun 25, 2024
6fa601a
fixup! doh: move fields into dedicated Optional struct
catenacyber Jun 27, 2024
bc66ab5
fixup! doh2: use a central function DetectGetInnerTx
catenacyber Jun 27, 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
12 changes: 8 additions & 4 deletions src/detect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,10 +1130,14 @@ static bool DetectRunTxInspectRule(ThreadVars *tv,
{
void *tx_ptr = DetectGetInnerTx(tx->tx_ptr, f->alproto, engine->alproto, flow_flags);
if (tx_ptr == NULL) {
/* special case: file_data on 'alert tcp' will have engines
* in the list that are not for us. */
engine = engine->next;
continue;
if (engine->alproto != 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use ALPROTO_UNKNOWN here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok (is written 0 in master)

/* special case: file_data on 'alert tcp' will have engines
* in the list that are not for us. */
engine = engine->next;
continue;
} else {
tx_ptr = tx->tx_ptr;
}
}

/* engines are sorted per progress, except that the one with
Expand Down
Loading