RPL with all modes of operation

.gitignore

@@ -1,3 +1,4 @@
 /target
 Cargo.lock
 *.pcap
+sim_logs/

Cargo.toml

@@ -61,6 +61,11 @@ defmt = ["dep:defmt", "heapless/defmt-03"]
 "proto-ipsec-ah" = []
 "proto-ipsec-esp" = []
 
+"rpl-mop-0" = ["proto-rpl"]
+"rpl-mop-1" = ["proto-rpl"]
+"rpl-mop-2" = ["proto-rpl"]
+"rpl-mop-3" = ["proto-rpl"]
+
 "socket" = []
 "socket-raw" = ["socket"]
 "socket-udp" = ["socket"]
@@ -96,7 +101,8 @@ default = [
   "proto-ipv4", "proto-igmp", "proto-dhcpv4", "proto-ipv6", "proto-dns",
   "proto-ipv4-fragmentation", "proto-sixlowpan-fragmentation",
   "socket-raw", "socket-icmp", "socket-udp", "socket-tcp", "socket-dhcpv4", "socket-dns", "socket-mdns",
-  "packetmeta-id", "async"
+  "packetmeta-id", "async",
+  "rpl-mop-0", "rpl-mop-1", "rpl-mop-2", "rpl-mop-3"
 ]
 
 # Private features
@@ -261,6 +267,13 @@ rpl-parents-buffer-count-8 = [] # Default
 rpl-parents-buffer-count-16 = []
 rpl-parents-buffer-count-32 = []
 
+rpl-max-options-1 = []
+rpl-max-options-2 = [] # Default
+rpl-max-options-4 = []
+rpl-max-options-8 = []
+rpl-max-options-16 = []
+rpl-max-options-32 = []
+
 # END AUTOGENERATED CONFIG FEATURES
 
 [[example]]
@@ -316,5 +329,9 @@ required-features = ["std", "medium-ieee802154", "phy-raw_socket", "proto-sixlow
 name = "dns"
 required-features = ["std", "medium-ethernet", "medium-ip", "phy-tuntap_interface", "proto-ipv4", "socket-dns"]
 
+[[test]]
+name = "rpl"
+required-features = ["std", "medium-ieee802154", "proto-sixlowpan", "rpl-mop-0", "rpl-mop-1", "rpl-mop-2", "rpl-mop-3"]
+
 [profile.release]
 debug = 2

build.rs

@@ -11,6 +11,7 @@ static CONFIGS: &[(&str, usize)] = &[
     ("IFACE_MAX_SIXLOWPAN_ADDRESS_CONTEXT_COUNT", 4),
     ("IFACE_NEIGHBOR_CACHE_COUNT", 4),
     ("IFACE_MAX_ROUTE_COUNT", 2),
+    ("IFACE_MAX_MULTICAST_DUPLICATION_COUNT", 16),
     ("FRAGMENTATION_BUFFER_SIZE", 1500),
     ("ASSEMBLER_MAX_SEGMENT_COUNT", 4),
     ("REASSEMBLY_BUFFER_SIZE", 1500),
@@ -21,6 +22,8 @@ static CONFIGS: &[(&str, usize)] = &[
     ("DNS_MAX_NAME_SIZE", 255),
     ("RPL_RELATIONS_BUFFER_COUNT", 16),
     ("RPL_PARENTS_BUFFER_COUNT", 8),
+    ("RPL_MAX_OPTIONS", 2),
+    ("RPL_MAX_NEXT_HOP_PER_DESTINATION", 4),
     // END AUTOGENERATED CONFIG FEATURES
 ];
 

ci.sh

@@ -27,7 +27,10 @@ FEATURES_TEST=(
     "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-ieee802154,proto-rpl,proto-sixlowpan,proto-sixlowpan-fragmentation,socket-udp"
+    "std,medium-ieee802154,rpl-mop-0,proto-sixlowpan,proto-sixlowpan-fragmentation,socket-udp"
+    "std,medium-ieee802154,rpl-mop-1,proto-sixlowpan,proto-sixlowpan-fragmentation,socket-udp"
+    "std,medium-ieee802154,rpl-mop-2,proto-sixlowpan,proto-sixlowpan-fragmentation,socket-udp"
+    "std,medium-ieee802154,rpl-mop-3,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,socket-raw,socket-udp,socket-tcp,socket-icmp,socket-dns,async"
     "std,medium-ieee802154,medium-ip,proto-ipv4,socket-raw"

examples/benchmark.rs

@@ -12,6 +12,7 @@ use std::thread;
 use smoltcp::iface::{Config, Interface, SocketSet};
 use smoltcp::phy::{wait as phy_wait, Device, Medium};
 use smoltcp::socket::tcp;
+use smoltcp::storage::PacketMetadata;
 use smoltcp::time::{Duration, Instant};
 use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr};
 
@@ -97,7 +98,13 @@ fn main() {
     };
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))

