Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,557 Commits 6 Branches 22 Tags
e7f6a7923356db09c29b052d0f5cb85e4ff8ef21
Commit Graph

23 Commits

Author SHA1 Message Date
Tianling Shen
9c9fb94772 Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-07-04 14:10:18 +08:00
Stijn Tintel
6b16eaf840 wifi-scripts: add missing dependency on ucode-mod-uci 
Fixes the following error:

Syntax error: Unable to resolve path for module 'uci'
In line 3, byte 27:

 `import * as uci from 'uci';`
  Near here ----------------^

Fixes: 4a3ed518b2 ("wifi-scripts: rewrite wifi detect code in ucode")
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
 2024-07-03 01:40:15 +03:00
Tianling Shen
0f3f11ab79 Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-06-24 15:47:07 +08:00
Sean Khan
d648ee4c58 wifi-scripts: ensure get_freq returns int (iw-6.9) 
With `iw` version 6.9 frequencies are now being reported as float,
which is incompatible with wpa_supplicant's config option 'frequency'
which expects an integer.

iwinfo phy0 info output:

Version: 5.19
```
Frequencies:
  * 5180 MHz [36] (30.0 dBm)
  * 5200 MHz [40] (30.0 dBm)
  * 5220 MHz [44] (30.0 dBm)
  * 5240 MHz [48] (30.0 dBm)
  * 5260 MHz [52] (24.0 dBm)
  * 5280 MHz [56] (24.0 dBm)
  * 5300 MHz [60] (24.0 dBm)
  * 5320 MHz [64] (24.0 dBm)
  * 5500 MHz [100] (24.0 dBm)
  * 5520 MHz [104] (24.0 dBm)
  * 5540 MHz [108] (24.0 dBm)
  * 5560 MHz [112] (24.0 dBm)
  * 5580 MHz [116] (24.0 dBm)
  * 5600 MHz [120] (24.0 dBm)
  * 5620 MHz [124] (24.0 dBm)
  * 5640 MHz [128] (24.0 dBm)
  * 5660 MHz [132] (24.0 dBm)
  * 5680 MHz [136] (24.0 dBm)
  * 5700 MHz [140] (24.0 dBm)
  * 5720 MHz [144] (24.0 dBm)
  * 5745 MHz [149] (30.0 dBm)
  * 5765 MHz [153] (30.0 dBm)
  * 5785 MHz [157] (30.0 dBm)
  * 5805 MHz [161] (30.0 dBm)
  * 5825 MHz [165] (30.0 dBm)
  * 5845 MHz [169] (disabled)
  * 5865 MHz [173] (disabled)
  * 5885 MHz [177] (disabled)
```

Version: 6.9
```
Frequencies:
  * 5180.0 MHz [36] (30.0 dBm)
  * 5200.0 MHz [40] (30.0 dBm)
  * 5220.0 MHz [44] (30.0 dBm)
  * 5240.0 MHz [48] (30.0 dBm)
  * 5260.0 MHz [52] (24.0 dBm)
  * 5280.0 MHz [56] (24.0 dBm)
  * 5300.0 MHz [60] (24.0 dBm)
  * 5320.0 MHz [64] (24.0 dBm)
  * 5500.0 MHz [100] (24.0 dBm)
  * 5520.0 MHz [104] (24.0 dBm)
  * 5540.0 MHz [108] (24.0 dBm)
  * 5560.0 MHz [112] (24.0 dBm)
  * 5580.0 MHz [116] (24.0 dBm)
  * 5600.0 MHz [120] (24.0 dBm)
  * 5620.0 MHz [124] (24.0 dBm)
  * 5640.0 MHz [128] (24.0 dBm)
  * 5660.0 MHz [132] (24.0 dBm)
  * 5680.0 MHz [136] (24.0 dBm)
  * 5700.0 MHz [140] (24.0 dBm)
  * 5720.0 MHz [144] (24.0 dBm)
  * 5745.0 MHz [149] (30.0 dBm)
  * 5765.0 MHz [153] (30.0 dBm)
  * 5785.0 MHz [157] (30.0 dBm)
  * 5805.0 MHz [161] (30.0 dBm)
  * 5825.0 MHz [165] (30.0 dBm)
  * 5845.0 MHz [169] (disabled)
  * 5865.0 MHz [173] (disabled)
  * 5885.0 MHz [177] (disabled)
```

Error reported from wpa_supplicant
```console
Fri Jun 21 14:07:22 2024 daemon.err wpa_supplicant[2866]: Line 10: invalid number "5320.0"
Fri Jun 21 14:07:22 2024 daemon.err wpa_supplicant[2866]: Line 10: failed to parse frequency '5320.0'.
Fri Jun 21 14:07:22 2024 daemon.err wpa_supplicant[2866]: Line 16: failed to parse network block.
Fri Jun 21 14:07:22 2024 daemon.err wpa_supplicant[2866]: Failed to read or parse configuration '/var/run/wpa_supplicant-phy1-mesh0.conf'.
```

