Merge #574

574: Fix build when enabling only medium-ip r=Dirbaio a=Dirbaio

cc `@thibautvdv` 

Co-authored-by: Dario Nieuwenhuis <dirbaio@dirbaio.net>

.github/workflows/test.yml

@@ -1,6 +1,6 @@
 on:
   push:
-    branches: [ staging, trying ]
+    branches: [staging, trying]
   pull_request:
 
 name: Test
@@ -37,13 +37,13 @@ jobs:
           - std medium-ethernet proto-ipv4 proto-igmp socket-raw
           - std medium-ethernet proto-ipv4 socket-udp socket-tcp
           - std medium-ethernet proto-ipv4 proto-dhcpv4 socket-udp
-          - std medium-ethernet proto-ipv6 socket-udp
+          - std medium-ethernet medium-ip medium-ieee802154 proto-ipv6 socket-udp
           - std medium-ethernet proto-ipv6 socket-tcp
-          - std medium-ethernet proto-ipv4 socket-icmp socket-tcp
-          - std medium-ethernet proto-ipv6 socket-icmp socket-tcp
+          - std medium-ethernet medium-ip proto-ipv4 socket-icmp socket-tcp
+          - std medium-ip proto-ipv6 socket-icmp socket-tcp
 
           # Test features chosen to be as aggressive as possible.
-          - std medium-ethernet proto-ipv4 proto-ipv6 socket-raw socket-udp socket-tcp socket-icmp async
+          - std medium-ethernet medium-ip medium-ieee802154 proto-ipv4 proto-ipv6 socket-raw socket-udp socket-tcp socket-icmp async
 
         include:
           # Test alloc feature which requires nightly.

src/iface/interface.rs

@@ -253,6 +253,7 @@ let iface = InterfaceBuilder::new(device, vec![])
     pub fn finalize(self) -> Interface<'a, DeviceT> {
         let device_capabilities = self.device.capabilities();
 
+        #[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154"))]
         let (hardware_addr, neighbor_cache) = match device_capabilities.medium {
             #[cfg(feature = "medium-ethernet")]
             Medium::Ethernet => (
@@ -2275,6 +2276,7 @@ impl<'a> InterfaceInner<'a> {
     }
 
     fn flush_cache(&mut self) {
+        #[cfg(any(feature = "medium-ethernet", feature = "medium-ieee802154"))]
         if let Some(cache) = self.neighbor_cache.as_mut() {
             cache.flush()
         }
@@ -2394,16 +2396,17 @@ impl<'a> InterfaceInner<'a> {
                     _ => return Err(Error::Unaddressable),
                 };
 
-                let next_header = match &packet {
-                    IpPacket::Udp(_) => SixlowpanNextHeader::Compressed,
-                    IpPacket::Icmpv6(_) => SixlowpanNextHeader::Uncompressed(IpProtocol::Icmpv6),
-                    _ => return Err(Error::Unrecognized),
-                };
-
-                let hop_limit = match packet {
-                    IpPacket::Icmpv6((_, Icmpv6Repr::Ndisc(_))) => 255,
-                    IpPacket::Icmpv6((_, Icmpv6Repr::EchoReply { .. })) => 64,
-                    IpPacket::Udp(..) => 64,
+                #[allow(unreachable_patterns)]
+                let (next_header, hop_limit) = match &packet {
+                    #[cfg(feature = "socket-udp")]
+                    IpPacket::Udp(_) => (SixlowpanNextHeader::Compressed, 64),
+                    IpPacket::Icmpv6((_, repr)) => (
+                        SixlowpanNextHeader::Uncompressed(IpProtocol::Icmpv6),
+                        match repr {
+                            Icmpv6Repr::Ndisc(_) => 255,
+                            _ => 64,
+                        },
+                    ),
                     _ => return Err(Error::Unrecognized),
                 };
 
@@ -2419,7 +2422,9 @@ impl<'a> InterfaceInner<'a> {
                 tx_len += ieee_repr.buffer_len();
                 tx_len += iphc_repr.buffer_len();
 
+                #[allow(unreachable_patterns)]
                 match &packet {
+                    #[cfg(feature = "socket-udp")]
                     IpPacket::Udp((_, udp_repr, payload)) => {
                         let udp_repr = SixlowpanUdpRepr(*udp_repr);
                         tx_len += udp_repr.header_len() + payload.len();
@@ -2443,6 +2448,7 @@ impl<'a> InterfaceInner<'a> {
                     iphc_repr.emit(&mut iphc_packet);
                     start += iphc_repr.buffer_len();
 
+                    #[allow(unreachable_patterns)]
                     match packet {
                         IpPacket::Udp((_, udp_repr, payload)) => {
                             // 3. Create the header for 6LoWPAN UDP
@@ -2457,6 +2463,7 @@ impl<'a> InterfaceInner<'a> {
                                 |buf| buf.copy_from_slice(payload),
                             );
                         }
+                        #[cfg(feature = "proto-ipv6")]
                         IpPacket::Icmpv6((_, icmp_repr)) => {
                             // 3. Create the header for ICMPv6
                             let mut icmp_packet =

src/phy/mod.rs

@@ -286,11 +286,7 @@ impl Default for Medium {
     fn default() -> Medium {
         #[cfg(feature = "medium-ethernet")]
         return Medium::Ethernet;
-        #[cfg(all(
-            feature = "medium-ip",
-            not(feature = "medium-ethernet"),
-            not(feature = "medium-ieee802154")
-        ))]
+        #[cfg(all(feature = "medium-ip", not(feature = "medium-ethernet")))]
         return Medium::Ip;
         #[cfg(all(
             feature = "medium-ieee802154",
@@ -303,7 +299,7 @@ impl Default for Medium {
             not(feature = "medium-ethernet"),
             not(feature = "medium-ieee802154")
         ))]
-        panic!("No medium enabled");
+        return panic!("No medium enabled");
     }
 }