examples/client.rs

@@ -1,6 +1,7 @@
 mod utils;
 
 use log::debug;
+use smoltcp::storage::PacketMetadata;
 use std::os::unix::io::AsRawFd;
 use std::str::{self, FromStr};
 
@@ -38,7 +39,13 @@ fn main() {
     };
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))
@@ -68,7 +75,7 @@ fn main() {
 
     let socket = sockets.get_mut::<tcp::Socket>(tcp_handle);
     socket
-        .connect(iface.context(), (address, port), 49500)
+        .connect(iface.context_mut(), (address, port), 49500)
         .unwrap();
 
     let mut tcp_active = false;

examples/dhcp_client.rs

@@ -2,6 +2,7 @@
 mod utils;
 
 use log::*;
+use smoltcp::storage::PacketMetadata;
 use std::os::unix::io::AsRawFd;
 
 use smoltcp::iface::{Config, Interface, SocketSet};
@@ -36,7 +37,13 @@ fn main() {
         Medium::Ieee802154 => todo!(),
     };
     config.random_seed = rand::random();
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
 
     // Create sockets
     let mut dhcp_socket = dhcpv4::Socket::new();

examples/dns.rs

@@ -4,6 +4,7 @@ use smoltcp::iface::{Config, Interface, SocketSet};
 use smoltcp::phy::Device;
 use smoltcp::phy::{wait as phy_wait, Medium};
 use smoltcp::socket::dns::{self, GetQueryResultError};
+use smoltcp::storage::PacketMetadata;
 use smoltcp::time::Instant;
 use smoltcp::wire::{DnsQueryType, EthernetAddress, IpAddress, IpCidr, Ipv4Address, Ipv6Address};
 use std::os::unix::io::AsRawFd;
@@ -33,7 +34,13 @@ fn main() {
     };
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))
@@ -66,7 +73,7 @@ fn main() {
 
     let socket = sockets.get_mut::<dns::Socket>(dns_handle);
     let query = socket
-        .start_query(iface.context(), name, DnsQueryType::A)
+        .start_query(iface.context_mut(), name, DnsQueryType::A)
         .unwrap();
 
     loop {

examples/httpclient.rs

@@ -1,6 +1,7 @@
 mod utils;
 
 use log::debug;
+use smoltcp::storage::PacketMetadata;
 use std::os::unix::io::AsRawFd;
 use std::str::{self, FromStr};
 use url::Url;
@@ -38,7 +39,13 @@ fn main() {
     };
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))
@@ -79,7 +86,7 @@ fn main() {
         iface.poll(timestamp, &mut device, &mut sockets);
 
         let socket = sockets.get_mut::<tcp::Socket>(tcp_handle);
-        let cx = iface.context();
+        let cx = iface.context_mut();
 
         state = match state {
             State::Connect if !socket.is_active() => {

examples/loopback.rs

@@ -12,6 +12,7 @@ use log::{debug, error, info};
 use smoltcp::iface::{Config, Interface, SocketSet};
 use smoltcp::phy::{Device, Loopback, Medium};
 use smoltcp::socket::tcp;
+use smoltcp::storage::PacketMetadata;
 use smoltcp::time::{Duration, Instant};
 use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr};
 
@@ -91,7 +92,17 @@ fn main() {
         Medium::Ieee802154 => todo!(),
     };
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    // Setup multicast queues
+    let mut metadata = [PacketMetadata::EMPTY; 16];
+    let mut multicast_packets = [0; 2048];
+
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        &mut metadata[..],
+        &mut multicast_packets[..],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(127, 0, 0, 1), 8))
@@ -149,7 +160,7 @@ fn main() {
         }
 
         let mut socket = sockets.get_mut::<tcp::Socket>(client_handle);
