Compare commits

...
Sign in to create a new pull request.

8 commits

Author SHA1 Message Date
sinavir
420b1764c5
usteer: Use our patched version 2025-02-10 09:31:05 +01:00
sinavir
279f678b0c
usteer: Extra logs 2025-02-06 16:56:14 +01:00
sinavir
36499bdb06
pkgs/hostapd: Add 80211v support 2025-02-06 16:30:14 +01:00
Raito Bezarius
5f3c299228
examples/nwa50ax-ap: add usteer to the example
So that this can be tested as well.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2025-02-06 10:29:37 +01:00
Raito Bezarius
27635fbe92
modules/usteer: init
This adds the usteer daemon service for Liminix.

Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2025-02-06 10:29:37 +01:00
Raito Bezarius
be143d1a13
usteer: init at unstable-04-09-2024
Signed-off-by: Raito Bezarius <masterancpp@gmail.com>
2025-02-06 10:29:36 +01:00
sinavir
31d31260b8
feat(system-config): Readable name for the system closure
All checks were successful
build liminix / build_zyxel-nwa50ax_mips (pull_request) Successful in 19s
build liminix / build_vm_qemu_mips (pull_request) Successful in 21s
build liminix / test_shell_customization (pull_request) Successful in 21s
build liminix / test_hostapd (pull_request) Successful in 1m12s
2025-02-04 23:33:38 +01:00
sinavir
b129f775b2
feat(networking): Add wlan mac personalisation
All checks were successful
build liminix / build_vm_qemu_mips (pull_request) Successful in 35s
build liminix / build_zyxel-nwa50ax_mips (pull_request) Successful in 38s
build liminix / test_shell_customization (pull_request) Successful in 42s
build liminix / test_hostapd (pull_request) Successful in 45s
2025-02-04 22:00:13 +01:00
14 changed files with 320 additions and 201 deletions

View file

