]> git.ipfire.org Git - thirdparty/openwrt.git/commitdiff
wifi-scripts: add new package, move wifi scripts to a single place
authorFelix Fietkau <nbd@nbd.name>
Fri, 26 Jan 2024 10:03:39 +0000 (11:03 +0100)
committerFelix Fietkau <nbd@nbd.name>
Sat, 3 Feb 2024 15:16:36 +0000 (16:16 +0100)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
13 files changed:
package/kernel/broadcom-wl/Makefile
package/kernel/mac80211/Makefile
package/network/config/netifd/Makefile
package/network/config/wifi-scripts/Makefile [new file with mode: 0644]
package/network/config/wifi-scripts/files/etc/hotplug.d/ieee80211/10-wifi-detect [moved from package/kernel/mac80211/files/mac80211.hotplug with 100% similarity]
package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh [moved from package/network/services/hostapd/files/hostapd.sh with 100% similarity]
package/network/config/wifi-scripts/files/lib/netifd/netifd-wireless.sh [new file with mode: 0644]
package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh [moved from package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh with 100% similarity, mode: 0755]
package/network/config/wifi-scripts/files/lib/wifi/mac80211.sh [moved from package/kernel/mac80211/files/lib/wifi/mac80211.sh with 100% similarity]
package/network/config/wifi-scripts/files/sbin/wifi [moved from package/base-files/files/sbin/wifi with 100% similarity]
package/network/config/wifi-scripts/files/usr/share/hostap/common.uc [moved from package/network/services/hostapd/files/common.uc with 100% similarity]
package/network/config/wifi-scripts/files/usr/share/hostap/wdev.uc [moved from package/network/services/hostapd/files/wdev.uc with 100% similarity]
package/network/services/hostapd/Makefile

index a1feacbe2901a4e3efffe729f6dd23c22f53c505..101dbccbb546feeaa2b0e020a9dcdef7ce6e27e6 100644 (file)
@@ -40,7 +40,7 @@ endef
 define KernelPackage/brcm-wl/Default
   $(call Package/broadcom-wl/Default)
   SECTION:=kernel
-  DEPENDS:=@(TARGET_bcm47xx||TARGET_bcm63xx) +wireless-tools +@KERNEL_WIRELESS_EXT
+  DEPENDS:=@(TARGET_bcm47xx||TARGET_bcm63xx) +wireless-tools +wifi-scripts +@KERNEL_WIRELESS_EXT
   TITLE:=Kernel driver for BCM43xx chipsets
   FILES:=$(PKG_BUILD_DIR)/driver$(1)/wl.ko $(PKG_BUILD_DIR)/glue/wl_glue.ko
   AUTOLOAD:=$(call AutoProbe,wl)
index 17e0d9451e1c4bf7f0f2bbb0515e5056a4d6c0f7..6ca5c89cfaeb80ecbab2963ce7de5453c15cafe3 100644 (file)
@@ -92,7 +92,7 @@ PKG_CONFIG_DEPENDS += \
 define KernelPackage/cfg80211
   $(call KernelPackage/mac80211/Default)
   TITLE:=cfg80211 - wireless configuration API
-  DEPENDS+= +iw +iwinfo +wireless-regdb +USE_RFKILL:kmod-rfkill
+  DEPENDS+= +iw +iwinfo +wifi-scripts +wireless-regdb +USE_RFKILL:kmod-rfkill
   ABI_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
   FILES:= \
        $(PKG_BUILD_DIR)/compat/compat.ko \
@@ -384,14 +384,6 @@ define Build/InstallDev
 endef
 
 
-define KernelPackage/cfg80211/install
-       $(INSTALL_DIR) $(1)/lib/wifi $(1)/lib/netifd/wireless
-       $(INSTALL_DATA) ./files/lib/wifi/mac80211.sh $(1)/lib/wifi
-       $(INSTALL_BIN) ./files/lib/netifd/wireless/mac80211.sh $(1)/lib/netifd/wireless
-       $(INSTALL_DIR) $(1)/etc/hotplug.d/ieee80211
-       $(INSTALL_DATA) ./files/mac80211.hotplug $(1)/etc/hotplug.d/ieee80211/10-wifi-detect
-endef
-
 $(eval $(foreach drv,$(PKG_DRIVERS),$(call KernelPackage,$(drv))))
 $(eval $(call KernelPackage,cfg80211))
 $(eval $(call KernelPackage,mac80211))
