wifi-scripts: add na_mcast_to_ucast option

As this is generally only useful with "proxy_arp" enabled,
we default na_mcast_to_ucast to true if "proxy_arp" is already
enabled.

Signed-off-by: Rany Hany <rany_hany@riseup.net>
Link: https://github.com/openwrt/openwrt/pull/20596
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
index 6cfc515460172c3754f8fd09199a1129b9afc7d9..ef44baa4189139e338b6cf931780176c29a1086f 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/schema/wireless.wifi-iface.json
@@ -727,6 +727,10 @@
                        "type": "alias",
                        "default": "multicast_to_unicast"
                },
+               "na_mcast_to_ucast": {
+                       "description": "IPv6 Neighbor Advertisement multicast-to-unicast conversion",
+                       "type": "boolean"
+               },
                "nas_identifier": {
                        "description": "NAS-Identifier string for RADIUS messages",
                        "type": "string"

diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
index f35761c6169d8111f52a817022bc168cb63584de..1c9d7ede423ef776864faa833168d651d73e8036 100644 (file)
--- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
+++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
@@ -43,6 +43,9 @@ function iface_setup(config) {
        if (config.multicast_to_unicast || config.proxy_arp)
                config.ap_isolate = 1;
 
+       if (config.proxy_arp)
+               set_default(config, 'na_mcast_to_ucast', true);
+
        append('bssid', config.macaddr);
        config.ssid2 = config.ssid;
        config.wmm_enabled = 1;
@@ -56,7 +59,7 @@ function iface_setup(config) {
                'wds_sta', 'wds_bridge', 'snoop_iface', 'vendor_elements', 'nas_identifier', 'radius_acct_interim_interval',
                'ocv', 'multicast_to_unicast', 'preamble', 'proxy_arp', 'per_sta_vif', 'mbo',
                'bss_transition', 'wnm_sleep_mode', 'wnm_sleep_mode_no_keys', 'qos_map_set', 'max_listen_int',
-               'dtim_period', 'wmm_enabled', 'start_disabled',
+               'dtim_period', 'wmm_enabled', 'start_disabled', 'na_mcast_to_ucast',
        ]);
 }
 

diff --git a/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh b/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
index c41efd4f609260f890b41b9bfb0c076f0acfa34c..622f8d5bcab6f569697f21bc51385a77774523cd 100644 (file)
--- a/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
+++ b/package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
@@ -383,7 +383,7 @@ hostapd_common_add_bss_config() {
        config_add_array airtime_sta_weight
        config_add_int airtime_bss_weight airtime_bss_limit
 
-       config_add_boolean multicast_to_unicast multicast_to_unicast_all proxy_arp per_sta_vif
+       config_add_boolean multicast_to_unicast multicast_to_unicast_all proxy_arp per_sta_vif na_mcast_to_ucast
 
        config_add_array hostapd_bss_options
        config_add_boolean default_disabled
@@ -552,7 +552,7 @@ hostapd_set_bss_options() {
                bss_load_update_period chan_util_avg_period sae_require_mfp sae_pwe \
                multi_ap multi_ap_backhaul_ssid multi_ap_backhaul_key skip_inactivity_poll \
                ppsk airtime_bss_weight airtime_bss_limit airtime_sta_weight \
-               multicast_to_unicast_all proxy_arp per_sta_vif \
+               multicast_to_unicast_all proxy_arp per_sta_vif na_mcast_to_ucast \
                eap_server eap_user_file ca_cert server_cert private_key private_key_passwd server_id radius_server_clients radius_server_auth_port \
                vendor_elements fils ocv apup rsn_override
 
@@ -1159,6 +1159,10 @@ hostapd_set_bss_options() {
        set_default proxy_arp 0
        if [ "$proxy_arp" -gt 0 ]; then
                append bss_conf "proxy_arp=$proxy_arp" "$N"
+               set_default na_mcast_to_ucast 1
+       fi
+       if [ "$na_mcast_to_ucast" -gt 0 ]; then
+               append bss_conf "na_mcast_to_ucast=$na_mcast_to_ucast" "$N"
        fi
 
        set_default per_sta_vif 0