dns: add SRV query and answer parsing

regit · May 29, 2019 · 5508abe · 5508abe
1 parent fa0008d
commit 5508abe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/rust/src/dns/log.rs b/rust/src/dns/log.rs
@@ -433,6 +433,7 @@ fn dns_log_json_answer_detail(answer: &DNSAnswerEntry) -> Json
         DNS_RECORD_TYPE_CNAME |
         DNS_RECORD_TYPE_MX |
         DNS_RECORD_TYPE_TXT |
+        DNS_RECORD_TYPE_SRV |
         DNS_RECORD_TYPE_PTR => {
             jsa.set_string_from_bytes("rdata", &answer.data);
         },
@@ -503,6 +504,7 @@ fn dns_log_json_answer(response: &DNSResponse, flags: u64) -> Json
                     DNS_RECORD_TYPE_CNAME |
                     DNS_RECORD_TYPE_MX |
                     DNS_RECORD_TYPE_TXT |
+                    DNS_RECORD_TYPE_SRV |
                     DNS_RECORD_TYPE_PTR => {
                         if !answer_types.contains_key(&type_string) {
                             answer_types.insert(type_string.to_string(),
@@ -637,6 +639,7 @@ fn dns_log_json_answer_v1(header: &DNSHeader, answer: &DNSAnswerEntry)
         DNS_RECORD_TYPE_CNAME |
         DNS_RECORD_TYPE_MX |
         DNS_RECORD_TYPE_TXT |
+        DNS_RECORD_TYPE_SRV |
         DNS_RECORD_TYPE_PTR => {
             js.set_string_from_bytes("rdata", &answer.data);
         },

diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs
@@ -270,6 +270,17 @@ pub fn dns_parse_rdata<'a>(input: &'a [u8], message: &'a [u8], rrtype: u16)
                     (name)
             ))(input)
         },
+        DNS_RECORD_TYPE_SRV => {
+            // For SRV we skip over priority, weight and port (prov) fields before
+            // parsing out the name.
+            closure!(&'a [u8], do_parse!(
+                be_u16 >>
+                be_u16 >>
+                be_u16 >> // port we will need to parse it
+                name: apply!(dns_parse_name, message) >>
+                    (name)
+            ))(input)
+        },
         DNS_RECORD_TYPE_TXT => {
             closure!(&'a [u8], do_parse!(
                 len: be_u8 >>