index 558463e8ea5bc9e4944577a826f25973d07ed28c..ba4516c1dc6cc7db1830e8e61e271791cf513bc2 100644 (file)
@@ -43,7 +43,10 @@ define Package/netifd/install
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/netifd $(1)/sbin/
        $(CP) ./files/* $(1)/
        $(INSTALL_DIR) $(1)/etc/udhcpc.user.d/
-       $(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/lib/netifd/
+       $(CP) \
+               $(PKG_BUILD_DIR)/scripts/utils.sh \
+               $(PKG_BUILD_DIR)/scripts/netifd-proto.sh \
+               $(1)/lib/netifd/
 endef
 
 $(eval $(call BuildPackage,netifd))
diff --git a/package/network/config/wifi-scripts/Makefile b/package/network/config/wifi-scripts/Makefile
new file mode 100644 (file)
index 0000000..e57f97f
--- /dev/null
@@ -0,0 +1,45 @@
+#
+# Copyright (C) 2024 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=wifi-scripts
+PKG_VERSION:=1.0
+PKG_RELEASE:=1
+PKG_LICENSE:=GPL-2.0
+
+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/wifi-scripts
+  SECTION:=utils
+  CATEGORY:=Base system
+  DEPENDS:=+netifd +ucode +ucode-mod-nl80211 +ucode-mod-ubus
+  TITLE:=Wi-Fi configuration scripts
+  PKGARCH:=all
+endef
+
+define Package/qos-scripts/description
+ A set of scripts that handle setup and configuration of Wi-Fi devices.
+endef
+
+define Build/Prepare
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/wifi-scripts/install
+       $(INSTALL_DIR) $(1)
+       $(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,wifi-scripts))
diff --git a/package/network/config/wifi-scripts/files/lib/netifd/netifd-wireless.sh b/package/network/config/wifi-scripts/files/lib/netifd/netifd-wireless.sh
new file mode 100644 (file)
index 0000000..5b852e0
--- /dev/null
@@ -0,0 +1,439 @@
+NETIFD_MAIN_DIR="${NETIFD_MAIN_DIR:-/lib/netifd}"
+
+. /usr/share/libubox/jshn.sh
+. $NETIFD_MAIN_DIR/utils.sh
+
+CMD_UP=0
+CMD_SET_DATA=1
+CMD_PROCESS_ADD=2
+CMD_PROCESS_KILL_ALL=3
+CMD_SET_RETRY=4
+
+add_driver() {
+       return
+}
+
+wireless_setup_vif_failed() {
+       local error="$1"
+       echo "Interface $_w_iface setup failed: $error"
+}
+
+wireless_setup_failed() {
+       local error="$1"
+
+       echo "Device setup failed: $error"
+       wireless_set_retry 0
+}
+
+prepare_key_wep() {
+       local key="$1"
+       local hex=1
+
+       echo -n "$key" | grep -qE "[^a-fA-F0-9]" && hex=0
+       [ "${#key}" -eq 10 -a $hex -eq 1 ] || \
+       [ "${#key}" -eq 26 -a $hex -eq 1 ] || {
+               [ "${key:0:2}" = "s:" ] && key="${key#s:}"
+               key="$(echo -n "$key" | hexdump -ve '1/1 "%02x" ""')"
+       }
+       echo "$key"
+}
+
+_wdev_prepare_channel() {
+       json_get_vars channel band hwmode
+
+       auto_channel=0
+       enable_ht=0
+       htmode=
+       hwmode="${hwmode##11}"
+
+       case "$channel" in
+               ""|0|auto)
+                       channel=0
+                       auto_channel=1
+               ;;
+               [0-9]*) ;;
+               *)
+                       wireless_setup_failed "INVALID_CHANNEL"
+               ;;
+       esac
+
+       case "$hwmode" in
+               a|b|g|ad) ;;
+               *)
+                       if [ "$channel" -gt 14 ]; then
+                               hwmode=a
+                       else
+                               hwmode=g
+                       fi
+               ;;
+       esac
+
+       case "$band" in
+               2g) hwmode=g;;
+               5g|6g) hwmode=a;;
+               60g) hwmode=ad;;
+               *)
+                       case "$hwmode" in
+                               *a) band=5g;;
+                               *ad) band=60g;;
+                               *b|*g) band=2g;;
+                       esac
+               ;;
+       esac
+}
+
+_wdev_handler() {
+       json_load "$data"
+
+       json_select config
+       _wdev_prepare_channel
+       json_select ..
+
+       eval "drv_$1_$2 \"$interface\""
+}
+
+_wdev_msg_call() {
+       local old_cb
+
+       json_set_namespace wdev old_cb
+       "$@"
+       json_set_namespace $old_cb
+}
+
+_wdev_wrapper() {
+       while [ -n "$1" ]; do
+               eval "$1() { _wdev_msg_call _$1 \"\$@\"; }"
+               shift
+       done
+}
+
+_wdev_notify_init() {
+       local command="$1"; shift;
+
+       json_init
+       json_add_int "command" "$command"
+       json_add_string "device" "$__netifd_device"
+       while [ -n "$1" ]; do
+               local name="$1"; shift
+               local value="$1"; shift
+               json_add_string "$name" "$value"
+       done
+       json_add_object "data"
+}
+
+_wdev_notify() {
+       local options="$1"
+
+       json_close_object
+       ubus $options call network.wireless notify "$(json_dump)"
+}
+
+_wdev_add_variables() {
+       while [ -n "$1" ]; do
+               local var="${1%%=*}"
+               local val="$1"
+               shift
+               [[ "$var" = "$val" ]] && continue
+               val="${val#*=}"
+               json_add_string "$var" "$val"
+       done
+}
+
+_wireless_add_vif() {
+       local name="$1"; shift
+       local ifname="$1"; shift
+
+       _wdev_notify_init $CMD_SET_DATA "interface" "$name"
+       json_add_string "ifname" "$ifname"
+       _wdev_add_variables "$@"
+       _wdev_notify
+}
+
+_wireless_add_vlan() {
+       local name="$1"; shift
+       local ifname="$1"; shift
+
+       _wdev_notify_init $CMD_SET_DATA interface "$__cur_interface" "vlan" "$name"
+       json_add_string "ifname" "$ifname"
+       _wdev_add_variables "$@"
+       _wdev_notify
+}
+
+_wireless_set_up() {
+       _wdev_notify_init $CMD_UP
+       _wdev_notify
+}
+
+_wireless_set_data() {
+       _wdev_notify_init $CMD_SET_DATA
+       _wdev_add_variables "$@"
+       _wdev_notify
+}
+
+_wireless_add_process() {
+       _wdev_notify_init $CMD_PROCESS_ADD
+       local exe="$2"
+       [ -L "$exe" ] && exe="$(readlink -f "$exe")"
+       json_add_int pid "$1"
+       json_add_string exe "$exe"
+       [ -n "$3" ] && json_add_boolean required 1
+       [ -n "$4" ] && json_add_boolean keep 1
+       exe2="$(readlink -f /proc/$1/exe)"
+       [ "$exe" != "$exe2" ] && echo "WARNING (wireless_add_process): executable path $exe does not match process $1 path ($exe2)"
+       _wdev_notify
+}
+
+_wireless_process_kill_all() {
+       _wdev_notify_init $CMD_PROCESS_KILL_ALL
+       [ -n "$1" ] && json_add_int signal "$1"
+       _wdev_notify
+}
+
+_wireless_set_retry() {
+       _wdev_notify_init $CMD_SET_RETRY
+       json_add_int retry "$1"
+       _wdev_notify
+}
+
+_wdev_wrapper \
+       wireless_add_vif \
+       wireless_add_vlan \
+       wireless_set_up \
+       wireless_set_data \
+       wireless_add_process \
+       wireless_process_kill_all \
+       wireless_set_retry \
+
+wireless_vif_parse_encryption() {
+       json_get_vars encryption
+       set_default encryption none
+
+       auth_mode_open=1
+       auth_mode_shared=0
+       auth_type=none
+
+       if [ "$hwmode" = "ad" ]; then
+               wpa_cipher="GCMP"
+       else
+               wpa_cipher="CCMP"
+       fi
+
+       case "$encryption" in
+               *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) wpa_cipher="CCMP TKIP";;
+               *ccmp256) wpa_cipher="CCMP-256";;
+               *aes|*ccmp) wpa_cipher="CCMP";;
+               *tkip) wpa_cipher="TKIP";;
+               *gcmp256) wpa_cipher="GCMP-256";;
+               *gcmp) wpa_cipher="GCMP";;
+               wpa3-192*) wpa_cipher="GCMP-256";;
+       esac
+
+       # 802.11n requires CCMP for WPA
+       [ "$enable_ht:$wpa_cipher" = "1:TKIP" ] && wpa_cipher="CCMP TKIP"
+
+       # Examples:
+       # psk-mixed/tkip    => WPA1+2 PSK, TKIP
+       # wpa-psk2/tkip+aes => WPA2 PSK, CCMP+TKIP
+       # wpa2/tkip+aes     => WPA2 RADIUS, CCMP+TKIP
+
+       case "$encryption" in
+               wpa2*|wpa3*|*psk2*|psk3*|sae*|owe*)
+                       wpa=2
+               ;;
+               wpa*mixed*|*psk*mixed*)
+                       wpa=3
+               ;;
+               wpa*|*psk*)
+                       wpa=1
+               ;;
+               *)
+                       wpa=0
+                       wpa_cipher=
+               ;;
+       esac
+       wpa_pairwise="$wpa_cipher"
+
+       case "$encryption" in
+               owe*)
+                       auth_type=owe
+               ;;
+               wpa3-192*)
+                       auth_type=eap192
+               ;;
+               wpa3-mixed*)
+                       auth_type=eap-eap2
+               ;;
+               wpa3*)
+                       auth_type=eap2
+               ;;
+               psk3-mixed*|sae-mixed*)
+                       auth_type=psk-sae
+               ;;
+               psk3*|sae*)
+                       auth_type=sae
+               ;;
+               *psk*)
+                       auth_type=psk
+               ;;
+               *wpa*|*8021x*)
+                       auth_type=eap
+               ;;
+               *wep*)
+                       auth_type=wep
+                       case "$encryption" in
+                               *shared*)
+                                       auth_mode_open=0
+                                       auth_mode_shared=1
+                               ;;
+                               *mixed*)
+                                       auth_mode_shared=1
+                               ;;
+                       esac
+               ;;
+       esac
+
+       case "$encryption" in
+               *osen*)
+                       auth_osen=1
+               ;;
+       esac
+}
+
+_wireless_set_brsnoop_isolation() {
+       local multicast_to_unicast="$1"
+       local isolate
+
+       json_get_vars isolate proxy_arp
+
+       [ ${isolate:-0} -gt 0 -o -z "$network_bridge" ] && return
+       [ ${multicast_to_unicast:-1} -gt 0 -o ${proxy_arp:-0} -gt 0 ] && json_add_boolean isolate 1
+}
+
+for_each_interface() {
+       local _w_types="$1"; shift
+       local _w_ifaces _w_iface
+       local _w_type
+       local _w_found
+
+       local multicast_to_unicast
+
+       json_get_keys _w_ifaces interfaces
+       json_select interfaces
+       for _w_iface in $_w_ifaces; do
+               json_select "$_w_iface"
+               if [ -n "$_w_types" ]; then
+                       json_get_var network_bridge bridge
+                       json_get_var network_ifname bridge-ifname
+                       json_get_var multicast_to_unicast multicast_to_unicast
+                       json_select config
+                       _wireless_set_brsnoop_isolation "$multicast_to_unicast"
+                       json_get_var _w_type mode
+                       json_select ..
+                       _w_types=" $_w_types "
+                       [[ "${_w_types%$_w_type*}" = "$_w_types" ]] && {
+                               json_select ..
+                               continue
+                       }
+               fi
+               __cur_interface="$_w_iface"
+               "$@" "$_w_iface"
+               json_select ..
+       done
+       json_select ..
+}
+
+for_each_vlan() {
+       local _w_vlans _w_vlan
+
+       json_get_keys _w_vlans vlans
+       json_select vlans
+       for _w_vlan in $_w_vlans; do
+               json_select "$_w_vlan"
+               json_select config
+               "$@" "$_w_vlan"
+               json_select ..
+               json_select ..
+       done
+       json_select ..
+}
+
+for_each_station() {
+       local _w_stas _w_sta
+
+       json_get_keys _w_stas stas
+       json_select stas
+       for _w_sta in $_w_stas; do
+               json_select "$_w_sta"
+               json_select config
+               "$@" "$_w_sta"
+               json_select ..
+               json_select ..
+       done
+       json_select ..
+}
+
+_wdev_common_device_config() {
+       config_add_string channel hwmode band htmode noscan
+}
+
+_wdev_common_iface_config() {
+       config_add_string mode ssid encryption 'key:wpakey'
+       config_add_boolean bridge_isolate
+}
+
+_wdev_common_vlan_config() {
+       config_add_string name vid iface
+       config_add_boolean bridge_isolate
+}
+
+_wdev_common_station_config() {
+       config_add_string mac key vid iface
+}
+
+init_wireless_driver() {
+       name="$1"; shift
+       cmd="$1"; shift
+
+       case "$cmd" in
+               dump)
+                       add_driver() {
+                               eval "drv_$1_cleanup"
+
+                               json_init
+                               json_add_string name "$1"
+
+                               json_add_array device
+                               _wdev_common_device_config
+                               eval "drv_$1_init_device_config"
+                               json_close_array
+
+                               json_add_array iface
+                               _wdev_common_iface_config
+                               eval "drv_$1_init_iface_config"
+                               json_close_array
+
+                               json_add_array vlan
+                               _wdev_common_vlan_config
+                               eval "drv_$1_init_vlan_config"
+                               json_close_array
+
+                               json_add_array station
+                               _wdev_common_station_config
+                               eval "drv_$1_init_station_config"
+                               json_close_array
+
+                               json_dump
+                       }
+               ;;
+               setup|teardown)
+                       interface="$1"; shift
+                       data="$1"; shift
+                       export __netifd_device="$interface"
+
+                       add_driver() {
+                               [[ "$name" == "$1" ]] || return 0
+                               _wdev_handler "$1" "$cmd"
+                       }
+               ;;
+       esac
+}
index 17f9dcb581dbea4d045910329ebe7ce5bc8cc6ce..c8f476f7b8c88e5c97ce9697d55613ea5920ca82 100644 (file)
@@ -712,13 +712,10 @@ endef
 define Package/hostapd-common/install
        $(INSTALL_DIR) $(1)/etc/capabilities $(1)/etc/rc.button $(1)/etc/hotplug.d/ieee80211 $(1)/etc/init.d $(1)/lib/netifd  $(1)/usr/share/acl.d $(1)/usr/share/hostap
        $(INSTALL_BIN) ./files/dhcp-get-server.sh $(1)/lib/netifd/dhcp-get-server.sh
-       $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/netifd/hostapd.sh
        $(INSTALL_BIN) ./files/wpad.init $(1)/etc/init.d/wpad
        $(INSTALL_BIN) ./files/wps-hotplug.sh $(1)/etc/rc.button/wps
        $(INSTALL_DATA) ./files/wpad_acl.json $(1)/usr/share/acl.d
        $(INSTALL_DATA) ./files/wpad.json $(1)/etc/capabilities
-       $(INSTALL_DATA) ./files/common.uc $(1)/usr/share/hostap/
-       $(INSTALL_DATA) ./files/wdev.uc $(1)/usr/share/hostap/
 endef
 
 define Package/hostapd/install