Skip to content

Preparation commits for Dns over http2 5773 v10.1 #11226

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

Closed
catenacyber wants to merge 2 commits into from
Closed

Preparation commits for Dns over http2 5773 v10.1 #11226

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
bbb28d5
dns: remove unneeded mut in logger
catenacyber Dec 12, 2023
71b68f9
dns: adds missing NS field in json schema
catenacyber Mar 28, 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
7 changes: 7 additions & 0 deletions etc/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,6 +1207,13 @@
"type": "string"
}
},
"NS": {
"type": "array",
"minItems": 1,
"items": {
"type": "string"
}
},
"NULL": {
"type": "array",
"minItems": 1,
Expand Down
8 changes: 4 additions & 4 deletions rust/src/dns/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ fn dns_log_json_answer(
}

fn dns_log_query(
tx: &mut DNSTransaction, i: u16, flags: u64, jb: &mut JsonBuilder,
tx: &DNSTransaction, i: u16, flags: u64, jb: &mut JsonBuilder,
) -> Result<bool, JsonError> {
let index = i as usize;
if let Some(request) = &tx.request {
Expand All @@ -637,7 +637,7 @@ fn dns_log_query(

#[no_mangle]
pub extern "C" fn SCDnsLogJsonQuery(
tx: &mut DNSTransaction, i: u16, flags: u64, jb: &mut JsonBuilder,
tx: &DNSTransaction, i: u16, flags: u64, jb: &mut JsonBuilder,
) -> bool {
match dns_log_query(tx, i, flags, jb) {
Ok(false) | Err(_) => {
Expand All @@ -651,7 +651,7 @@ pub extern "C" fn SCDnsLogJsonQuery(

#[no_mangle]
pub extern "C" fn SCDnsLogJsonAnswer(
tx: &mut DNSTransaction, flags: u64, js: &mut JsonBuilder,
tx: &DNSTransaction, flags: u64, js: &mut JsonBuilder,
) -> bool {
if let Some(response) = &tx.response {
for query in &response.queries {
Expand All @@ -664,7 +664,7 @@ pub extern "C" fn SCDnsLogJsonAnswer(
}

#[no_mangle]
pub extern "C" fn SCDnsLogAnswerEnabled(tx: &mut DNSTransaction, flags: u64) -> bool {
pub extern "C" fn SCDnsLogAnswerEnabled(tx: &DNSTransaction, flags: u64) -> bool {
if let Some(response) = &tx.response {
for query in &response.queries {
if dns_log_rrtype_enabled(query.rrtype, flags) {
Expand Down