frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2025-12-26 23:26:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1932 from RaspAP/maint/hostapd-json-cfg

Browse Source 
Maintenance: Retrieve hostapd mode settings from defaults.json
This commit is contained in:
Bill Zimmerman
2025-08-17 17:40:04 -07:00
committed by GitHub
parent c3cc4ff9db 75577ecd1d
commit d9e00171b2
2 changed files with 133 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
config/defaults.json
View File

@@ -1,68 +1,114 @@
{
"dhcp": {
"wlan0": {
"static ip_address": [ "10.3.141.1/24" ],
"static routers": [ "10.3.141.1" ],
"static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
"subnetmask": [ "255.255.255.0" ]
"hostapd":{
"modes":{
"n":{
"settings":[
"hw_mode=g",
"ieee80211n=1",
"wmm_enabled=1"
]
},
"ac":{
"settings":[
"hw_mode=a",
"# N",
"ieee80211n=1",
"require_ht=1",
"ht_capab=[MAX-AMSDU-3839][HT40+][SHORT-GI-20][SHORT-GI-40][DSSS_CCK-40]",
"# AC",
"ieee80211ac=1",
"require_vht=1",
"ieee80211d=0",
"ieee80211h=0",
"vht_capab=[MAX-AMSDU-3839][SHORT-GI-80]",
"vht_oper_chwidth=1",
"vht_oper_centr_freq_seg0_idx={VHT_FREQ_IDX}"
]
},
"g":{
"settings":[
"hw_mode=g",
"ieee80211n=0"
]
},
"a":{
"settings":[
"hw_mode=a",
"ieee80211n=0"
]
},
"b":{
"settings":[
"hw_mode=b",
"ieee80211n=0"
]
}
},
"wlan1": {
"static ip_address": [ "10.9.141.1/24" ],
"static routers": [ "10.9.141.1" ],
"static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
"subnetmask": [ "255.255.255.0" ]
"dhcp":{
"wlan0":{
"static ip_address":[ "10.3.141.1/24" ],
"static routers":[ "10.3.141.1" ],
"static domain_name_server":[ "1.1.1.1 8.8.8.8" ],
"subnetmask":[ "255.255.255.0" ]
},
"wlan1":{
"static ip_address":[ "10.9.141.1/24" ],
"static routers":[ "10.9.141.1" ],
"static domain_name_server":[ "1.1.1.1 8.8.8.8" ],
"subnetmask":[ "255.255.255.0" ]
},
"uap0":{
"static ip_address":[ "192.168.50.1/24" ],
"static routers":[ "192.168.50.1" ],
"static domain_name_server":[ "1.1.1.1 8.8.8.8" ],
"subnetmask":[ "255.255.255.0" ]
},
"options":{
"# RaspAP default configuration":null,
"hostname":null,
"clientid":null,
"persistent":null,
"option rapid_commit":null,
"option domain_name_servers, domain_name, domain_search, host_name":null,
"option classless_static_routes":null,
"option ntp_servers":null,
"require dhcp_server_identifier":null,
"slaac private":null,
"nohook lookup-hostname":null
}
},
"uap0": {
"static ip_address": [ "192.168.50.1/24" ],
"static routers": [ "192.168.50.1" ],
"static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
"subnetmask": [ "255.255.255.0" ]
"dnsmasq":{
"wlan0":{
"dhcp-range":[ "10.3.141.50,10.3.141.254,255.255.255.0,12h" ]
},
"wlan1":{
"dhcp-range":[ "10.9.141.50,10.9.141.254,255.255.255.0,12h" ]
},
"uap0":{
"dhcp-range":[ "192.168.50.50,192.168.50.150,12h" ]
}
},
"options": {
"# RaspAP default configuration": null,
"hostname": null,
"clientid": null,
"persistent": null,
"option rapid_commit": null,
"option domain_name_servers, domain_name, domain_search, host_name": null,
"option classless_static_routes": null,
"option ntp_servers": null,
"require dhcp_server_identifier": null,
"slaac private": null,
"nohook lookup-hostname": null
}
},
"dnsmasq": {
"wlan0": {
"dhcp-range": [ "10.3.141.50,10.3.141.254,255.255.255.0,12h" ]
},
"wlan1": {
"dhcp-range": [ "10.9.141.50,10.9.141.254,255.255.255.0,12h" ]
},
"uap0": {
"dhcp-range": [ "192.168.50.50,192.168.50.150,12h" ]
}
},
"wireguard": {
"server": {
"Address": [ "10.8.2.1/24" ],
"ListenPort": [ "51820" ],
"DNS": [ "9.9.9.9" ],
"PostUp": [ "iptables -A FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -A FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -A POSTROUTING -o wg0 -j MASQUERADE" ],
"PostDown": [ "iptables -D FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -D FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -D POSTROUTING -o wg0 -j MASQUERADE" ],
"PostUpEx": [ "iptables -I OUTPUT ! -o %i -m mark ! --mark $(wg show %i fwmark) -m addrtype ! --dst-type LOCAL ! -d %s -j REJECT" ],
"PreDown": [ "iptables -D OUTPUT ! -o %i -m mark ! --mark $(wg show %i fwmark) -m addrtype ! --dst-type LOCAL ! -d %s -j REJECT" ]
},
"peer": {
"Address": [ "10.8.1.2/24" ],
"Endpoint": [ "10.8.2.1:51820" ],
"ListenPort": [ "21841" ],
"AllowedIPs": ["10.8.2.0/24"],
"PersistentKeepalive": [ "15" ]
}
},
"txpower": {
"dbm": [ "auto", "30", "20", "17", "10", "6", "3", "1", "0" ]
"wireguard":{
"server":{
"Address":[ "10.8.2.1/24" ],
"ListenPort":[ "51820" ],
"DNS":[ "9.9.9.9" ],
"PostUp":[ "iptables -A FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -A FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -A POSTROUTING -o wg0 -j MASQUERADE" ],
"PostDown":[ "iptables -D FORWARD -i wlan0 -o wg0 -j ACCEPT; iptables -D FORWARD -i wg0 -o wlan0 -m state --state RELATED,ESTABLISHED -j ACCEPT; iptables -t nat -D POSTROUTING -o wg0 -j MASQUERADE" ],
"PostUpEx":[ "iptables -I OUTPUT ! -o %i -m mark ! --mark $(wg show %i fwmark) -m addrtype ! --dst-type LOCAL ! -d %s -j REJECT" ],
"PreDown":[ "iptables -D OUTPUT ! -o %i -m mark ! --mark $(wg show %i fwmark) -m addrtype ! --dst-type LOCAL ! -d %s -j REJECT" ]
},
"peer":{
"Address":[ "10.8.1.2/24" ],
"Endpoint":[ "10.8.2.1:51820" ],
"ListenPort":[ "21841" ],
"AllowedIPs":[ "10.8.2.0/24" ],
"PersistentKeepalive":[ "15" ]
}
},
"txpower": {
"dbm": [ "auto", "30", "20", "17", "10", "6", "3", "1", "0" ]
}
}
}

57
src/RaspAP/Networking/Hotspot/HostapdManager.php
View File

@@ -143,6 +143,8 @@ class HostapdManager
public function buildConfig(array $params, StatusMessage $status): string
{
$config = [];
// core static values
$config[] = 'driver=nl80211';
$config[] = 'ctrl_interface=' . RASPI_HOSTAPD_CTRL_INTERFACE;
$config[] = 'ctrl_interface_group=0';
@@ -172,49 +174,41 @@ class HostapdManager
$config[] = 'wpa_key_mgmt=' . $wpa_key_mgmt;
if (!empty($params['beacon_interval'])) {
$config[] = 'beacon_int=' . $params['beacon_interval'];
$config[] = 'beacon_int=' . intval($params['beacon_interval']);
}
if (!empty($params['disassoc_low_ack'])) {
$config[] = 'disassoc_low_ack=0';
}
// SSID and channel (required)
$config[] = 'ssid=' . $params['ssid'];
$config[] = 'channel=' . $params['channel'];
// Choose VHT segment index (fallback only if required)
// choose VHT segment index (fallback only if required)
$vht_freq_idx = ($params['channel'] < RASPI_5GHZ_CHANNEL_MIN) ? 42 : 155;
$hwMode = isset($params['hw_mode']) ? $params['hw_mode'] : '';
switch ($params['hw_mode']) {
case 'n':
$config[] = 'hw_mode=g';
$config[] = 'ieee80211n=1';
$config[] = 'wmm_enabled=1';
break;
case 'ac':
$config[] = 'hw_mode=a';
$config[] = '# N';
$config[] = 'ieee80211n=1';
$config[] = 'require_ht=1';
$config[] = 'ht_capab=[MAX-AMSDU-3839][HT40+][SHORT-GI-20][SHORT-GI-40][DSSS_CCK-40]';
$config[] = '# AC';
$config[] = 'ieee80211ac=1';
$config[] = 'require_vht=1';
$config[] = 'ieee80211d=0';
$config[] = 'ieee80211h=0';
$config[] = 'vht_capab=[MAX-AMSDU-3839][SHORT-GI-80]';
$config[] = 'vht_oper_chwidth=1';
$config[] = 'vht_oper_centr_freq_seg0_idx=' . $vht_freq_idx;
break;
default:
$config[] = 'hw_mode=' . $params['hw_mode'];
$config[] = 'ieee80211n=0';
// fetch settings for selected mode
$modeSettings = getDefaultNetOpts('hostapd', 'modes', $hwMode);
$settings = $modeSettings[$hwMode]['settings'] ?? [];
if (!empty($settings)) {
foreach ($settings as $line) {
if (!is_string($line)) {
continue;
}
$replaced = str_replace('{VHT_FREQ_IDX}', (string) $vht_freq_idx ?? '',$line);
$config[] = $replaced;
}
}
if ($params['wpa'] !== 'none') {
// WPA passphrase
if ($wpa_numeric !== 'none' && !empty($params['wpa_passphrase'])) {
$config[] = 'wpa_passphrase=' . $params['wpa_passphrase'];
}
// bridge handling
if (!empty($params['bridge'])) {
$config[] = 'interface=' . $params['interface'];
$config[] = 'bridge=' . $params['bridge'];
@@ -223,9 +217,10 @@ class HostapdManager
}
$config[] = 'wpa=' . $wpa;
$config[] = 'wpa_pairwise=' . $params['wpa_pairwise'];
$config[] = 'country_code=' . $params['country_code'];
$config[] = 'ignore_broadcast_ssid=' . $params['hiddenSSID'];
$config[] = 'wpa_pairwise=' . ($params['wpa_pairwise'] ?? '');
$config[] = 'country_code=' . ($params['country_code'] ?? '');
$config[] = 'ignore_broadcast_ssid=' . ($params['hiddenSSID'] ?? 0);
if (!empty($params['max_num_sta'])) {
$config[] = 'max_num_sta=' . (int)$params['max_num_sta'];
}
@@ -233,7 +228,7 @@ class HostapdManager
// optional additional user config
$config[] = $this->parseUserHostapdCfg();
return implode(PHP_EOL, $config) . PHP_EOL;
return implode(PHP_EOL, array_filter($config, function ($v) { return $v !== null && $v !== ''; })) . PHP_EOL;
}
/**