summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal Luçi <eri@pfsense.org>2008-11-08 15:56:24 +0000
committerErmal Luçi <eri@pfsense.org>2008-11-08 15:56:24 +0000
commitbe38535c65646a9334c607b47a6fa40be157a40e (patch)
tree64f3fa960b4157691a0be3c672b6b09105cdb395
parent15be17221d83c262619df11cf9469eb63f585442 (diff)
downloadpfsense-be38535c65646a9334c607b47a6fa40be157a40e.zip
pfsense-be38535c65646a9334c607b47a6fa40be157a40e.tar.gz
Try to use where possible filter_configure so upcoming event modifications can be easily integrated.
-rw-r--r--etc/inc/interfaces.inc4
-rw-r--r--etc/inc/services.inc2
-rw-r--r--etc/inc/vpn.inc6
-rwxr-xr-xetc/rc.newwanip2
4 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index d54dcb4..ffed245 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -581,7 +581,7 @@ function interfaces_configure()
captiveportal_configure();
/* set the reload filter dity flag */
- touch("{$g['tmp_path']}/filter_dirty");
+ filter_configure();
}
return 0;
@@ -1366,7 +1366,7 @@ function interface_configure($interface = "wan")
system_routing_configure();
/* set the reload filter dity flag */
- touch("{$g['tmp_path']}/filter_dirty");
+ filter_configure();
/* reload ipsec tunnels */
vpn_ipsec_configure();
diff --git a/etc/inc/services.inc b/etc/inc/services.inc
index a009d2c..e0464f5 100644
--- a/etc/inc/services.inc
+++ b/etc/inc/services.inc
@@ -429,7 +429,7 @@ function services_dhcrelay_configure() {
if (!$g['booting']) {
/* set the reload filter dity flag */
- touch("{$g['tmp_path']}/filter_dirty");
+ filter_configure();
}
return 0;
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 51d5c78..67de51e 100644
--- a/etc/inc/vpn.inc
+++ b/etc/inc/vpn.inc
@@ -836,7 +836,7 @@ EOD;
if (!$g['booting']) {
/* reload the filter */
- touch("{$g["tmp_path"]}/filter_dirty");
+ filter_configure();
}
if ($g['booting'])
@@ -1284,7 +1284,7 @@ EOD;
break;
}
- touch("{$g["tmp_path"]}/filter_dirty");
+ filter_configure();
if ($g['booting'])
echo "done\n";
@@ -1471,7 +1471,7 @@ EOD;
break;
}
- touch("{$g["tmp_path"]}/filter_dirty");
+ filter_configure();
if ($g['booting'])
echo "done\n";
diff --git a/etc/rc.newwanip b/etc/rc.newwanip
index 8eaca24..8045fbe 100755
--- a/etc/rc.newwanip
+++ b/etc/rc.newwanip
@@ -101,7 +101,7 @@ touch("/tmp/update_dyndns");
/* signal filter reload */
unlink_if_exists("/tmp/config.cache");
-touch("/tmp/filter_dirty");
+filter_configure();
/* reload graphing functions */
enable_rrd_graphing();
OpenPOWER on IntegriCloud