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

rc: $configip for unified reload code later...

Browse Source
This commit is contained in:
Franco Fichtner 2017-05-11 10:04:15 +02:00
parent f305ecafe4
commit a99ed3ee7e
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/etc/rc.newwanip
View File

@ -79,13 +79,15 @@ if ((empty($ip) || !is_ipaddr($ip)) && substr($interface_real, 0, 4) != 'ovpn')
return;
}
$configip = $config['interfaces'][$interface]['ipaddr'];
$cacheip_file = "/var/db/{$interface}_cacheip";
$ipfile = "/var/db/{$interface}_ip";
$ip_file = "/var/db/{$interface}_ip";
/* write the current interface IP to file */
/* used in src/sbin/dhclient-script.ext */
if (is_ipaddr($ip)) {
@file_put_contents($ipfile, $ip);
@file_put_contents($ip_file, $ip);
}
link_interface_to_vips($interface, "update");
@ -155,7 +157,7 @@ $cacheip = @file_get_contents($cacheip_file);
* 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_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($config['interfaces'][$interface]['ipaddr'])) {
if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
@unlink($cacheip_file);
system_routing_configure($interface);

4
src/etc/rc.newwanipv6
View File

@ -76,6 +76,8 @@ if ((empty($ip) || !is_ipaddr($ip)) && substr($interface_real, 0, 4) != 'ovpn')
return;
}
$configip = $config['interfaces'][$interface]['ipaddrv6'];
$searchdomain_file = "/var/etc/searchdomain_v6{$interface}";
$nameserver_file = "/var/etc/nameserver_v6{$interface}";
$cacheip_file = "/var/db/{$interface}_cacheipv6";
@ -123,7 +125,7 @@ $cacheip = @file_get_contents($cacheip_file);
* 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_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($config['interfaces'][$interface]['ipaddrv6'])) {
if (!is_ipaddr($cacheip) || $ip != $cacheip || !is_ipaddr($configip)) {
if (is_ipaddr($ip)) {
if ($ip == $cacheip) {
if (in_array($config['interfaces'][$interface]['ipaddr'], array('l2tp', 'ppp', 'pppoe', 'pptp'))) {