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

rc: cluster more, PPP loop avoidance earlier...

Browse Source
This commit is contained in:
Franco Fichtner 2017-05-10 07:12:47 +02:00
parent 92f7c3fc3d
commit a5937f8fed
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/etc/rc.newwanip
View File

@ -157,13 +157,12 @@ if (isset($config['gifs']['gif']) && is_array($config['gifs']['gif'])){
* could be failing back in which case we need to switch IPs back anyhow.
*/
if (!is_ipaddr($oldip) || $curwanip != $oldip || !is_ipaddrv4($config['interfaces'][$interface]['ipaddr'])) {
system_routing_configure($interface);
setup_gateways_monitor();
if (is_ipaddr($curwanip)) {
@file_put_contents("/var/db/{$interface}_cacheip", $curwanip);
}
system_routing_configure($interface);
setup_gateways_monitor();
plugins_configure('vpn', false, array($interface));
plugins_configure('newwanip', false, array($interface));
rrd_configure();

25
src/etc/rc.newwanipv6
View File

@ -111,30 +111,31 @@ link_interface_to_track6($interface, "update");
system_resolvconf_generate();
system_hosts_generate();
if (is_ipaddrv6($curwanipv6) && $curwanipv6 == $oldipv6) {
if (in_array($config['interfaces'][$interface]['ipaddrv6'], array('pppoe', 'pptp', 'ppp'))) {
/* PPP reconnect loop avoidance */
return;
}
}
/*
* We need to force sync VPNs on such even when the IP is the same for dynamic interfaces.
* Even with the same IP the VPN software is unhappy with the IP disappearing, and we
* could be failing back in which case we need to switch IPs back anyhow.
*/
if (!is_ipaddrv6($oldipv6) || $curwanipv6 != $oldipv6 || !is_ipaddrv6($config['interfaces'][$interface]['ipaddrv6'])) {
system_routing_configure($interface);
setup_gateways_monitor();
if (is_ipaddrv6($curwanipv6)) {
@file_put_contents("/var/db/{$interface}_cacheipv6", $curwanipv6);
}
if ($curwanipv6 == $oldipv6) {
if (in_array($config['interfaces'][$interface]['ipaddrv6'], array('pppoe', 'pptp', 'ppp'))) {
/* PPP reconnect loop avoidance */
return;
}
} elseif (is_ipaddrv6($oldipv6)) {
if ($curwanipv6 != $oldipv6 && is_ipaddrv6($oldipv6)) {
if (does_interface_exist($interface_real)) {
mwexec("/sbin/ifconfig {$interface_real} inet6 {$oldipv6} delete");
}
}
if (is_ipaddrv6($curwanipv6)) {
@file_put_contents("/var/db/{$interface}_cacheipv6", $curwanipv6);
}
system_routing_configure($interface);
setup_gateways_monitor();
plugins_configure('vpn', false, array($interface));
plugins_configure('newwanip', false, array($interface));
rrd_configure();