interfaces: avoid touching cacheip files and improve state kill #5367

opnsense · Nov 23, 2021 · 028302a · 028302a
1 parent 671ebdd
commit 028302a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
@@ -1116,8 +1116,7 @@ function interface_bring_down($interface = "wan", $ifacecfg = false)
     /* clear stale state files associated with this interface */
     @unlink("/var/db/{$interface}_ip");
     @unlink("/var/db/{$interface}_ipv6");
-    @unlink("/var/db/{$interface}_cacheip");
-    @unlink("/var/db/{$interface}_cacheipv6");
+    /* do not unlink cacheip(v6) variants for state kill in rc.newwanip(v6) scripts */
     @unlink("/var/etc/nameserver_{$realif}");
     @unlink("/var/etc/nameserver_v6{$realifv6}");
     @unlink("/var/etc/searchdomain_{$realif}");

diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip
@@ -164,6 +164,7 @@ if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
         mwexec('/sbin/pfctl -Fs');
     } else if (is_ipaddr($cacheip) && $ip != $cacheip) {
         log_error("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);
     }