Przeglądaj źródła

Merge pull request #1043 from Dominaezzz/patch-1

Fix compilation of Ipv6+Multicast without Ethernet
Dario Nieuwenhuis 3 miesięcy temu
rodzic
commit
3988338971
2 zmienionych plików z 6 dodań i 1 usunięć
  1. 1 0
      ci.sh
  2. 5 1
      src/iface/interface/mod.rs

+ 1 - 0
ci.sh

@@ -30,6 +30,7 @@ FEATURES_TEST=(
     "std,medium-ieee802154,proto-rpl,proto-sixlowpan,proto-sixlowpan-fragmentation,socket-udp"
     "std,medium-ip,proto-ipv4,proto-ipv6,socket-tcp,socket-udp"
     "std,medium-ethernet,medium-ip,medium-ieee802154,proto-ipv4,proto-ipv6,multicast,proto-rpl,socket-raw,socket-udp,socket-tcp,socket-icmp,socket-dns,async"
+    "std,medium-ip,proto-ipv4,proto-ipv6,multicast,socket-raw,socket-udp,socket-tcp,socket-icmp,socket-dns,async"
     "std,medium-ieee802154,medium-ip,proto-ipv4,socket-raw"
     "std,medium-ethernet,proto-ipv4,proto-ipsec,socket-raw"
 )

+ 5 - 1
src/iface/interface/mod.rs

@@ -363,7 +363,11 @@ impl Interface {
         InterfaceInner::flush_neighbor_cache(&mut self.inner);
         InterfaceInner::check_ip_addrs(&self.inner.ip_addrs);
 
-        #[cfg(all(feature = "proto-ipv6", feature = "multicast"))]
+        #[cfg(all(
+            feature = "proto-ipv6",
+            feature = "multicast",
+            feature = "medium-ethernet"
+        ))]
         if self.inner.caps.medium == Medium::Ethernet {
             self.update_solicited_node_groups();
         }