frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

Merge branch 'feature/dhcp-eth0' of https://github.com/billz/raspap-webgui into feature/dhcp-eth0

Browse Source
This commit is contained in:
Bill Zimmerman 2020-12-08 09:44:31 +01:00
commit b5e49a9477
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/defaults.json
View File

@ -3,12 +3,14 @@
"wlan0": { "wlan0": {
"static ip_address": [ "10.3.141.1/24" ], "static ip_address": [ "10.3.141.1/24" ],
"static routers": [ "10.3.141.1" ], "static routers": [ "10.3.141.1" ],
"static domain_name_server": [ "1.1.1.1 8.8.8.8" ] "static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
"subnetmask": [ "255.255.255.0" ]
}, },
"uap0": { "uap0": {
"static ip_address": [ "192.168.50.1/24" ], "static ip_address": [ "192.168.50.1/24" ],
"static routers": [ "192.168.50.1" ], "static routers": [ "192.168.50.1" ],
"static domain_name_server": [ "1.1.1.1 8.8.8.8" ] "static domain_name_server": [ "1.1.1.1 8.8.8.8" ],
"subnetmask": [ "255.255.255.0" ]
} }
}, },
"dnsmasq": { "dnsmasq": {

1
config/dhcpcd.conf
View File

@ -13,6 +13,5 @@ nohook lookup-hostname
# RaspAP wlan0 configuration # RaspAP wlan0 configuration
interface wlan0 interface wlan0
static ip_address=10.3.141.1/24 static ip_address=10.3.141.1/24
static routers=10.3.141.1
static domain_name_server=9.9.9.9 1.1.1.1 static domain_name_server=9.9.9.9 1.1.1.1

13
includes/hostapd.php
View File

@ -287,8 +287,12 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
// Set dhcp values from system config, fallback to default if undefined // Set dhcp values from system config, fallback to default if undefined
$jsonData = json_decode(getNetConfig($ap_iface), true); $jsonData = json_decode(getNetConfig($ap_iface), true);
$domain_name_server = ($jsonData['StaticDNS'] =='') ? getDefaultNetValue('dhcp','wlan0','static domain_name_server') : $jsonData['StaticDNS']; $ip_address = ($jsonData['StaticIP'] == '') ? getDefaultNetValue('dhcp',$ap_iface,'static ip_address') : $jsonData['StaticIP'];
$routers = ($jsonData['StaticRouters'] == '') ? getDefaultNetValue('dhcp','wlan0','static routers') : $jsonData['StaticRouters']; $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 ($bridgedEnable == 1) { if ($bridgedEnable == 1) {
$config = defaultHeader(); $config = defaultHeader();
$config[] = PHP_EOL.'# RaspAP br0 configuration'; $config[] = PHP_EOL.'# RaspAP br0 configuration';
@ -297,7 +301,6 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
$config[] = PHP_EOL; $config[] = PHP_EOL;
} elseif ($wifiAPEnable == 1) { } elseif ($wifiAPEnable == 1) {
// Enable uap0 configuration for ap-sta // Enable uap0 configuration for ap-sta
$ip_address = ($jsonData['StaticIP'] == '') ? getDefaultNetValue('dhcp','uap0','static ip_address') : $jsonData['StaticIP'];
$config = defaultHeader(); $config = defaultHeader();
$config[] = PHP_EOL.'# RaspAP uap0 configuration'; $config[] = PHP_EOL.'# RaspAP uap0 configuration';
$config[] = 'interface uap0'; $config[] = 'interface uap0';
@ -306,11 +309,7 @@ function SaveHostAPDConfig($wpa_array, $enc_types, $modes, $interfaces, $status)
$config[] = PHP_EOL; $config[] = PHP_EOL;
} else { } else {
// Default wlan0 config // Default wlan0 config
$ip_address = ($jsonData['StaticIP'] == '') ? getDefaultNetValue('dhcp','wlan0','static ip_address') : $jsonData['StaticIP'];
$def_ip = array(); $def_ip = array();
if (preg_match("/^([0-9]{1,3}\.){3}/",$dhcp_range,$def_ip) ) $ip_address = $def_ip[0]."1/24";
// use static IP assigned to interface only, if consistent with the selected dhcp range
if (preg_match("/^([0-9]{1,3}\.){3}/",$jsonData['StaticIP'],$int_ip) && $def_ip[0] === $int_ip[0]) $ip_address = $jsonData['StaticIP'];
$config = [ '# RaspAP wlan0 configuration' ]; $config = [ '# RaspAP wlan0 configuration' ];
$config[] = 'interface wlan0'; $config[] = 'interface wlan0';
$config[] = 'static ip_address='.$ip_address; $config[] = 'static ip_address='.$ip_address;