export InterfaceId and rebase to main

Author: keepsimple1

examples/query.rs

@@ -50,7 +50,7 @@ fn main() {
                     println!(
                         " Address: {} ({:?})",
                         addr,
-                        interfaces.iter().map(|i| i.name()).collect::<Vec<_>>()
+                        interfaces.iter().map(|i| &i.name).collect::<Vec<_>>()
                     );
                 }
                 for prop in info.txt_properties.iter() {

src/dns_parser.rs

@@ -22,26 +22,19 @@ use std::{
     time::SystemTime,
 };
 
-/// InterfaceId is used to represent the interface identifier
+/// Represents a network interface identifier defined by the OS.
 #[derive(Clone, Debug, Eq, Hash, PartialEq, Default)]
 pub struct InterfaceId {
-    name: String,
-    index: u32,
-}
-
-impl InterfaceId {
-    pub fn index(&self) -> u32 {
-        self.index
-    }
+    /// Interface name, e.g. "en0", "wlan0", etc.
+    pub name: String,
 
-    pub fn name(&self) -> &str {
-        &self.name
-    }
+    /// Interface index assigned by the OS, e.g. 1, 2, etc.
+    pub index: u32,
 }
 
 impl fmt::Display for InterfaceId {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}: {}", self.index, self.name)
+        write!(f, "{}(idx {})", self.name, self.index)
     }
 }
 

src/lib.rs

@@ -162,7 +162,7 @@ mod error;
 mod service_daemon;
 mod service_info;
 
-pub use dns_parser::RRType;
+pub use dns_parser::{InterfaceId, RRType};
 pub use error::{Error, Result};
 pub use service_daemon::{
     DaemonEvent, DaemonStatus, DnsNameChange, HostnameResolutionEvent, IfKind, Metrics,

tests/mdns_test.rs

@@ -2641,8 +2641,7 @@ fn test_use_service_detailed_v6() {
                 println!("Resolved address: {:?}", first_addr);
                 println!(
                     "Interface ID of the first addr: {} index: {}",
-                    interface_id.name(),
-                    interface_id.index()
+                    interface_id.name, interface_id.index
                 );
                 break;
             }