diff options
| author | mb300sd <mb300sd@mb300sd.net> | 2015-11-19 22:08:07 -0500 |
|---|---|---|
| committer | mb300sd <mb300sd@mb300sd.net> | 2015-11-19 22:08:07 -0500 |
| commit | f1f5005857280af5631d4506622f7d054c866715 (patch) | |
| tree | f6ed99d750a68bd1171d7ab8877315ef11be3a1b | |
| parent | 0b965ed9e9ea15ade8da14dfab095af232406334 (diff) | |
| download | pfsense-f1f5005857280af5631d4506622f7d054c866715.zip pfsense-f1f5005857280af5631d4506622f7d054c866715.tar.gz | |
Fix x-in-ipv6 tunnels for gre and gif
| -rw-r--r-- | src/etc/inc/interfaces.inc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 272f8de..5a308f2 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -807,6 +807,7 @@ function interface_gre_configure(&$gre, $grekey = "") { $realif = get_real_interface($gre['if']); $realifip = get_interface_ip($gre['if']); + $realifip6 = get_interface_ipv6($gre['if']); /* make sure the parent interface is up */ interfaces_bring_up($realif); @@ -820,7 +821,11 @@ function interface_gre_configure(&$gre, $grekey = "") { } /* Do not change the order here for more see gre(4) NOTES section. */ - mwexec("/sbin/ifconfig {$greif} tunnel {$realifip} " . escapeshellarg($gre['remote-addr'])); + if (is_ipaddrv6($gre['remote-addr'])) { + mwexec("/sbin/ifconfig {$greif} inet6 tunnel {$realifip6} " . escapeshellarg($gre['remote-addr'])); + }else{ + mwexec("/sbin/ifconfig {$greif} tunnel {$realifip} " . escapeshellarg($gre['remote-addr'])); + } if ((is_ipaddrv6($gre['tunnel-local-addr'])) || (is_ipaddrv6($gre['tunnel-remote-addr']))) { /* XXX: The prefixlen argument for tunnels of ipv6 is useless since it needs to be 128 as enforced by kernel */ //mwexec("/sbin/ifconfig {$greif} inet6 " . escapeshellarg($gre['tunnel-local-addr']) . " " . escapeshellarg($gre['tunnel-remote-addr']) . " prefixlen /" . escapeshellarg($gre['tunnel-remote-net'])); @@ -936,7 +941,11 @@ function interface_gif_configure(&$gif, $gifkey = "") { } /* Do not change the order here for more see gif(4) NOTES section. */ - mwexec("/sbin/ifconfig {$gifif} tunnel {$realifip} " . escapeshellarg($gif['remote-addr'])); + if (is_ipaddrv6($gif['remote-addr'])) { + mwexec("/sbin/ifconfig {$gifif} inet6 tunnel {$realifip} " . escapeshellarg($gif['remote-addr'])); + } else { + mwexec("/sbin/ifconfig {$gifif} tunnel {$realifip} " . escapeshellarg($gif['remote-addr'])); + } if ((is_ipaddrv6($gif['tunnel-local-addr'])) || (is_ipaddrv6($gif['tunnel-remote-addr']))) { /* XXX: The prefixlen argument for tunnels of ipv6 is useless since it needs to be 128 as enforced by kernel */ //mwexec("/sbin/ifconfig {$gifif} inet6 " . escapeshellarg($gif['tunnel-local-addr']) . " " . escapeshellarg($gif['tunnel-remote-addr']) . " prefixlen /" . escapeshellarg($gif['tunnel-remote-net'])); |
