SiliconLabs · rzr · May 28, 2024 · May 27, 2024 · Feb 21, 2024 · Feb 21, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,19 @@
+# YAML -*- mode: yaml; tab-width: 2; indent-tabs-mode: nil; coding: utf-8 -*-
+# SPDX-License-Identifier: LicenseRef-MSLA
+# SPDX-Copyright-Text: (c) 2024 Silicon Laboratories Inc. (www.silabs.com)
+---
+name: Docker Image CI
+
+on:  # yamllint disable-line rule:truthy
+  push:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/[email protected]
+        with:
+          fetch-depth: 0
+      - name: Build Docker image from sources
+        run: docker build .
diff --git a/6lbr/6lowpan/lowpan_adaptation_interface.c b/6lbr/6lowpan/lowpan_adaptation_interface.c
@@ -774,9 +774,8 @@ int8_t lowpan_adaptation_interface_tx(struct net_if *cur, buffer_t *buf)
     if (fragmented_needed) {
         //Fragmentation init
         if (lowpan_message_fragmentation_init(buf, tx_ptr, cur, interface_ptr)) {
-            tr_error("Fragment init fail");
-            tx_ptr->buf = NULL;
-            goto tx_error_handler;
+            lowpan_adaptation_data_process_clean(interface_ptr, tx_ptr);
+            return -1;
         }
 
         tx_ptr->tag = interface_ptr->local_frag_tag++;

diff --git a/6lbr/6lowpan/lowpan_mtu.h b/6lbr/6lowpan/lowpan_mtu.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2024 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/commandline.c b/6lbr/app/commandline.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -145,6 +146,7 @@ static const int valid_ws_chan_plan_ids[] = {
     0x70, 0x71,                                           // WW
     0x80,                                                 // CN
     0x90,                                                 // CN
+    0xa0,                                                 // CN
     INT_MIN
 };
 
@@ -444,6 +446,13 @@ static void conf_set_key(struct wsbrd_conf *config, const struct storage_parse_i
     dest->key_len = ret;
 }
 
+static void conf_set_eui64(struct wsbrd_conf *config, const struct storage_parse_info *info, void *raw_dest, const void *raw_param)
+{
+    BUG_ON(raw_param);
+    if (parse_byte_array(raw_dest, 8, info->value))
+        FATAL(1, "%s:%d: invalid key: %s", info->filename, info->linenr, info->value);
+}
+
 static void conf_set_allowed_macaddr(struct wsbrd_conf *config, const struct storage_parse_info *info, void *raw_dest, const void *raw_param)
 {
     BUG_ON(raw_param);
@@ -545,6 +554,7 @@ static void parse_config_line(struct wsbrd_conf *config, struct storage_parse_in
         { "lgtk_new_activation_time",       &config->ws_lgtk_new_activation_time,       conf_set_number,      &valid_positive },
         { "lgtk_new_install_required",      &config->ws_lgtk_new_install_required,      conf_set_number,      &valid_gtk_new_install_required },
         { "lfn_revocation_lifetime_reduction", &config->ws_lfn_revocation_lifetime_reduction, conf_set_number,      &valid_unsigned },
+        { "mac_address",                   config->ws_mac_address,                    conf_set_eui64,       NULL },
         { "allowed_mac64",                 config->ws_allowed_mac_addresses,          conf_set_allowed_macaddr, NULL },
         { "denied_mac64",                  config->ws_denied_mac_addresses,           conf_set_denied_macaddr, NULL },
         { "async_frag_duration",           &config->ws_async_frag_duration,           conf_set_number,      &valid_async_frag_duration },
@@ -653,6 +663,7 @@ void parse_commandline(struct wsbrd_conf *config, int argc, char *argv[],
     config->rpl_compat = true;
     config->rpl_rpi_ignorable = false;
     strcpy(config->storage_prefix, "/var/lib/wsbrd/");
+    memset(config->ws_mac_address, 0xff, sizeof(config->ws_mac_address));
     memset(config->ws_allowed_channels, 0xFF, sizeof(config->ws_allowed_channels));
     while ((opt = getopt_long(argc, argv, opts_short, opts_long, NULL)) != -1) {
         switch (opt) {

diff --git a/6lbr/app/commandline.h b/6lbr/app/commandline.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -98,6 +99,7 @@ struct wsbrd_conf {
     bool rpl_rpi_ignorable;
     unsigned int ws_join_metrics;
 
+    uint8_t ws_mac_address[8];
     uint8_t ws_allowed_mac_addresses[10][8];
     uint8_t ws_allowed_mac_address_count;
     uint8_t ws_denied_mac_addresses[10][8];

diff --git a/6lbr/app/commandline_values.c b/6lbr/app/commandline_values.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/commandline_values.h b/6lbr/app/commandline_values.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/dbus.c b/6lbr/app/dbus.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -358,6 +359,7 @@ static int dbus_ie_custom_insert(sd_bus_message *m, void *userdata, sd_bus_error
         case WS_FT_PA:
         case WS_FT_PC:
         case WS_FT_EAPOL:
+        case WS_FT_DATA:
         case WS_FT_LPA:
         case WS_FT_LPC:
             break;
@@ -648,6 +650,7 @@ int dbus_get_routing_graph(sd_bus *bus, const char *path, const char *interface,
     struct wsbr_ctxt *ctxt = userdata;
     struct rpl_target target_br = { };
     struct rpl_target *target;
+    struct ws_neigh *ws_neigh;
 
     sd_bus_message_open_container(reply, 'a', "(aybaay)");
 
@@ -665,6 +668,10 @@ int dbus_get_routing_graph(sd_bus *bus, const char *path, const char *interface,
             continue;
         if (rpl_target_get(&ctxt->net_if.rpl_root, ipv6_neigh->ip_address))
             continue;
+        ws_neigh = ws_neigh_get(&ctxt->net_if.ws_info.neighbor_storage,
+                                ipv6_neighbour_eui64(&ctxt->net_if.ipv6_neighbour_cache, ipv6_neigh));
+        if (!ws_neigh || ws_neigh->node_role != WS_NR_ROLE_LFN)
+            continue;
         dbus_message_append_ipv6_neigh(reply, ipv6_neigh, &ctxt->net_if.rpl_root);
     }
 

diff --git a/6lbr/app/dbus.h b/6lbr/app/dbus.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/drop_privileges.c b/6lbr/app/drop_privileges.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/drop_privileges.h b/6lbr/app/drop_privileges.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/frame_helpers.c b/6lbr/app/frame_helpers.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -45,10 +46,6 @@
 #define IEEE802154_SECURITY_FRAME_COUNT_SUPPR 0b00100000
 #define IEEE802154_SECURITY_ASN_IN_NONCE      0b01000000
 
-// IEEE 802.15.4-2020 Table 7-1 Values of the Frame Type field
-#define IEEE802154_FRAME_TYPE_DATA 0b001
-#define IEEE802154_FRAME_TYPE_ACK  0b010
-
 // IEEE 802.15.4-2020 Figure 7-21 Format of Header IEs
 #define IEEE802154_HEADER_IE_LEN_MASK  0b0000000001111111
 #define IEEE802154_HEADER_IE_ID_MASK   0b0111111110000000
@@ -111,64 +108,6 @@ static const struct {
     { MAC_ADDR_MODE_16_BIT, MAC_ADDR_MODE_16_BIT, true,  false, 1 },
 };
 
-int wsbr_data_ind_rebuild(uint8_t frame[],
-                         const struct mcps_data_ind *ind,
-                         const struct mcps_data_rx_ie_list *ie)
-{
-    uint8_t *start = frame;
-    uint16_t fcf;
-    int i;
-
-    BUG_ON(ind->msduLength);
-    fcf = FIELD_PREP(IEEE802154_FCF_FRAME_TYPE,         IEEE802154_FRAME_TYPE_DATA)
-        | FIELD_PREP(IEEE802154_FCF_SECURITY_ENABLED,   false)
-        | FIELD_PREP(IEEE802154_FCF_FRAME_PENDING,      ind->PendingBit)
-        | FIELD_PREP(IEEE802154_FCF_ACK_REQ,            ind->TxAckReq)
-        | FIELD_PREP(IEEE802154_FCF_PAN_ID_COMPRESSION, ind->PanIdSuppressed)
-        | FIELD_PREP(IEEE802154_FCF_SEQ_NUM_SUPPR,      ind->DSN_suppressed)
-        | FIELD_PREP(IEEE802154_FCF_IE_PRESENT,         ie->headerIeListLength || ie->payloadIeListLength)
-        | FIELD_PREP(IEEE802154_FCF_DST_ADDR_MODE,      ind->DstAddrMode)
-        | FIELD_PREP(IEEE802154_FCF_FRAME_VERSION,      MAC_FRAME_VERSION_2015)
-        | FIELD_PREP(IEEE802154_FCF_SRC_ADDR_MODE,      ind->SrcAddrMode);
-    frame = write_le16(frame, fcf);
-    if (!ind->DSN_suppressed)
-        *frame++ = ind->DSN;
-
-    for (i = 0; i < ARRAY_SIZE(ieee802154_table_pan_id_comp); i++)
-        if (ieee802154_table_pan_id_comp[i].dst_addr_mode      == ind->DstAddrMode &&
-            ieee802154_table_pan_id_comp[i].src_addr_mode      == ind->SrcAddrMode &&
-            ieee802154_table_pan_id_comp[i].pan_id_compression == ind->PanIdSuppressed)
-            break;
-    BUG_ON(i == ARRAY_SIZE(ieee802154_table_pan_id_comp), "invalid address mode");
-    if (ieee802154_table_pan_id_comp[i].dst_pan_id)
-        frame = write_le16(frame, ind->DstPANId);
-    if (ind->DstAddrMode == MAC_ADDR_MODE_64_BIT) {
-        memrcpy(frame, ind->DstAddr, 8);
-        frame += 8;
-    } else if (ind->DstAddrMode == MAC_ADDR_MODE_16_BIT) {
-        memrcpy(frame, ind->DstAddr, 2);
-        frame += 2;
-    }
-    if (ieee802154_table_pan_id_comp[i].src_pan_id)
-        frame = write_le16(frame, ind->SrcPANId);
-    if (ind->SrcAddrMode == MAC_ADDR_MODE_64_BIT) {
-        memrcpy(frame, ind->SrcAddr, 8);
-        frame += 8;
-    } else if (ind->SrcAddrMode == MAC_ADDR_MODE_16_BIT) {
-        memrcpy(frame, ind->SrcAddr, 2);
-        frame += 2;
-    }
-
-    memcpy(frame, ie->headerIeList, ie->headerIeListLength);
-    frame += ie->headerIeListLength;
-    if (ie->payloadIeListLength)
-        frame = write_le16(frame, IEEE802154_IE_HT1);
-    memcpy(frame, ie->payloadIeList, ie->payloadIeListLength);
-    frame += ie->payloadIeListLength;
-
-    return frame - start;
-}
-
 static int wsbr_data_sec_parse(struct iobuf_read *iobuf, struct mlme_security *sec)
 {
     uint8_t scf;

diff --git a/6lbr/app/frame_helpers.h b/6lbr/app/frame_helpers.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -20,16 +21,10 @@ struct iobuf_write;
 struct rcp;
 struct arm_15_4_mac_parameters;
 struct mcps_data_cnf;
-struct mcps_data_ind;
 struct mcps_data_rx_ie_list;
 struct mcps_data_req;
 struct mcps_data_req_ie_list;
 
-// FIXME: Unify prototypes of wsbr_data_ind_rebuild() and wsbr_data_req_rebuild()
-int wsbr_data_ind_rebuild(uint8_t frame[],
-                          const struct mcps_data_ind *ind,
-                          const struct mcps_data_rx_ie_list *ie);
-
 void wsbr_data_req_rebuild(struct iobuf_write *frame,
                            const struct rcp *rcp,
                            const struct mcps_data_req *req,

diff --git a/6lbr/app/libwsbrd.h b/6lbr/app/libwsbrd.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2024 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/mbedtls_config_check.c b/6lbr/app/mbedtls_config_check.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/mbedtls_config_check.h b/6lbr/app/mbedtls_config_check.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/rail_config.c b/6lbr/app/rail_config.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2021-2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -83,15 +84,17 @@ static void rail_fill_pom_auto(struct wsbr_ctxt *ctxt)
         rail_fill_pom_disabled(ctxt);
         return;
     }
-    i = 1;
+    i = 0;
     phy_config->rcp_rail_config_index = base_rail_params->index;
-    phy_config->phy_op_modes[0] = ctxt->config.ws_phy_mode_id;
     for (rail_params = ctxt->rcp.rail_config_list; rail_params->chan0_freq; rail_params++) {
         for (chan_params = chan_params_table; chan_params->chan0_freq; chan_params++) {
             for (phy_mode = chan_params->valid_phy_modes; *phy_mode; phy_mode++) {
                 phy_params = ws_regdb_phy_params(*phy_mode, 0);
                 if (i >= ARRAY_SIZE(phy_config->phy_op_modes) - 1)
                     continue;
+                // Ignore base mode
+                if (phy_params->phy_mode_id == ctxt->config.ws_phy_mode_id)
+                    continue;
                 // Ignore FAN1.0
                 if (!chan_params->chan_plan_id)
                     continue;
@@ -132,11 +135,12 @@ static void rail_fill_pom_manual(struct wsbr_ctxt *ctxt)
         // any group
         if (!base_rail_params->phy_mode_group)
             continue;
-        i = 1;
+        i = 0;
         phy_config->rcp_rail_config_index = base_rail_params->index;
-        phy_config->phy_op_modes[0] = ctxt->config.ws_phy_mode_id;
         for (phy_mode = ctxt->config.ws_phy_op_modes; *phy_mode; phy_mode++) {
             phy_params = ws_regdb_phy_params(*phy_mode, 0);
+            if (phy_params->phy_mode_id == ctxt->config.ws_phy_mode_id)
+                WARN("base \"phy_mode_id\" should not be present in \"phy_operating_modes\"");
             found = 0;
             if (base_phy_params->modulation == MODULATION_OFDM &&
                 base_phy_params->rail_phy_mode_id != phy_params->rail_phy_mode_id)

diff --git a/6lbr/app/rail_config.h b/6lbr/app/rail_config.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/rcp_api.c b/6lbr/app/rcp_api.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -85,6 +86,11 @@ static void rcp_ind_fatal(struct rcp *rcp, struct iobuf_read *buf)
     msg = hif_pop_str(buf);
     BUG_ON(buf->err);
 
+    // CRC errors can happen during init if a previous frame transmission was
+    // interrupted.
+    if (err == HIF_ECRC && !rcp->has_reset)
+        return;
+
     if (msg)
         FATAL(3, "rcp error %s: %s", hif_fatal_str(err), msg);
     else
@@ -497,6 +503,18 @@ void rcp_set_filter_src64(struct rcp *rcp, const uint8_t eui64[][8], uint8_t cou
     iobuf_free(&buf);
 }
 
+void rcp_set_filter_dst64(struct rcp *rcp, const uint8_t eui64[8])
+{
+    struct iobuf_write buf = { };
+
+    memcpy(&rcp->eui64, eui64, 8);
+
+    hif_push_u8(&buf, HIF_CMD_SET_FILTER_DST64);
+    hif_push_fixed_u8_array(&buf, eui64, 8);
+    rcp_tx(rcp, &buf);
+    iobuf_free(&buf);
+}
+
 struct rcp_cmd rcp_cmd_table[] = {
     { HIF_CMD_IND_NOP,           rcp_ind_nop        },
     { HIF_CMD_IND_RESET,         rcp_ind_reset      },

diff --git a/6lbr/app/rcp_api.h b/6lbr/app/rcp_api.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this
@@ -90,6 +91,7 @@ void rcp_set_filter_src64(struct rcp *rcp,
                           const uint8_t eui64[][8],
                           uint8_t count,
                           bool allow);
+void rcp_set_filter_dst64(struct rcp *rcp, const uint8_t eui64[8]);
 
 // Exported for wsbrd-fuzz
 struct rcp_cmd {

diff --git a/6lbr/app/rcp_api_legacy.h b/6lbr/app/rcp_api_legacy.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2023 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/timers.c b/6lbr/app/timers.c
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2024 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this

diff --git a/6lbr/app/timers.h b/6lbr/app/timers.h
@@ -1,4 +1,5 @@
 /*
+ * SPDX-License-Identifier: LicenseRef-MSLA
  * Copyright (c) 2024 Silicon Laboratories Inc. (www.silabs.com)
  *
  * The licensor of this software is Silicon Laboratories Inc. Your use of this