aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dns: rustfmt with latest stable

Browse Source
pull/10047/head
Jason Ish 2 years ago committed by Victor Julien
parent 4620776a30
commit e2d7a7f877
3 changed files with 41 additions and 44 deletions
Show Stats Download Patch File Download Diff File

24
rust/src/dns/detect.rs
Unescape Escape View File

@ -156,44 +156,36 @@ mod test {
#[test] #[test]
fn test_match_opcode() { fn test_match_opcode() {
assert!( assert!(match_opcode(
match_opcode(
&DetectDnsOpcode { &DetectDnsOpcode {
negate: false, negate: false,
opcode: 0, opcode: 0,
}, },
0b0000_0000_0000_0000, 0b0000_0000_0000_0000,
) ));
);
assert!( assert!(!match_opcode(
!match_opcode(
&DetectDnsOpcode { &DetectDnsOpcode {
negate: true, negate: true,
opcode: 0, opcode: 0,
}, },
0b0000_0000_0000_0000, 0b0000_0000_0000_0000,
) ));
);
assert!( assert!(match_opcode(
match_opcode(
&DetectDnsOpcode { &DetectDnsOpcode {
negate: false, negate: false,
opcode: 4, opcode: 4,
}, },
0b0010_0000_0000_0000, 0b0010_0000_0000_0000,
) ));
);
assert!( assert!(!match_opcode(
!match_opcode(
&DetectDnsOpcode { &DetectDnsOpcode {
negate: true, negate: true,
opcode: 4, opcode: 4,
}, },
0b0010_0000_0000_0000, 0b0010_0000_0000_0000,
) ));
);
} }
} }

15
rust/src/dns/log.rs
Unescape Escape View File

@ -524,7 +524,8 @@ fn dns_log_json_answer(
match &answer.data { match &answer.data {
DNSRData::A(addr) | DNSRData::AAAA(addr) => { DNSRData::A(addr) | DNSRData::AAAA(addr) => {
if !answer_types.contains_key(&type_string) { if !answer_types.contains_key(&type_string) {
answer_types.insert(type_string.to_string(), JsonBuilder::try_new_array()?); answer_types
.insert(type_string.to_string(), JsonBuilder::try_new_array()?);
} }
if let Some(a) = answer_types.get_mut(&type_string) { if let Some(a) = answer_types.get_mut(&type_string) {
a.append_string(&dns_print_addr(addr))?; a.append_string(&dns_print_addr(addr))?;
@ -537,7 +538,8 @@ fn dns_log_json_answer(
| DNSRData::NULL(bytes) | DNSRData::NULL(bytes)
| DNSRData::PTR(bytes) => { | DNSRData::PTR(bytes) => {
if !answer_types.contains_key(&type_string) { if !answer_types.contains_key(&type_string) {
answer_types.insert(type_string.to_string(), JsonBuilder::try_new_array()?); answer_types
.insert(type_string.to_string(), JsonBuilder::try_new_array()?);
} }
if let Some(a) = answer_types.get_mut(&type_string) { if let Some(a) = answer_types.get_mut(&type_string) {
a.append_string_from_bytes(bytes)?; a.append_string_from_bytes(bytes)?;
@ -545,7 +547,8 @@ fn dns_log_json_answer(
} }
DNSRData::SOA(soa) => { DNSRData::SOA(soa) => {
if !answer_types.contains_key(&type_string) { if !answer_types.contains_key(&type_string) {
answer_types.insert(type_string.to_string(), JsonBuilder::try_new_array()?); answer_types
.insert(type_string.to_string(), JsonBuilder::try_new_array()?);
} }
if let Some(a) = answer_types.get_mut(&type_string) { if let Some(a) = answer_types.get_mut(&type_string) {
a.append_object(&dns_log_soa(soa)?)?; a.append_object(&dns_log_soa(soa)?)?;
@ -553,7 +556,8 @@ fn dns_log_json_answer(
} }
DNSRData::SSHFP(sshfp) => { DNSRData::SSHFP(sshfp) => {
if !answer_types.contains_key(&type_string) { if !answer_types.contains_key(&type_string) {
answer_types.insert(type_string.to_string(), JsonBuilder::try_new_array()?); answer_types
.insert(type_string.to_string(), JsonBuilder::try_new_array()?);
} }
if let Some(a) = answer_types.get_mut(&type_string) { if let Some(a) = answer_types.get_mut(&type_string) {
a.append_object(&dns_log_sshfp(sshfp)?)?; a.append_object(&dns_log_sshfp(sshfp)?)?;
@ -561,7 +565,8 @@ fn dns_log_json_answer(
} }
DNSRData::SRV(srv) => { DNSRData::SRV(srv) => {
if !answer_types.contains_key(&type_string) { if !answer_types.contains_key(&type_string) {
answer_types.insert(type_string.to_string(), JsonBuilder::try_new_array()?); answer_types
.insert(type_string.to_string(), JsonBuilder::try_new_array()?);
} }
if let Some(a) = answer_types.get_mut(&type_string) { if let Some(a) = answer_types.get_mut(&type_string) {
a.append_object(&dns_log_srv(srv)?)?; a.append_object(&dns_log_srv(srv)?)?;

Write Preview
Loading…
Cancel
Save