This affects mesh, adhoc, and client-mode WDS.

Until hostapd/wpa_supplicant is updated (or patched) to support float
frequencies, ensure `get_freq` prints out an integer.

Signed-off-by: Sean Khan <datapronix@protonmail.com>
Link: https://github.com/openwrt/openwrt/pull/15770
Signed-off-by: Robert Marko <robimarko@gmail.com>
 2024-06-22 11:34:46 +02:00
Felix Fietkau
4a3ed518b2 wifi-scripts: rewrite wifi detect code in ucode 
Rely entirely on /etc/board.json instead of screen scraping iw cli output

Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-06-21 11:52:26 +02:00
Felix Fietkau
31aa61503e wifi-scripts: add default channel to board.json in wifi-detect.uc 
Preparation for avoiding iw calls in /lib/wifi/mac80211.sh

Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-06-21 11:52:26 +02:00
Tianling Shen
458bdf28b5 Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-04-07 17:45:08 +08:00
Alexandru Gagniuc
cee9fcdb73 wifi-scripts: fix creation of IBSS in legacy (non-HT) mode 
When an IBBS interface is configured for IBSS legacy mode, wdev.htmode
is empty. This is empty string results in an empty positional argument
to the "ibbs join" command, for example:

    iw dev phy0-ibss0 ibss join crymesh 2412 '' fixed-freq beacon-interval 100

This empty argument is interpreted as an invalid HT mode by 'iw',
causing the entire command to fail and print a "usage" message:

    daemon.notice netifd: radio0 (4527): Usage:    iw [options] \
        dev <devname> ibss join <SSID> <freq in MHz> ...

Although nobody will ever need more than 640K of IBSS, explicitly use
"NOHT" if an HT mode is not given. This fixes the problem.

Fixes: e56c5f7b27 ("hostapd: add ucode support, use ucode for the main ubus object")
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [extend to cover more cases]
 2024-04-07 11:12:43 +02:00
Tianling Shen
4d22a8a2c4 Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-03-24 21:24:08 +08:00
Paweł Owoc
a91b79fd04 mac80211: add missing config for third 160MHz width for 5GHz radio 
Without this configuration it is not possible to run the radio using HE160 on channels 149-177.

Fixes: #14906
Signed-off-by: Paweł Owoc <frut3k7@gmail.com>
 2024-03-23 16:57:24 +01:00
Tianling Shen
acb88c40ea Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-02-23 23:28:51 +08:00
Hauke Mehrtens
5df7a78e82 wifi-scripts: Support HE Iftypes with multiple entries 
With mac80211_hwsim I have seen such entries in OpenWrt 22.03:
    HE Iftypes: managed, AP
The mac80211.sh script did not detect the entry and failed. Allow
arbitrary other entries before to fix this problem.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
 2024-02-22 21:45:44 +01:00
Tianling Shen
d2439a54dc Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-02-19 12:08:24 +08:00
Eneas U de Queiroz
472312f83f wifi-scripts: fix FILS AKM selection with EAP-192 
Fix netifd hostapd.sh selection of FILS-SHA384 algorithm with eap-192.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
 2024-02-17 08:36:48 -03:00
Tianling Shen
251169853d Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-02-14 12:49:57 +08:00
Felix Fietkau
2a2abed0be wifi-scripts: create the wlan object in board_data if not present 
Fixes an error in wifi detection

Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-02-13 19:26:58 +01:00
Tianling Shen
3f5b3d9492 Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-02-12 12:54:22 +08:00
Felix Fietkau
2b4941a6f1 wifi-scripts: fix fullmac phy detection 
Checking for AP_VLAN misdetects ath10k-ath12k as fullmac, because of software
crypto limitations. Check for monitor mode support instead, which is more
reliable.

Fixes: https://github.com/openwrt/openwrt/issues/14575
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-02-09 12:18:59 +01:00
Tianling Shen
585fdb1c4b Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-02-08 13:21:54 +08:00
Felix Fietkau
4cd8ae67c5 wifi-scripts: fix copy&paste issue in metadata 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-02-06 10:47:22 +01:00
Tianling Shen
c5048f245b Merge Official Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
 2024-02-04 15:56:19 +08:00
Felix Fietkau
0e3f147574 wifi-scripts: add script to add phy capabilities to board.json 
Useful for UI and config generators. Will be used as intermediate
step for generating the default wifi configuration

Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-02-03 16:16:36 +01:00
Felix Fietkau
2716853132 wifi-scripts: add new package, move wifi scripts to a single place 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
 2024-02-03 16:16:36 +01:00