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

interfaces: look up 'blind' alias use in GRE avoiding guess_interface_from_ip()

Browse Source
This commit is contained in:
Franco Fichtner 2022-02-11 11:06:33 +01:00
parent 4f8ac2f8e4
commit 86571ef5f8
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3610,14 +3610,19 @@ function link_interface_to_gre($interface)
{
global $config;
$aliaslist = get_configured_ip_aliases_list();
$result = [];
if (isset($config['gres']['gre'])) {
foreach ($config['gres']['gre'] as $gre) {
$parent = explode('_vip', $gre['if'])[0];
if (is_ipaddr($parent)) {
/* XXX requires a proper runtime setup or VIP lookup */
$parent = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($parent));
foreach ($aliaslist as $ip => $int) {
if ($ip == $parent) {
$parent = $int;
break;
}
}
}
if ($parent == $interface) {
$result[] = $gre;

16
src/www/interfaces_gre.php
View File

@ -31,6 +31,7 @@ require_once("guiconfig.inc");
require_once("interfaces.inc");
$a_gres = &config_read_array('gres', 'gre') ;
$a_aliaslist = get_configured_ip_aliases_list();
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
$input_errors = [];
@ -117,11 +118,16 @@ legacy_html_escape_form_data($a_gres);
foreach ($a_gres as $gre): ?>
<tr>
<td>
<?php if (is_ipaddr($gre['if'])): ?>
<?php $interface = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($gre['if'])); ?>
<?php else: ?>
<?php $interface = explode('_vip', $gre['if'])[0]; ?>
<?php endif ?>
<?php
$interface = explode('_vip', $gre['if'])[0]; /* required for fallback if alias does not exist */
if (is_ipaddr($gre['if'])) {
foreach ($a_aliaslist as $ip => $int) {
if ($ip == $gre['if']) {
$interface = $int;
break;
}
}
} ?>
<?= html_safe(convert_friendly_interface_to_friendly_descr($interface)) ?>
</td>
<td><?=$gre['remote-addr'];?></td>