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

GRE + ip alias, for https://github.com/opnsense/core/pull/3080

Browse Source
This commit is contained in:
Ad Schellevis 2018-12-30 18:38:40 +01:00
parent 3bb0e00e19
commit 8c0683540d
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -707,10 +707,10 @@ function interface_gre_configure(&$gre, $grekey = "")
/* Do not change the order here for more see gre(4) NOTES section. */
if (is_ipaddrv6($gre['remote-addr'])) {
$realifip = get_interface_ipv6($gre['if']);
$realifip = is_ipaddr($gre['if']) ? $gre['if'] : get_interface_ipv6($gre['if']);
mwexecf('/sbin/ifconfig %s inet6 tunnel %s %s', array($greif, $realifip, $gre['remote-addr']));
} else {
$realifip = get_interface_ip($gre['if']);
$realifip = is_ipaddr($gre['if']) ? $gre['if'] : get_interface_ip($gre['if']);
mwexecf('/sbin/ifconfig %s tunnel %s %s', array($greif, $realifip, $gre['remote-addr']));
}
if ((is_ipaddrv6($gre['tunnel-local-addr'])) || (is_ipaddrv6($gre['tunnel-remote-addr']))) {

11
src/www/interfaces_gre.php
View File

@ -123,7 +123,16 @@ $main_buttons = array(
$i = 0;
foreach ($a_gres as $gre): ?>
<tr>
<td><?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?></td>
<td>
<?php
if (is_ipaddr($gre['if'])):?>
[<?=htmlspecialchars($gre['if']);?>]
<?php
else:?>
<?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($gre['if']));?>
<?php
endif;?>
</td>
<td><?=$gre['remote-addr'];?></td>
<td><?=$gre['descr'];?></td>
<td>

2
src/www/interfaces_gre_edit.php
View File

@ -153,7 +153,7 @@ include("head.inc");
$portlist[$cif] = $carpip." (".get_vip_descr($carpip).")";
}
foreach ($aliaslist as $aliasip => $aliasif) {
$portlist[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
$portlist[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
}
foreach ($portlist as $ifn => $ifinfo):?>