-        let cx = iface.context();
+        let cx = iface.context_mut();
         if !socket.is_open() {
             if !did_connect {
                 debug!("connecting");

examples/multicast.rs

@@ -5,6 +5,7 @@ use std::os::unix::io::AsRawFd;
 use smoltcp::iface::{Config, Interface, SocketSet};
 use smoltcp::phy::{wait as phy_wait, Device, Medium};
 use smoltcp::socket::{raw, udp};
+use smoltcp::storage::PacketMetadata;
 use smoltcp::time::Instant;
 use smoltcp::wire::{
     EthernetAddress, IgmpPacket, IgmpRepr, IpAddress, IpCidr, IpProtocol, IpVersion, Ipv4Address,
@@ -37,7 +38,13 @@ fn main() {
     };
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))

examples/ping.rs

@@ -2,6 +2,7 @@ mod utils;
 
 use byteorder::{ByteOrder, NetworkEndian};
 use smoltcp::iface::{Interface, SocketSet};
+use smoltcp::storage::PacketMetadata;
 use std::cmp;
 use std::collections::HashMap;
 use std::os::unix::io::AsRawFd;
@@ -114,7 +115,13 @@ fn main() {
     };
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))

examples/server.rs

@@ -1,6 +1,7 @@
 mod utils;
 
 use log::debug;
+use smoltcp::storage::PacketMetadata;
 use std::fmt::Write;
 use std::os::unix::io::AsRawFd;
 
@@ -34,7 +35,13 @@ fn main() {
 
     config.random_seed = rand::random();
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(IpAddress::v4(192, 168, 69, 1), 24))

examples/sixlowpan.rs

@@ -43,6 +43,7 @@
 mod utils;
 
 use log::debug;
+use smoltcp::storage::PacketMetadata;
 use std::os::unix::io::AsRawFd;
 use std::str;
 
@@ -78,8 +79,18 @@ fn main() {
     };
     config.random_seed = rand::random();
     config.pan_id = Some(Ieee802154Pan(0xbeef));
+    #[cfg(feature = "proto-rpl")]
+    {
+        config.rpl_config = None;
+    }
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(

examples/sixlowpan_benchmark.rs

@@ -49,6 +49,7 @@ use std::str;
 use smoltcp::iface::{Config, Interface, SocketSet};
 use smoltcp::phy::{wait as phy_wait, Device, Medium, RawSocket};
 use smoltcp::socket::tcp;
+use smoltcp::storage::PacketMetadata;
 use smoltcp::wire::{EthernetAddress, Ieee802154Address, Ieee802154Pan, IpAddress, IpCidr};
 
 //For benchmark
@@ -159,7 +160,13 @@ fn main() {
     config.random_seed = rand::random();
     config.pan_id = Some(Ieee802154Pan(0xbeef));
 
-    let mut iface = Interface::new(config, &mut device, Instant::now());
+    let mut iface = Interface::new(
+        config,
+        &mut device,
+        vec![PacketMetadata::EMPTY; 16],
+        vec![0; 2048],
+        Instant::now(),
+    );
     iface.update_ip_addrs(|ip_addrs| {
         ip_addrs
             .push(IpCidr::new(

gen_config.py

@@ -42,6 +42,7 @@ def feature(name, default, min, max, pow2=None):
 feature("dns_max_name_size", default=255, min=64, max=255, pow2=True)
 feature("rpl_relations_buffer_count", default=16, min=1, max=128, pow2=True)
 feature("rpl_parents_buffer_count", default=8, min=2, max=32, pow2=True)
+feature("rpl_max_options", default=2, min=1, max=32, pow2=True)
 
 # ========= Update Cargo.toml