lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: flatten IPv4 renewal like IPv6

Browse Source 
Go the extra mile now that we know we reached the bottom of the
barrel with reload functionality.  The new guard is already working
so we can unconditionally run the second half as we already do in
IPv6 variant.
This commit is contained in:
Franco Fichtner 2023-02-23 12:52:06 +01:00
parent 0a1d59b507
commit 842cc577a0
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/etc/rc.newwanip
View File

@ -78,13 +78,14 @@ if (!is_ipaddr($ip)) {
* Take care of OpenVPN and similar if you generate the event
* to reconfigure an interface. OpenVPN might be in tap(4)
* mode and not have an IP address.
*
* XXX we actually force continuation for ip = null
*/
if (substr($device, 0, 4) != 'ovpn') {
log_msg("Failed to detect IP for {$interface_descr}[{$interface}]", LOG_WARNING);
return;
}
/* force a non-IP value here that makes the problem explicit when debugged */
$ip = 'openvpn_xxx';
}
/* this may be required to cleanse the DNS information no longer available */
@ -168,21 +169,18 @@ foreach (array_keys($restartifs) as $ifname) {
*/
ifgroup_setup();
$intf_ipaddr = $config['interfaces'][$interface]['ipaddr'] ?? 'none';
system_routing_configure(false, $interface, true, 'inet');
filter_configure_sync();
if ($force == 'yes' || $ip != $cacheip || (!is_ipaddr($intf_ipaddr) && $intf_ipaddr != 'dhcp')) {
system_routing_configure(false, $interface, true, 'inet');
filter_configure_sync();
if (is_ipaddr($cacheip) && $ip != $cacheip) {
log_msg("IP address change detected, killing states of old ip $cacheip");
mwexecf('/sbin/pfctl -k 0.0.0.0/0 -k %s', $cacheip);
mwexecf('/sbin/pfctl -k %s', $cacheip);
}
@file_put_contents($cacheip_file, $ip . PHP_EOL);
plugins_configure('vpn', false, [$interface]);
plugins_configure('newwanip', false, [$interface]);
rrd_configure();
if (is_ipaddr($cacheip) && $ip != $cacheip) {
log_msg("IP address change detected, killing states of old ip $cacheip");
mwexecf('/sbin/pfctl -k 0.0.0.0/0 -k %s', $cacheip);
mwexecf('/sbin/pfctl -k %s', $cacheip);
}
/* register IP change not before this point as basic connectivity is needed */
@file_put_contents($cacheip_file, $ip . PHP_EOL);
plugins_configure('vpn', false, [$interface]);
plugins_configure('newwanip', false, [$interface]);
rrd_configure();