fix pupblishing ipv6 link-local

Author: Nicolas Vandamme

.gitignore

@@ -2,3 +2,4 @@ target
 Cargo.lock
 __pycache__
 *.pyc
+examples/register_all.rs

Cargo.toml

@@ -11,24 +11,25 @@ edition = "2018"
 
 [dependencies]
 byteorder = "1.5"
-if-addrs = "0.11.0"
-hostname = "0.3.1"
+if-addrs = "0.12.0"
+hostname = "0.4.0"
 log = "0.4"
-multimap = "0.9"
+multimap = "0.10.0"
 rand = "0.8"
 futures-util = "0.3"
 thiserror = "1.0"
 tokio = { version = "1.0", features = ["sync", "net", "rt"] }
 socket2 = { version = "0.5", features = ["all"] }
+local-ip-address = "0.6.1"
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["netioapi"] }
 
 [target.'cfg(not(windows))'.dependencies]
-nix = { version = "0.27", features = ["net"] }
+nix = { version = "0.28", features = ["net"] }
 
 [dev-dependencies]
-env_logger = { version = "0.10", default-features = false, features = [
+env_logger = { version = "0.11.3", default-features = false, features = [
   "color",
   "humantime",
   "auto-color",

src/fsm.rs

@@ -7,7 +7,7 @@ use std::collections::VecDeque;
 use std::io;
 use std::io::ErrorKind::WouldBlock;
 use std::marker::PhantomData;
-use std::net::{IpAddr, SocketAddr};
+use std::net::{IpAddr, SocketAddr, Ipv4Addr, Ipv6Addr};
 use std::{
     future::Future,
     pin::Pin,
@@ -20,6 +20,8 @@ use super::{DEFAULT_TTL, MDNS_PORT};
 use crate::address_family::AddressFamily;
 use crate::services::{ServiceData, Services};
 
+use local_ip_address::{list_afinet_netifas};
+
 pub type AnswerBuilder = dns_parser::Builder<dns_parser::Answers>;
 
 const SERVICE_TYPE_ENUMERATION_NAME: Cow<'static, str> =
@@ -221,7 +223,7 @@ impl<AF: AddressFamily> FSM<AF> {
     }
 
     fn add_ip_rr(&self, hostname: &Name, mut builder: AnswerBuilder, ttl: u32) -> AnswerBuilder {
-        let interfaces = match get_if_addrs() {
+        let interfaces = match list_afinet_netifas() {
             Ok(interfaces) => interfaces,
             Err(err) => {
                 error!("could not get list of interfaces: {}", err);
@@ -230,22 +232,25 @@ impl<AF: AddressFamily> FSM<AF> {
         };
 
         for iface in interfaces {
-            if iface.is_loopback() {
-                continue;
-            }
 
             trace!("found interface {:?}", iface);
-            if !self.allowed_ip.is_empty() && !self.allowed_ip.contains(&iface.ip()) {
+            if !self.allowed_ip.is_empty() && !self.allowed_ip.contains(&iface.1) {
                 trace!("  -> interface dropped");
                 continue;
             }
 
-            match (iface.ip(), AF::DOMAIN) {
+            match (iface.1, AF::DOMAIN) {
                 (IpAddr::V4(ip), Domain::IPV4) => {
-                    builder = builder.add_answer(hostname, QueryClass::IN, ttl, &RRData::A(ip))
+                    if !is_loopback_ipv4(ip) {
+                        builder = builder.add_answer(hostname, QueryClass::IN, ttl, &RRData::A(ip));
+                        trace!("  -> adding IP address {:?}", iface.1);
+                    }
                 }
                 (IpAddr::V6(ip), Domain::IPV6) => {
-                    builder = builder.add_answer(hostname, QueryClass::IN, ttl, &RRData::AAAA(ip))
+                    if !is_loopback_ipv6(ip) {
+                        builder = builder.add_answer(hostname, QueryClass::IN, ttl, &RRData::AAAA(ip));
+                        trace!("  -> adding IP address {:?}", iface.1);
+                    }
                 }
                 _ => (),
             }
@@ -318,6 +323,15 @@ impl<AF: Unpin + AddressFamily> Future for FSM<AF> {
     }
 }
 
+
+fn is_loopback_ipv6(ip: Ipv6Addr) -> bool {
+    ip.segments() == [0, 0, 0, 0, 0, 0, 0, 1]
+}
+
+fn is_loopback_ipv4(ip: Ipv4Addr) -> bool {
+    ip.octets()[0] == 127
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;