@ -135,232 +135,250 @@ rec {
../../modules/zyxel-dual-image
];
nixpkgs.hostPlatform = system.crossSystem;
filesystem = dir {
lib = dir {
firmware = dir {
mediatek = dir {
"mt7915_wa.bin" = symlink wlan_firmware;
"mt7915_wm.bin" = symlink wlan_firmware';
"mt7915_rom_patch.bin" = symlink wlan_firmware'';
};
options = {
hardware.wlanMacAddresses = {
wlan0 = lib.mkOption {
type = lib.types.str;
description = "Mac address of wlan0 device";
};
wlan1 = lib.mkOption {
type = lib.types.str;
description = "Mac address of wlan1 device";
};
};
};
rootfsType = "ubifs";
hardware = {
# Taken from OpenWRT
# root@OpenWrt:/# ubinfo /dev/ubi0
# ubi0
# Volumes count: 2
# Logical eraseblock size: 126976 bytes, 124.0 KiB
# Total amount of logical eraseblocks: 256 (32505856 bytes, 31.0 MiB)
# Amount of available logical eraseblocks: 0 (0 bytes)
# Maximum count of volumes 128
# Count of bad physical eraseblocks: 0
# Count of reserved physical eraseblocks: 19
# Current maximum erase counter value: 2
# Minimum input/output unit size: 2048 bytes
# Character device major/minor: 250:0
# Present volumes: 0, 1
ubi = {
minIOSize = "2048";
logicalEraseBlockSize = "126976";
physicalEraseBlockSize = "128KiB";
maxLEBcount = "256";
};
config = {
flash.eraseBlockSize = 64 * 1024;
nixpkgs.hostPlatform = system.crossSystem;
# This is a FIT containing a kernel padded and
# a UBI volume rootfs.
defaultOutput = "zyxel-nwa-fit";
loadAddress = lim.parseInt "0x80001000";
entryPoint = lim.parseInt "0x80001000";
# Aligned on 2kb.
alignment = 2048;
rootDevice = "ubi0:rootfs";
alternativeRootDevice = "ubi1:rootfs";
# Auto-attach MTD devices: ubi_a then ubi_b.
ubi.mtds = [ "ubi_a" "ubi_b" ];
dts = {
# Strong DTB assumptions:
# ubi_a and ubi_b are two MTD devices.
# If those changes, disaster will occur.
src = ./dtb/mt7621_zyxel_nwa50ax.dtsi;
includes = [
"${./dtb}"
"${openwrt.src}/target/linux/ramips/dts"
];
};
networkInterfaces =
let
inherit (config.system.service.network) link;
in {
eth = link.build { ifname = "eth0"; };
lan = link.build { ifname = "lan"; };
wlan0 = link.build {
ifname = "wlan0";
dependencies = [ mac80211 ];
};
wlan1 = link.build {
ifname = "wlan1";
dependencies = [ mac80211 ];
filesystem = dir {
lib = dir {
firmware = dir {
mediatek = dir {
"mt7915_wa.bin" = symlink wlan_firmware;
"mt7915_wm.bin" = symlink wlan_firmware';
"mt7915_rom_patch.bin" = symlink wlan_firmware'';
};
};
};
};
boot = {
# Critical because NWA50AX will extend your cmdline with the image number booted.
# and some bootloader version.
# You don't want to find yourself being overridden.
commandLineDtbNode = "bootargs-override";
imageFormat = "fit";
tftp = {
# 20MB is pretty good on this device as we have plenty of RAM.
freeSpaceBytes = 20 * 1024 * 1024;
appendDTB = true;
loadAddress = lim.parseInt "0x2000000";
};
};
# Dual image management service in userspace.
services.zyxel-dual-image = config.boot.zyxel-dual-image.build {
ensureActiveImage = "primary";
# TODO: use mtd names rather…
# primary and secondary are always /dev/mtd3 by virtue of the
# dtb being not too wrong…
# TODO: remove this hack.
primaryMtdPartition = "/dev/mtd3";
secondaryMtdPartition = "/dev/mtd3";
bootConfigurationMtdPartition = "/dev/mtd12";
};
rootfsType = "ubifs";
hardware = {
# Taken from OpenWRT
# root@OpenWrt:/# ubinfo /dev/ubi0
# ubi0
# Volumes count: 2
# Logical eraseblock size: 126976 bytes, 124.0 KiB
# Total amount of logical eraseblocks: 256 (32505856 bytes, 31.0 MiB)
# Amount of available logical eraseblocks: 0 (0 bytes)
# Maximum count of volumes 128
# Count of bad physical eraseblocks: 0
# Count of reserved physical eraseblocks: 19
# Current maximum erase counter value: 2
# Minimum input/output unit size: 2048 bytes
# Character device major/minor: 250:0
# Present volumes: 0, 1
ubi = {
minIOSize = "2048";
logicalEraseBlockSize = "126976";
physicalEraseBlockSize = "128KiB";
maxLEBcount = "256";
};
# DEVICE_VENDOR := ZyXEL
# KERNEL_SIZE := 8192k
# DEVICE_PACKAGES := kmod-mt7915-firmware zyxel-bootconfig
# KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
# IMAGES += factory.bin ramboot-factory.bin
# IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | zyxel-nwa-fit
# IMAGE/ramboot-factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi
flash.eraseBlockSize = 64 * 1024;
kernel = {
src = pkgs.fetchurl {
name = "linux.tar.gz";
url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
# This is a FIT containing a kernel padded and
# a UBI volume rootfs.
defaultOutput = "zyxel-nwa-fit";
loadAddress = lim.parseInt "0x80001000";
entryPoint = lim.parseInt "0x80001000";
# Aligned on 2kb.
alignment = 2048;
rootDevice = "ubi0:rootfs";
alternativeRootDevice = "ubi1:rootfs";
# Auto-attach MTD devices: ubi_a then ubi_b.
ubi.mtds = [ "ubi_a" "ubi_b" ];
dts = {
# Strong DTB assumptions:
# ubi_a and ubi_b are two MTD devices.
# If those changes, disaster will occur.
src = ./dtb/mt7621_zyxel_nwa50ax.dtsi;
includes = [
"${./dtb}"
"${openwrt.src}/target/linux/ramips/dts"
];
};
networkInterfaces =
let
inherit (config.system.service.network) link;
in {
eth = link.build { ifname = "eth0"; };
lan = link.build { ifname = "lan"; };
wlan0 = link.build {
ifname = "wlan0";
dependencies = [ mac80211 ];
mac = config.hardware.wlanMacAddresses.wlan0;
};
wlan1 = link.build {
ifname = "wlan1";
dependencies = [ mac80211 ];
mac = config.hardware.wlanMacAddresses.wlan1;
};
};
};
extraPatchPhase = ''
${openwrt.applyPatches.ramips}
'';
config = {
boot = {
# Critical because NWA50AX will extend your cmdline with the image number booted.
# and some bootloader version.
# You don't want to find yourself being overridden.
commandLineDtbNode = "bootargs-override";
RALINK = "y";
PCI = "y";
PHY_MT7621_PCI = "y";
PCIE_MT7621 = "y";
SOC_MT7621 = "y";
CLK_MT7621 = "y";
CLOCKSOURCE_WATCHDOG = "y";
imageFormat = "fit";
tftp = {
# 20MB is pretty good on this device as we have plenty of RAM.
freeSpaceBytes = 20 * 1024 * 1024;
appendDTB = true;
loadAddress = lim.parseInt "0x2000000";
};
};
SERIAL_8250_CONSOLE = "y";
SERIAL_8250 = "y";
SERIAL_CORE_CONSOLE = "y";
SERIAL_OF_PLATFORM = "y";
SERIAL_8250_NR_UARTS = "3";
SERIAL_8250_RUNTIME_UARTS = "3";
SERIAL_MCTRL_GPIO = "y";
# Dual image management service in userspace.
services.zyxel-dual-image = config.boot.zyxel-dual-image.build {
ensureActiveImage = "primary";
# TODO: use mtd names rather…
# primary and secondary are always /dev/mtd3 by virtue of the
# dtb being not too wrong…
# TODO: remove this hack.
primaryMtdPartition = "/dev/mtd3";
secondaryMtdPartition = "/dev/mtd3";
bootConfigurationMtdPartition = "/dev/mtd12";
};
CONSOLE_LOGLEVEL_DEFAULT = "8";
CONSOLE_LOGLEVEL_QUIET = "4";
# DEVICE_VENDOR := ZyXEL
# KERNEL_SIZE := 8192k
# DEVICE_PACKAGES := kmod-mt7915-firmware zyxel-bootconfig
# KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb
# IMAGES += factory.bin ramboot-factory.bin
# IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | zyxel-nwa-fit
# IMAGE/ramboot-factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi
# MTD_UBI_BEB_LIMIT = "20";
# MTD_UBI_WL_THRESHOLD = "4096";
kernel = {
src = pkgs.fetchurl {
name = "linux.tar.gz";
url = "https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.137.tar.gz";
hash = "sha256-PkdzUKZ0IpBiWe/RS70J76JKnBFzRblWcKlaIFNxnHQ=";
};
extraPatchPhase = ''
${openwrt.applyPatches.ramips}
MTD = "y";
MTD_BLOCK = "y"; # fix undefined ref to register_mtd_blktrans_dev
MTD_RAW_NAND = "y";
MTD_NAND_MT7621 = "y";
MTD_NAND_MTK_BMT = "y"; # Bad-block Management Table
MTD_NAND_ECC_SW_HAMMING= "y";
MTD_SPI_NAND= "y";
MTD_OF_PARTS = "y";
MTD_NAND_CORE= "y";
MTD_SPLIT_FIRMWARE= "y";
MTD_SPLIT_FIT_FW= "y";
'';
config = {
PINCTRL = "y";
PINCTRL_MT7621 = "y";
RALINK = "y";
PCI = "y";
PHY_MT7621_PCI = "y";
PCIE_MT7621 = "y";
SOC_MT7621 = "y";
CLK_MT7621 = "y";
CLOCKSOURCE_WATCHDOG = "y";
I2C = "y";
I2C_MT7621 = "y";
SERIAL_8250_CONSOLE = "y";
SERIAL_8250 = "y";
SERIAL_CORE_CONSOLE = "y";
SERIAL_OF_PLATFORM = "y";
SERIAL_8250_NR_UARTS = "3";
SERIAL_8250_RUNTIME_UARTS = "3";
SERIAL_MCTRL_GPIO = "y";
SPI = "y";
MTD_SPI_NOR = "y";
SPI_MT7621 = "y";
SPI_MASTER = "y";
SPI_MEM = "y";
CONSOLE_LOGLEVEL_DEFAULT = "8";
CONSOLE_LOGLEVEL_QUIET = "4";
REGULATOR = "y";
REGULATOR_FIXED_VOLTAGE = "y";
RESET_CONTROLLER = "y";
POWER_RESET = "y";
POWER_RESET_GPIO = "y";
POWER_SUPPLY = "y";
LED_TRIGGER_PHY = "y";
# MTD_UBI_BEB_LIMIT = "20";
# MTD_UBI_WL_THRESHOLD = "4096";
PCI_DISABLE_COMMON_QUIRKS = "y";
PCI_DOMAINS = "y";
PCI_DOMAINS_GENERIC = "y";
PCI_DRIVERS_GENERIC = "y";
PCS_MTK_LYNXI = "y";
MTD = "y";
MTD_BLOCK = "y"; # fix undefined ref to register_mtd_blktrans_dev
MTD_RAW_NAND = "y";
MTD_NAND_MT7621 = "y";
MTD_NAND_MTK_BMT = "y"; # Bad-block Management Table
MTD_NAND_ECC_SW_HAMMING= "y";
MTD_SPI_NAND= "y";
MTD_OF_PARTS = "y";
MTD_NAND_CORE= "y";
MTD_SPLIT_FIRMWARE= "y";
MTD_SPLIT_FIT_FW= "y";
SOC_BUS = "y";
PINCTRL = "y";
PINCTRL_MT7621 = "y";
NET = "y";
ETHERNET = "y";
WLAN = "y";
I2C = "y";
I2C_MT7621 = "y";
PHYLIB = "y";
AT803X_PHY = "y";
FIXED_PHY = "y";
GENERIC_PHY = "y";
NET_DSA = "y";
NET_DSA_MT7530 = "y";
NET_DSA_MT7530_MDIO = "y";
NET_DSA_TAG_MTK = "y";
NET_MEDIATEK_SOC = "y";
NET_SWITCHDEV = "y";
NET_VENDOR_MEDIATEK = "y";
SPI = "y";
MTD_SPI_NOR = "y";
SPI_MT7621 = "y";
SPI_MASTER = "y";
SPI_MEM = "y";
SWPHY = "y";
REGULATOR = "y";
REGULATOR_FIXED_VOLTAGE = "y";
RESET_CONTROLLER = "y";
POWER_RESET = "y";
POWER_RESET_GPIO = "y";
POWER_SUPPLY = "y";
LED_TRIGGER_PHY = "y";
GPIOLIB = "y";
GPIO_MT7621 = "y";
OF_GPIO = "y";
PCI_DISABLE_COMMON_QUIRKS = "y";
PCI_DOMAINS = "y";
PCI_DOMAINS_GENERIC = "y";
PCI_DRIVERS_GENERIC = "y";
PCS_MTK_LYNXI = "y";
EARLY_PRINTK = "y";
SOC_BUS = "y";
NEW_LEDS = "y";
LEDS_TRIGGERS = "y";
LEDS_CLASS = "y"; # required by rt2x00lib
LEDS_CLASS_MULTICOLOR = "y";
LEDS_BRIGHTNESS_HW_CHANGED = "y";
NET = "y";
ETHERNET = "y";
WLAN = "y";
PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y";
} // lib.optionalAttrs (config.system.service ? watchdog) {
RALINK_WDT = "y"; # watchdog
MT7621_WDT = "y"; # or it might be this one
PHYLIB = "y";
AT803X_PHY = "y";
FIXED_PHY = "y";
GENERIC_PHY = "y";
NET_DSA = "y";
NET_DSA_MT7530 = "y";
NET_DSA_MT7530_MDIO = "y";
NET_DSA_TAG_MTK = "y";
NET_MEDIATEK_SOC = "y";
NET_SWITCHDEV = "y";
NET_VENDOR_MEDIATEK = "y";
SWPHY = "y";
GPIOLIB = "y";
GPIO_MT7621 = "y";
OF_GPIO = "y";
EARLY_PRINTK = "y";
NEW_LEDS = "y";
LEDS_TRIGGERS = "y";
LEDS_CLASS = "y"; # required by rt2x00lib
LEDS_CLASS_MULTICOLOR = "y";
LEDS_BRIGHTNESS_HW_CHANGED = "y";
PRINTK_TIME = "y";
} // lib.optionalAttrs (config.system.service ? vlan) {
SWCONFIG = "y";
} // lib.optionalAttrs (config.system.service ? watchdog) {
RALINK_WDT = "y"; # watchdog
MT7621_WDT = "y"; # or it might be this one
};
};
};
};

View file

@ -87,6 +87,8 @@ in rec {
];
};
services.usteer = svc.usteer.build { interface = services.int; };
services.dhcpv4 =
let iface = services.int;
in svc.network.dhcp.client.build { interface = iface; };

View file

@ -74,6 +74,13 @@ in {
device will be renamed to the name provided.
'';
};
mac = mkOption {
type = types.nullOr types.str;
default = null;
description = ''
MAC address of the interface.
'';
};
devpath = mkOption {
type = types.nullOr types.str;
default = null;

View file

@ -7,6 +7,7 @@
{
ifname
, devpath ? null
, mac ? null
, mtu} :
# if devpath is supplied, we rename the interface at that
# path to have the specified name.
@ -24,7 +25,7 @@ in oneshot {
inherit name;
up = ''
${rename}
${liminix.networking.ifup name ifname}
${liminix.networking.ifup name ifname mac}
'';
down = "ip link set down dev ${ifname}";
}

View file

@ -75,7 +75,7 @@ in
mv out $out
'';
systemConfiguration =
pkgs.systemconfig config.filesystem.contents;
pkgs.systemconfig config.filesystem.contents config.hostname;
};
};
}

View file

@ -0,0 +1,26 @@
## usteer
## ==============
##
## usteer is a band-steering daemon for hostapd.
## this helps you optimize the roaming behavior of wireless clients (STAs) in an ESS
## consisting of multiple BSS / APs.
## you want this as soon as you are deploying Liminix on >1 APs that are close to each other.
{ lib, pkgs, ... }:
let
inherit (lib) mkOption types;
inherit (pkgs) liminix;
in {
options.system.service.usteer = mkOption {
type = liminix.lib.types.serviceDefn;
};
config = {
system.service.usteer = pkgs.liminix.callService ./usteer.nix {
ifname = mkOption {
type = types.str;
description = "interface name on which to connect to other usteer instances";
};
};
};
}

18
modules/usteer/usteer.nix Normal file
View file

@ -0,0 +1,18 @@
{
liminix
, lib
, usteer
}:
{ ifname }:
let
inherit (liminix.services) longrun;
name = "usteerd";
in
longrun {
# Does it need to be unique?
inherit name;
run = ''
mkdir -p /run/usteerd
${usteer}/bin/usteerd -s -vvvv -i ${ifname}
'';
}

View file

@ -11,7 +11,7 @@ in oneshot rec {
up = ''
ip link add link $(output ${primary} ifname) name ${ifname} type vlan id ${vid}
${optionalString untagged.egress "bridge vlan add dev ${ifname} vid ${toString untagged.vid} pvid untagged master"}
${liminix.networking.ifup name ifname}
${liminix.networking.ifup name ifname null}
(in_outputs ${name}
echo ${ifname} > ifname
)

View file

@ -118,6 +118,7 @@ extraPkgs // {
hostapd =
let
config = [
"CONFIG_WNM=y"
"CONFIG_DRIVER_NL80211=y"
"CONFIG_IAPP=y"
"CONFIG_IEEE80211AC=y"
@ -157,6 +158,7 @@ extraPkgs // {
hostapd-radius =
let
config = [
"CONFIG_WNM=y"
"CONFIG_DRIVER_NL80211=y"
"CONFIG_DRIVER_WIRED=y"
"CONFIG_EAP=y"

View file

@ -113,6 +113,7 @@ in {
libubox = callPackage ./libubox {};
ubus = callPackage ./ubus {};
iwinfo = callPackage ./iwinfo {};
usteer = callPackage ./usteer {};
uevent-watch = callPackage ./uevent-watch {};
usb-modeswitch = callPackage ./usb-modeswitch {};
writeAshScript = callPackage ./write-ash-script {};

View file

@ -74,7 +74,7 @@ let
../../modules/s6
];
};
in systemconfig eval.config.filesystem.contents;
in systemconfig eval.config.filesystem.contents eval.config.hostname;
in writeScriptBin "levitate" ''
#!/bin/sh
destdir=${newRoot}

View file

@ -3,9 +3,13 @@
, serviceFns
}:
{
ifup = name : ifname : ''
ifup = name : ifname : mac: ''
. ${serviceFns}
${ifwait}/bin/ifwait -v ${ifname} present
${if (mac == null) then "" else ''
ip link set down dev ${ifname}
ip link set dev ${ifname} address ${mac}
''}
ip link set up dev ${ifname}
(in_outputs ${name}
echo ${ifname} > ifname

View file

@ -62,10 +62,10 @@ let
${(builtins.concatStringsSep "\n" (visit "." attrset))}
}
'';
in attrset:
in attrset: hostname:
let makedevs = activateScript attrset;
in stdenv.mkDerivation {
name="make-stuff";
name="${hostname}-system-configuration";
src = ./.;
CFLAGS = "-Os";

40
pkgs/usteer/default.nix Normal file
View file

@ -0,0 +1,40 @@
{
lib,
stdenv,
fetchgit,
cmake,
json_c,
libpcap,
libubox,
ubus,
}:
stdenv.mkDerivation {
pname = "usteer";
version = "unstable-04-09-2024";
src = fetchgit {
url = "https://git.dgnum.eu/DGNum/usteer.git";
rev = "50a6d2dd35f379d2555a3110ba72b4134c1a6a40";
hash = "sha256-fKVAockgLjUs0H91tX1bG02DmVff5EglOlXOmjJPwM8=";
};
postPatch = ''
substituteInPlace CMakeLists.txt \
--replace-fail "/usr" "${placeholder "out"}"
'';
nativeBuildInputs = [
cmake
];
buildInputs = [ ubus libpcap libubox json_c ];
meta = {
description = "";
homepage = "https://github.com/openwrt/usteer";
maintainers = with lib.maintainers; [ raitobezarius ];
mainProgram = "usteer";
platforms = lib.platforms.all;
};
}