Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix changing DHCP range. (#1327) 

Just completely forgot to update all the values
This commit is contained in:
Tim Wilkinson 2024-08-19 21:04:28 -07:00 committed by GitHub
parent bb08c34948
commit 1889cdf34d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
files/app/main/status/e/network.ut
View File

@ -48,6 +48,21 @@ if (request.env.REQUEST_METHOD === "PUT") {
else if (mode >= 0 && mode <= 5) {
configuration.setSetting("lan_dhcp", 1);
configuration.setSetting("dmz_mode", mode);
if (mode >= 2) {
const wifi_ip = iptoarr(configuration.getSettingAsString("wifi_ip"));
let wifi_shift = (wifi_ip[0] << 24) + (wifi_ip[1] << 16) + (wifi_ip[2] << 8) + wifi_ip[3];
wifi_shift = (wifi_shift << mode) & 0x00ffffff;
let dmz_lan_ip = 0x0a000001 + wifi_shift;
dmz_lan_ip = arrtoip([ (dmz_lan_ip >> 24) & 0xff, (dmz_lan_ip >> 16) & 0xff, (dmz_lan_ip >> 8) & 0xff, dmz_lan_ip & 0xff ]);
let dmz_lan_mask = 0xffffffff << mode;
dmz_lan_mask = arrtoip([ (dmz_lan_mask >> 24) & 0xff, (dmz_lan_mask >> 16) & 0xff, (dmz_lan_mask >> 8) & 0xff, dmz_lan_mask & 0xff ]);
const dmz_dhcp_start = (wifi_shift + 2) & 0xff;
const dmz_dhcp_end = dmz_dhcp_start + (2 << (mode - 1)) - 4;
configuration.setSetting("dmz_lan_ip", dmz_lan_ip);
configuration.setSetting("dmz_lan_mask", dmz_lan_mask);
configuration.setSetting("dmz_dhcp_start", dmz_dhcp_start);
configuration.setSetting("dmz_dhcp_end", dmz_dhcp_end);
}
}
}
if ("lan_dhcp_ip" in request.args) {

2
files/usr/share/ucode/aredn/configuration.uc
View File

@ -144,7 +144,7 @@ export function setSetting(key, value, def)
{
initSetup();
const old = setup[key];
setup[key] = `${value || def || ""}`;
setup[key] = `${value ?? def ?? ""}`;
if (old !== setup[key]) {
setupChanged = true;
return true;