use default values for IPFIX port and address if their fields are empty

Author: GyulyVGC

src/gui/pages/initial_page.rs

@@ -14,7 +14,7 @@ use crate::gui::types::export_pcap::ExportPcap;
 use crate::gui::types::filters::Filters;
 use crate::gui::types::message::Message;
 use crate::gui::types::settings::Settings;
-use crate::networking::ipfix::MyIpfixSocket;
+use crate::networking::ipfix::{DEFAULT_IPFIX_ADDR, DEFAULT_IPFIX_PORT, MyIpfixSocket};
 use crate::networking::types::capture_context::{CaptureSource, CaptureSourcePicklist};
 use crate::networking::types::my_device::MyDevice;
 use crate::networking::types::my_link_type::MyLinkType;
@@ -329,7 +329,7 @@ fn get_col_ipfix_collector<'a>(
             bind_address_translation(language)
         )))
         .push(
-            TextInput::new("0.0.0.0", &ipfix_socket.addr())
+            TextInput::new(&DEFAULT_IPFIX_ADDR.to_string(), &ipfix_socket.addr())
                 .on_input(Message::SetIpfixAddr)
                 .padding([2, 5]),
         );
@@ -338,7 +338,7 @@ fn get_col_ipfix_collector<'a>(
         .spacing(5)
         .push(Text::new(format!("{}:", port_translation(language))))
         .push(
-            TextInput::new("4739", &ipfix_socket.port())
+            TextInput::new(&DEFAULT_IPFIX_PORT.to_string(), &ipfix_socket.port())
                 .on_input(Message::SetIpfixPort)
                 .padding([2, 5]),
         );

src/networking/ipfix/mod.rs

@@ -16,6 +16,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 /// IANA-registered default IPFIX collector port.
 pub const DEFAULT_IPFIX_PORT: u16 = 4739;
+pub const DEFAULT_IPFIX_ADDR: IpAddr = IpAddr::V4(Ipv4Addr::UNSPECIFIED);
 
 /// Persisted IPFIX collector configuration.
 #[derive(Serialize, Deserialize, Clone, PartialEq, Debug)]
@@ -43,26 +44,42 @@ impl MyIpfixSocket {
     }
 
     pub fn display_name(&self) -> String {
-        format!("{}:{}", self.addr, self.port)
+        let addr = if self.addr.is_empty() {
+            &DEFAULT_IPFIX_ADDR.to_string()
+        } else {
+            &self.addr
+        };
+        let port = if self.port.is_empty() {
+            &DEFAULT_IPFIX_PORT.to_string()
+        } else {
+            &self.port
+        };
+        format!("{addr}:{port}")
     }
 
     pub fn socket_addr(&self) -> Result<SocketAddr, String> {
-        let port = self
-            .port
-            .parse::<u16>()
-            .map_err(|_| format!("Invalid port number: {}", self.port))?;
-        let ip_addr = self
-            .addr
-            .parse::<IpAddr>()
-            .map_err(|_| format!("Invalid IP address: {}", self.addr))?;
-        Ok(SocketAddr::new(ip_addr, port))
+        let port = if self.port.is_empty() {
+            DEFAULT_IPFIX_PORT
+        } else {
+            self.port
+                .parse::<u16>()
+                .map_err(|_| format!("Invalid port number: {}", self.port))?
+        };
+        let addr = if self.addr.is_empty() {
+            DEFAULT_IPFIX_ADDR
+        } else {
+            self.addr
+                .parse::<IpAddr>()
+                .map_err(|_| format!("Invalid IP address: {}", self.addr))?
+        };
+        Ok(SocketAddr::new(addr, port))
     }
 }
 
 impl Default for MyIpfixSocket {
     fn default() -> Self {
         Self {
-            addr: IpAddr::V4(Ipv4Addr::UNSPECIFIED).to_string(),
+            addr: DEFAULT_IPFIX_ADDR.to_string(),
             port: DEFAULT_IPFIX_PORT.to_string(),
         }
     }