lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-16 01:24:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: experimental try to only reload filter when we really do

Browse Source
This commit is contained in:
Franco Fichtner 2017-05-10 06:44:38 +02:00
parent 575f804a53
commit 92f7c3fc3d
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/etc/rc.newwanip
View File

@ -134,11 +134,11 @@ if (isset($config['interfaces'][$interface]['ipaddrv6'])) {
}
/* Check Gif tunnels */
if(isset($config['gifs']['gif']) && is_array($config['gifs']['gif'])){
foreach($config['gifs']['gif'] as $gif) {
if($gif['if'] == $interface) {
if (isset($config['gifs']['gif']) && is_array($config['gifs']['gif'])){
foreach ($config['gifs']['gif'] as $gif) {
if ($gif['if'] == $interface) {
foreach (legacy_config_get_interfaces(array("virtual" => false)) as $ifname => $ifparent) {
if(($ifparent['if'] == $gif['gifif']) && (isset($ifparent['enable']))) {
if (($ifparent['if'] == $gif['gifif']) && (isset($ifparent['enable']))) {
$gif['gifif'] = interface_gif_configure($gif);
$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
if (!empty($confif)) {
@ -167,7 +167,7 @@ if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interface
plugins_configure('vpn', false, array($interface));
plugins_configure('newwanip', false, array($interface));
rrd_configure();
}
/* reload filter, don't try to sync to carp slave */
filter_configure_sync();
/* reload filter, don't try to sync to carp slave */
filter_configure_sync();
}

11
src/etc/rc.newwanipv6
View File

@ -80,9 +80,10 @@ $new_domain_name_servers = getenv("new_domain_name_servers");
if (!empty($new_domain_name_servers)) {
$name_servers = explode(" ", $new_domain_name_servers);
$valid_ns = array();
foreach($name_servers as $ns) {
if (is_ipaddrv6(trim($ns)))
foreach ($name_servers as $ns) {
if (is_ipaddrv6(trim($ns))) {
$valid_ns[] = trim($ns);
}
}
if (count($valid_ns) > 0) {
@ -137,7 +138,7 @@ if (!is_ipaddrv6($oldipv6) || $curwanipv6 != $oldipv6 || !is_ipaddrv6($config['i
plugins_configure('vpn', false, array($interface));
plugins_configure('newwanip', false, array($interface));
rrd_configure();
}
/* reload filter, don't try to sync to carp slave */
filter_configure_sync();
/* reload filter, don't try to sync to carp slave */
filter_configure_sync();
}