Skip to content

fix issue #4025: 6rd with single /64 prefix #4635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fichtner merged 1 commit into from
Jan 25, 2021
Merged

fix issue #4025: 6rd with single /64 prefix #4635

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/etc/inc/interfaces.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2721,6 +2721,7 @@ function interface_6rd_configure($interface = 'wan', $wancfg)

/* create the long prefix notation for math, save the prefix length */
$rd6prefix = explode("/", $wancfg['prefix-6rd']);
$rd6prefix_isp = $rd6prefix[0];
$rd6prefixlen = $rd6prefix[1];
$rd6prefix = Net_IPv6::uncompress($rd6prefix[0]);

Expand All @@ -2737,7 +2738,8 @@ function interface_6rd_configure($interface = 'wan', $wancfg)
/* convert the 128 bits for the broker address back into a valid IPv6 address */
$rd6prefix = convert_128bit_to_ipv6($rd6prefixbin);

$rd6brgw = "{$rd6prefix}{$wancfg['gateway-6rd']}";
/* use gateway inside original prefix to avoid routing issues */
$rd6brgw = "{$rd6prefix_isp}{$wancfg['gateway-6rd']}";

$stfiface = "{$interface}_stf";
if (does_interface_exist($stfiface)) {
Expand All @@ -2752,7 +2754,8 @@ function interface_6rd_configure($interface = 'wan', $wancfg)
}
legacy_interface_mtu($stfiface, $mtu);

mwexecf('/sbin/ifconfig %s inet6 %s/%s', array($stfiface, $rd6prefix, $rd6prefixlen + 32 - $wancfg['prefix-6rd-v4plen']));
# use original prefix length for network address to avoid setting the same subnet as on the LAN side (/64 prefix)
mwexecf('/sbin/ifconfig %s inet6 %s/%s', array($stfiface, $rd6prefix, $rd6prefixlen));
mwexecf('/sbin/ifconfig %s stfv4br %s', array($stfiface, $wancfg['gateway-6rd']));
mwexecf('/sbin/ifconfig %s stfv4net %s/%s', array($stfiface, $ip4address, $wancfg['prefix-6rd-v4plen']));

Expand Down