rust/dns: visibility cleanups

Remove pub from functions that don't require it.

diff --git a/rust/src/dns/dns.rs b/rust/src/dns/dns.rs
index 9e70136026a310ddc34f45ba872e7bb356873eb2..5aaf5d00bf40fecab6c169a6fe2dd13516f2f239 100644 (file)
--- a/rust/src/dns/dns.rs
+++ b/rust/src/dns/dns.rs
@@ -115,7 +115,7 @@ pub const DNS_RCODE_BADTRUNC: u16 = 22;
 static mut ALPROTO_DNS: AppProto = ALPROTO_UNKNOWN;
 
 #[derive(AppLayerFrameType)]
-pub enum DnsFrameType {
+enum DnsFrameType {
     /// DNS PDU frame. For UDP DNS this is the complete UDP payload, for TCP
     /// this is the DNS payload not including the leading length field allowing
     /// this frame to be used for UDP and TCP DNS.
@@ -243,7 +243,7 @@ impl Transaction for DNSTransaction {
 }
 
 impl DNSTransaction {
-    pub fn new(direction: Direction) -> Self {
+    fn new(direction: Direction) -> Self {
         Self {
             tx_data: AppLayerTxData::for_direction(direction),
             ..Default::default()
@@ -308,10 +308,10 @@ pub struct DNSState {
     state_data: AppLayerStateData,
 
     // Internal transaction ID.
-    pub tx_id: u64,
+    tx_id: u64,
 
     // Transactions.
-    pub transactions: VecDeque<DNSTransaction>,
+    transactions: VecDeque<DNSTransaction>,
 
     config: Option<ConfigTracker>,
 
@@ -329,18 +329,18 @@ impl State<DNSTransaction> for DNSState {
 }
 
 impl DNSState {
-    pub fn new() -> Self {
+    fn new() -> Self {
         Default::default()
     }
 
-    pub fn new_tx(&mut self, direction: Direction) -> DNSTransaction {
+    fn new_tx(&mut self, direction: Direction) -> DNSTransaction {
         let mut tx = DNSTransaction::new(direction);
         self.tx_id += 1;
         tx.id = self.tx_id;
         return tx;
     }
 
-    pub fn free_tx(&mut self, tx_id: u64) {
+    fn free_tx(&mut self, tx_id: u64) {
         let len = self.transactions.len();
         let mut found = false;
         let mut index = 0;
@@ -357,12 +357,12 @@ impl DNSState {
         }
     }
 
-    pub fn get_tx(&mut self, tx_id: u64) -> Option<&DNSTransaction> {
+    fn get_tx(&mut self, tx_id: u64) -> Option<&DNSTransaction> {
         return self.transactions.iter().find(|&tx| tx.id == tx_id + 1);
     }
 
     /// Set an event. The event is set on the most recent transaction.
-    pub fn set_event(&mut self, event: DNSEvent) {
+    fn set_event(&mut self, event: DNSEvent) {
         let len = self.transactions.len();
         if len == 0 {
             return;
@@ -453,7 +453,7 @@ impl DNSState {
         self.parse_response(input, false)
     }
 
-    pub fn parse_response(&mut self, input: &[u8], is_tcp: bool) -> bool {
+    fn parse_response(&mut self, input: &[u8], is_tcp: bool) -> bool {
         let (body, header) = if let Some((body, header)) = self.validate_header(input) {
             (body, header)
         } else {
@@ -511,7 +511,7 @@ impl DNSState {
     /// prefix.
     ///
     /// Returns the number of messages parsed.
-    pub fn parse_request_tcp(
+    fn parse_request_tcp(
         &mut self, flow: *const core::Flow, stream_slice: StreamSlice,
     ) -> AppLayerResult {
         let input = stream_slice.as_slice();
@@ -573,7 +573,7 @@ impl DNSState {
     /// prefix.
     ///
     /// Returns the number of messages parsed.
-    pub fn parse_response_tcp(
+    fn parse_response_tcp(
         &mut self, flow: *const core::Flow, stream_slice: StreamSlice,
     ) -> AppLayerResult {
         let input = stream_slice.as_slice();
@@ -632,7 +632,7 @@ impl DNSState {
     }
 
     /// A gap has been seen in the request direction. Set the gap flag.
-    pub fn request_gap(&mut self, gap: u32) {
+    fn request_gap(&mut self, gap: u32) {
         if gap > 0 {
             self.gap = true;
         }
@@ -640,7 +640,7 @@ impl DNSState {
 
     /// A gap has been seen in the response direction. Set the gap
     /// flag.
-    pub fn response_gap(&mut self, gap: u32) {
+    fn response_gap(&mut self, gap: u32) {
         if gap > 0 {
             self.gap = true;
         }
@@ -699,7 +699,7 @@ fn probe(input: &[u8], dlen: usize) -> (bool, bool, bool) {
 }
 
 /// Probe TCP input to see if it looks like DNS.
-pub fn probe_tcp(input: &[u8]) -> (bool, bool, bool) {
+fn probe_tcp(input: &[u8]) -> (bool, bool, bool) {
     match be_u16(input) as IResult<&[u8], u16> {
         Ok((rem, dlen)) => {
             return probe(rem, dlen as usize);

diff --git a/rust/src/dns/parser.rs b/rust/src/dns/parser.rs
index 3d9938abf8f285aef03c5749179af3bb55cc72e0..5194e21d33d8bd3df28eba35849a39eb39f026ae 100644 (file)
--- a/rust/src/dns/parser.rs
+++ b/rust/src/dns/parser.rs
@@ -29,7 +29,7 @@ use nom7::{error_position, Err, IResult};
 /// Parameters:
 ///   start: the start of the name
 ///   message: the complete message that start is a part of with the DNS header
-pub fn dns_parse_name<'b>(start: &'b [u8], message: &'b [u8]) -> IResult<&'b [u8], Vec<u8>> {
+fn dns_parse_name<'b>(start: &'b [u8], message: &'b [u8]) -> IResult<&'b [u8], Vec<u8>> {
     let mut pos = start;
     let mut pivot = start;
     let mut name: Vec<u8> = Vec::with_capacity(32);
@@ -175,7 +175,7 @@ fn dns_parse_answer<'a>(
 /// Arguments are suitable for using with call!:
 ///
 ///    call!(complete_dns_message_buffer)
-pub fn dns_parse_query<'a>(input: &'a [u8], message: &'a [u8]) -> IResult<&'a [u8], DNSQueryEntry> {
+fn dns_parse_query<'a>(input: &'a [u8], message: &'a [u8]) -> IResult<&'a [u8], DNSQueryEntry> {
     let i = input;
     let (i, name) = dns_parse_name(i, message)?;
     let (i, rrtype) = be_u16(i)?;
@@ -286,7 +286,7 @@ fn dns_parse_rdata_unknown(input: &[u8]) -> IResult<&[u8], DNSRData> {
     rest(input).map(|(input, data)| (input, DNSRData::Unknown(data.to_vec())))
 }
 
-pub fn dns_parse_rdata<'a>(
+fn dns_parse_rdata<'a>(
     input: &'a [u8], message: &'a [u8], rrtype: u16,
 ) -> IResult<&'a [u8], DNSRData> {
     match rrtype {