From ef084ef53773556a687ef50469e5385250f45aae Mon Sep 17 00:00:00 2001 From: billz Date: Thu, 9 Nov 2023 18:32:34 +0000 Subject: [PATCH 1/3] Define/set default subnet for wlan1 --- config/defaults.json | 9 +++++++++ includes/hostapd.php | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config/defaults.json b/config/defaults.json index 81291989..a0e1b190 100644 --- a/config/defaults.json +++ b/config/defaults.json @@ -6,6 +6,12 @@ "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" ], @@ -30,6 +36,9 @@ "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" ] } diff --git a/includes/hostapd.php b/includes/hostapd.php index 36411f35..d6864dee 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -344,7 +344,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $reg_dom file_put_contents("/tmp/dnsmasqdata", $config); system('sudo cp /tmp/dnsmasqdata '.RASPI_DNSMASQ_PREFIX.$ap_iface.'.conf', $return); } elseif ($bridgedEnable !==1) { - $dhcp_range = ($syscfg['dhcp-range'] =='') ? getDefaultNetValue('dnsmasq','wlan0','dhcp-range') : $syscfg['dhcp-range']; + $dhcp_range = ($syscfg['dhcp-range'] =='') ? getDefaultNetValue('dnsmasq',$ap_iface,'dhcp-range') : $syscfg['dhcp-range']; $config = [ '# RaspAP '.$_POST['interface'].' configuration' ]; $config[] = 'interface='.$_POST['interface']; $config[] = 'domain-needed'; @@ -361,7 +361,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $reg_dom // Set dhcp values from system config, fallback to default if undefined $jsonData = json_decode(getNetConfig($ap_iface), true); $ip_address = ($jsonData['StaticIP'] == '') ? getDefaultNetValue('dhcp',$ap_iface,'static ip_address') : $jsonData['StaticIP']; - $domain_name_server = ($jsonData['StaticDNS'] =='') ? getDefaultNetValue('dhcp','wlan0','static domain_name_server') : $jsonData['StaticDNS']; + $domain_name_server = ($jsonData['StaticDNS'] =='') ? getDefaultNetValue('dhcp',$ap_iface,'static domain_name_server') : $jsonData['StaticDNS']; $routers = ($jsonData['StaticRouters'] == '') ? getDefaultNetValue('dhcp',$ap_iface,'static routers') : $jsonData['StaticRouters']; $netmask = ($jsonData['SubnetMask'] == '' || $jsonData['SubnetMask'] == '0.0.0.0') ? getDefaultNetValue('dhcp',$ap_iface,'subnetmask') : $jsonData['SubnetMask']; $ip_address.= (!preg_match('/.*\/\d+/', $ip_address)) ? '/'.mask2cidr($netmask) : null; From a95b43e23ee86c95eb9b1ef5b7a57f04886e1d62 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 10 Nov 2023 09:29:49 +0000 Subject: [PATCH 2/3] Handle interfaces with no default dhcp settings, update status messages --- includes/hostapd.php | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/includes/hostapd.php b/includes/hostapd.php index d6864dee..7fe54134 100755 --- a/includes/hostapd.php +++ b/includes/hostapd.php @@ -364,7 +364,9 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $reg_dom $domain_name_server = ($jsonData['StaticDNS'] =='') ? getDefaultNetValue('dhcp',$ap_iface,'static domain_name_server') : $jsonData['StaticDNS']; $routers = ($jsonData['StaticRouters'] == '') ? getDefaultNetValue('dhcp',$ap_iface,'static routers') : $jsonData['StaticRouters']; $netmask = ($jsonData['SubnetMask'] == '' || $jsonData['SubnetMask'] == '0.0.0.0') ? getDefaultNetValue('dhcp',$ap_iface,'subnetmask') : $jsonData['SubnetMask']; - $ip_address.= (!preg_match('/.*\/\d+/', $ip_address)) ? '/'.mask2cidr($netmask) : null; + if (isset($ip_address) && !preg_match('/.*\/\d+/', $ip_address)) { + $ip_address.='/'.mask2cidr($netmask); + } if ($bridgedEnable == 1) { $config = array_keys(getDefaultNetOpts('dhcp','options')); @@ -389,30 +391,38 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $reg_dom if (! is_null($jsonData['Metric'])) { $config[] = 'metric '.$jsonData['Metric']; } } $dhcp_cfg = file_get_contents(RASPI_DHCPCD_CONFIG); - if ($bridgedEnable == 1 || $wifiAPEnable == 1) { + + if (preg_match('/wlan[2-9]\d*|wlan[1-9]\d+/', $ap_iface)) { + $skip_dhcp = true;; + } elseif ($bridgedEnable == 1 || $wifiAPEnable == 1) { $dhcp_cfg = join(PHP_EOL, $config); - $status->addMessage('DHCP configuration for '.$ap_iface.' enabled.', 'success'); + $status->addMessage(sprintf(_('DHCP configuration for %s enabled.'), $ap_iface), 'success'); } elseif (!preg_match('/^interface\s'.$ap_iface.'$/m', $dhcp_cfg)) { $config[] = PHP_EOL; $config= join(PHP_EOL, $config); $dhcp_cfg = removeDHCPIface($dhcp_cfg,'br0'); $dhcp_cfg = removeDHCPIface($dhcp_cfg,'uap0'); $dhcp_cfg .= $config; - $status->addMessage('DHCP configuration for '.$ap_iface.' added.', 'success'); + $status->addMessage(sprintf(_('DHCP configuration for %s added.'), $ap_iface), 'success'); } else { $config = join(PHP_EOL, $config); $dhcp_cfg = removeDHCPIface($dhcp_cfg,'br0'); $dhcp_cfg = removeDHCPIface($dhcp_cfg,'uap0'); $dhcp_cfg = preg_replace('/^#\sRaspAP\s'.$ap_iface.'\s.*?(?=\s*^\s*$)/ms', $config, $dhcp_cfg, 1); - $status->addMessage('DHCP configuration for '.$ap_iface.' updated.', 'success'); + $status->addMessage(sprintf(_('DHCP configuration for %s updated.'), $ap_iface), 'success'); } - file_put_contents("/tmp/dhcpddata", $dhcp_cfg); - system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return); - - if ($return == 0) { - $status->addMessage('Wifi Hotspot settings saved', 'success'); + if (!$skip_dhcp) { + file_put_contents("/tmp/dhcpddata", $dhcp_cfg); + system('sudo cp /tmp/dhcpddata '.RASPI_DHCPCD_CONFIG, $return); + if ($return == 0) { + $status->addMessage('Wifi Hotspot settings saved', 'success'); + } else { + $status->addMessage('Unable to save wifi hotspot settings', 'danger'); + } } else { - $status->addMessage('Unable to save wifi hotspot settings', 'danger'); + $status->addMessage(sprintf(_('Interface %s has no default settings.'), $ap_iface), 'warning'); + $status->addMessage(('Configure settings in DHCP Server before starting AP.'), 'warning'); + $status->addMessage('Wifi Hotspot settings saved', 'success'); } } else { $status->addMessage('Unable to save wifi hotspot settings', 'danger'); From 7479bcba0eb366e1f93a9142af96027a3af162d1 Mon Sep 17 00:00:00 2001 From: billz Date: Fri, 10 Nov 2023 09:31:03 +0000 Subject: [PATCH 3/3] Add DHCP config add/update/enabled messages --- locale/en_US/LC_MESSAGES/messages.po | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/locale/en_US/LC_MESSAGES/messages.po b/locale/en_US/LC_MESSAGES/messages.po index 31337290..6a2fa643 100644 --- a/locale/en_US/LC_MESSAGES/messages.po +++ b/locale/en_US/LC_MESSAGES/messages.po @@ -531,6 +531,21 @@ msgstr "Unknown interface" msgid "Country code must be blank or two characters" msgstr "Country code must be blank or two characters" +msgid "DHCP configuration for %s enabled." +msgstr "DHCP configuration for %s enabled." + +msgid "DHCP configuration for %s added." +msgstr "DHCP configuration for %s added." + +msgid "DHCP configuration for %s updated." +msgstr "DHCP configuration for %s updated." + +msgid "Interface %s has no default settings." +msgstr "Interface %s has no default settings." + +msgid "Configure settings in DHCP Server before starting AP." +msgstr "Configure settings in DHCP Server before starting AP." + msgid "Wifi Hotspot settings saved" msgstr "Wifi Hotspot settings saved"