Avp::fmt() no longer needs dictionary arg

Author: lwlee2608

src/avp/group.rs

@@ -1,5 +1,5 @@
 use crate::avp::Avp;
-use crate::dictionary::{self, Dictionary};
+use crate::dictionary::Dictionary;
 use crate::error::{Error, Result};
 use std::io::Read;
 use std::io::Seek;
@@ -72,10 +72,9 @@ impl Grouped {
     }
 
     pub fn fmt(&self, f: &mut std::fmt::Formatter<'_>, depth: usize) -> std::fmt::Result {
-        let dict = Dictionary::new(&[&dictionary::DEFAULT_DICT_XML]);
         for avp in &self.avps {
             write!(f, "\n")?;
-            avp.fmt(f, depth + 1, &dict)?;
+            avp.fmt(f, depth + 1)?;
         }
         Ok(())
     }

src/avp/mod.rs

@@ -81,7 +81,7 @@ pub struct Avp {
     header: AvpHeader,
     value: AvpValue,
     padding: u8,
-    dictionary: Arc<Dictionary>,
+    dict: Arc<Dictionary>,
 }
 
 #[derive(Debug, Clone)]
@@ -392,7 +392,7 @@ impl Avp {
             header,
             value,
             padding,
-            dictionary: dict,
+            dict,
         };
     }
 
@@ -489,7 +489,7 @@ impl Avp {
             header,
             value,
             padding,
-            dictionary: dict,
+            dict,
         });
     }
 
@@ -639,12 +639,11 @@ impl Avp {
         }
     }
 
-    pub fn fmt(&self, f: &mut fmt::Formatter<'_>, depth: usize, dict: &Dictionary) -> fmt::Result {
+    pub fn fmt(&self, f: &mut fmt::Formatter<'_>, depth: usize) -> fmt::Result {
         let indent = "  ".repeat(depth.max(0));
 
-        // let dict = dictionary::DEFAULT_DICT.read().unwrap();
-
-        let avp_name = dict
+        let avp_name = self
+            .dict
             .get_avp_name(self.get_code() as u32, self.get_vendor_id())
             .unwrap_or("Unknown");
 
@@ -681,8 +680,7 @@ fn get_bool_unicode(v: bool) -> &'static str {
 
 impl fmt::Display for Avp {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let dict = self.dictionary.as_ref();
-        self.fmt(f, 0, &dict)
+        self.fmt(f, 0)
     }
 }
 

src/diameter.rs

@@ -59,7 +59,7 @@ pub mod flags {
 pub struct DiameterMessage {
     header: DiameterHeader,
     avps: Vec<Avp>,
-    dictionary: Arc<Dictionary>,
+    dict: Arc<Dictionary>,
 }
 
 /// Represents the header part of a Diameter message.
@@ -115,7 +115,7 @@ impl DiameterMessage {
         flags: u8,
         hop_by_hop_id: u32,
         end_to_end_id: u32,
-        dictionary: Arc<Dictionary>,
+        dict: Arc<Dictionary>,
     ) -> DiameterMessage {
         let header = DiameterHeader {
             version: 1,
@@ -127,11 +127,7 @@ impl DiameterMessage {
             end_to_end_id,
         };
         let avps = Vec::new();
-        DiameterMessage {
-            header,
-            avps,
-            dictionary,
-        }
+        DiameterMessage { header, avps, dict }
     }
 
     /// Returns a reference to the AVP with the specified code,
@@ -153,13 +149,13 @@ impl DiameterMessage {
 
     // Adds an AVP to the message with the specified parameters.
     pub fn add_avp(&mut self, code: u32, vendor_id: Option<u32>, flags: u8, value: AvpValue) {
-        let avp = Avp::new(code, vendor_id, flags, value, Arc::clone(&self.dictionary));
+        let avp = Avp::new(code, vendor_id, flags, value, Arc::clone(&self.dict));
         self.add(avp);
     }
 
     /// Adds an AVP to the message by name.
     pub fn add_avp_by_name(&mut self, avp_name: &str, value: AvpValue) -> Result<()> {
-        let avp = Avp::from_name(avp_name, value, Arc::clone(&self.dictionary))?;
+        let avp = Avp::from_name(avp_name, value, Arc::clone(&self.dict))?;
         self.add(avp);
         Ok(())
     }
@@ -218,11 +214,7 @@ impl DiameterMessage {
             ));
         }
 
-        Ok(DiameterMessage {
-            header,
-            avps,
-            dictionary: dict,
-        })
+        Ok(DiameterMessage { header, avps, dict })
     }
 
     /// Encodes the Diameter message to the given writer.
@@ -247,7 +239,7 @@ impl DiameterMessage {
         )?;
 
         for avp in &self.avps {
-            avp.fmt(f, depth, self.dictionary.as_ref())?;
+            avp.fmt(f, depth)?;
             write!(f, "\n")?;
         }