Skip to content

Commit

Permalink
dhcp: on the GUI pages avoid the use of dhcpd_dhcp_configure()
Browse files Browse the repository at this point in the history
Router advertisement pages were already doing it but the
DHCPv4/6 pages not. That is problematic for the IPv6 case
because there router advertisements would be reconfigured as
well.

This may not be the final form, but we need to see if this
solves the main concern about intermittent connectivity bumps
on GUI operations.

PR: #4642
(cherry picked from commit 012e0f7)
  • Loading branch information
fichtner committed May 26, 2021
1 parent 8cff8ed commit 1c93021
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/www/services_dhcp.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function reconfigure_dhcpd()
dhcp_clean_leases();
system_hosts_generate();
clear_subsystem_dirty('hosts');
dhcpd_dhcp_configure(false, 'inet');
dhcpd_dhcp4_configure();
clear_subsystem_dirty('staticmaps');
}

Expand Down
2 changes: 1 addition & 1 deletion src/www/services_dhcpv6.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ function reconfigure_dhcpd()
{
system_hosts_generate();
clear_subsystem_dirty('hosts');
dhcpd_dhcp_configure(false, 'inet6');
dhcpd_dhcp6_configure();
clear_subsystem_dirty('staticmaps');
}

Expand Down
2 changes: 1 addition & 1 deletion src/www/status_dhcp_leases.php
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ function ($a, $b) use ($order) {
@unlink($leasesfile);
@rename($leasesfile.".new", $leasesfile);

dhcpd_dhcp_configure(false, 'inet');
dhcpd_dhcp4_configure();
}
}
exit;
Expand Down
2 changes: 1 addition & 1 deletion src/www/status_dhcpv6_leases.php
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ function parse_duid($duid_string)
@unlink($leasesfile);
@rename($leasesfile.".new", $leasesfile);

dhcpd_dhcp_configure(false, 'inet6');
dhcpd_dhcp6_configure();
}
}
exit;
Expand Down

0 comments on commit 1c93021

Please sign in to comment.