RPL Mode of Operation 0, Mode of Operation 1 and Mode of Operation 2

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

@@ -21,6 +21,7 @@ static CONFIGS: &[(&str, usize)] = &[
     ("DNS_MAX_NAME_SIZE", 255),
     ("RPL_RELATIONS_BUFFER_COUNT", 16),
     ("RPL_PARENTS_BUFFER_COUNT", 8),
+    ("RPL_MAX_OPTIONS", 2),
     // 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/client.rs

@@ -68,7 +68,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/dns.rs

@@ -66,7 +66,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

@@ -79,7 +79,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

@@ -149,7 +149,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/sixlowpan.rs

@@ -78,6 +78,10 @@ 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());
     iface.update_ip_addrs(|ip_addrs| {

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
 

src/iface/interface/ieee802154.rs

@@ -38,6 +38,8 @@ impl InterfaceInner {
             return None;
         }
 
+        self.current_frame = Some(ieee802154_repr);
+
         match ieee802154_frame.payload() {
             Some(payload) => {
                 self.process_sixlowpan(sockets, meta, &ieee802154_repr, payload, _fragments)
@@ -51,7 +53,7 @@ impl InterfaceInner {
         ll_dst_a: Ieee802154Address,
         tx_token: Tx,
         meta: PacketMeta,
-        packet: Packet,
+        packet: PacketV6,
         frag: &mut Fragmenter,
     ) {
         let ll_src_a = self.hardware_addr.ieee802154_or_panic();