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

interfaces: make sure to solve the _vip crisis with GIF use #5540

Browse Source 
Anytime $gif['if'] is used the underlying function either needs to
handle _vip (CARP) case on its own or we need to shave off the CARP
designation before passing it on to not cause any mismatch on lookup.
This commit is contained in:
Franco Fichtner 2022-02-08 08:41:37 +01:00
parent 376481a842
commit 1f8399dfed
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/etc/inc/interfaces.inc
View File

@ -780,13 +780,13 @@ function interface_gif_configure($gif)
if (is_ipaddrv4($gif['remote-addr'])) {
$realifip = get_interface_ip(!empty($gif['ipaddr']) ? $gif['ipaddr'] : $gif['if']);
$realifgw = $gateways->getInterfaceGateway($gif['if'], "inet");
$realifgw = $gateways->getInterfaceGateway(explode('_vip', $gif['if'])[0], 'inet');
} elseif (is_ipaddrv6($gif['remote-addr'])) {
$realifip = get_interface_ipv6(!empty($gif['ipaddr']) ? $gif['ipaddr'] : $gif['if']);
$realifgw = $gateways->getInterfaceGateway($gif['if'], "inet6");
$realifgw = $gateways->getInterfaceGateway(explode('_vip', $gif['if'])[0], 'inet6');
}
interfaces_bring_up(get_real_interface($gif['if'])); /* XXX overreach? */
interfaces_bring_up(get_real_interface(explode('_vip', $gif['if'])[0]); /* XXX overreach? */
/* XXX avoid destroy/create to make routes sticky */
legacy_interface_destroy($gif['gifif']);
@ -813,8 +813,7 @@ function interface_gif_configure($gif)
if (is_ipaddrv4($gif['tunnel-remote-addr'])) {
file_put_contents("/tmp/{$gif['gifif']}_router", "{$gif['tunnel-remote-addr']}\n");
}
if (is_ipaddrv6($gif['tunnel-remote-addr'])) {
} elseif (is_ipaddrv6($gif['tunnel-remote-addr'])) {
file_put_contents("/tmp/{$gif['gifif']}_routerv6", "{$gif['tunnel-remote-addr']}\n");
}

2
src/www/interfaces_gif_edit.php
View File

@ -105,7 +105,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// interface and optional bind address
if (strpos($pconfig['if'], '|') !== false) {
list($gif['if'], $gif['ipaddr']) = explode("|",$pconfig['if']);
list($gif['if'], $gif['ipaddr']) = explode('|', $pconfig['if']);
} else {
$gif['if'] = $pconfig['if'];
$gif['ipaddr'] = null;