浏览代码

Merge #712

712: add more tests in CI r=Dirbaio a=thvdveld

IPv4 fragmentation was not covered in CI, neither was 6LoWPAN without fragmentation.

Co-authored-by: Thibaut Vandervelden <thvdveld@vub.be>
bors[bot] 2 年之前
父节点
当前提交
ae428c1332
共有 2 个文件被更改,包括 4 次插入2 次删除
  1. 2 0
      .github/workflows/test.yml
  2. 2 2
      src/iface/interface/mod.rs

+ 2 - 0
.github/workflows/test.yml

@@ -34,6 +34,7 @@ jobs:
           # Test features chosen to be as orthogonal as possible.
           - std medium-ethernet phy-raw_socket proto-ipv6 socket-udp socket-dns
           - std medium-ethernet phy-tuntap_interface proto-ipv6 socket-udp
+          - std medium-ethernet proto-ipv4 proto-ipv4-fragmentation socket-raw socket-dns
           - std medium-ethernet proto-ipv4 proto-igmp socket-raw socket-dns
           - std medium-ethernet proto-ipv4 socket-udp socket-tcp socket-dns
           - std medium-ethernet proto-ipv4 proto-dhcpv4 socket-udp
@@ -41,6 +42,7 @@ jobs:
           - std medium-ethernet proto-ipv6 socket-tcp
           - std medium-ethernet medium-ip proto-ipv4 socket-icmp socket-tcp
           - std medium-ip proto-ipv6 socket-icmp socket-tcp
+          - std medium-ieee802154 proto-sixlowpan socket-udp
           - std medium-ieee802154 proto-sixlowpan proto-sixlowpan-fragmentation socket-udp
           - std medium-ip proto-ipv4 proto-ipv6 socket-tcp socket-udp
 

+ 2 - 2
src/iface/interface/mod.rs

@@ -319,7 +319,7 @@ impl<'a> InterfaceBuilder<'a> {
 ```
 # use std::collections::BTreeMap;
 #[cfg(feature = "proto-ipv4-fragmentation")]
-use smoltcp::iface::FragmentsCache;
+use smoltcp::iface::ReassemblyBuffer;
 use smoltcp::iface::{InterfaceBuilder, NeighborCache};
 # use smoltcp::phy::{Loopback, Medium};
 use smoltcp::wire::{EthernetAddress, IpCidr, IpAddress};
@@ -332,7 +332,7 @@ let neighbor_cache = // ...
 # NeighborCache::new(BTreeMap::new());
 # #[cfg(feature = "proto-ipv4-fragmentation")]
 # let ipv4_frag_cache = // ...
-# FragmentsCache::new(vec![], BTreeMap::new());
+# ReassemblyBuffer::new(vec![], BTreeMap::new());
 let ip_addrs = // ...
 # [];
 let builder = InterfaceBuilder::new()