diff options
| author | Steven Barth <cyrus@openwrt.org> | 2015-04-09 08:17:32 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2015-04-09 08:17:32 +0000 |
| commit | 4b1257137c32cb1b145d5e5bfda78453c20d912d (patch) | |
| tree | f57746917afad25fd365b870b1613d721325b671 /package/network/ipv6/odhcp6c/files/dhcpv6.script | |
| parent | d5a477cc38c319ddc89428594c7db98d27f590bb (diff) | |
| download | upstream-4b1257137c32cb1b145d5e5bfda78453c20d912d.tar.gz upstream-4b1257137c32cb1b145d5e5bfda78453c20d912d.tar.bz2 upstream-4b1257137c32cb1b145d5e5bfda78453c20d912d.zip | |
odhcp6c: add 464xlat integration, fix dslite integration
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 45323
Diffstat (limited to 'package/network/ipv6/odhcp6c/files/dhcpv6.script')
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.script | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script index 1acad1994c..000e2dbae9 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script @@ -127,19 +127,31 @@ setup_interface () { [ -n "$IFACE_MAP_DELEGATE" ] && json_add_boolean delegate "$IFACE_MAP_DELEGATE" json_close_object ubus call network add_dynamic "$(json_dump)" - elif [ -n "$AFTR_IP" -a "$IFACE_DSLITE" != 0 -a -f /lib/netifd/proto/dslite.sh ]; then + elif [ -n "$AFTR" -a "$IFACE_DSLITE" != 0 -a -f /lib/netifd/proto/dslite.sh ]; then [ -z "$IFACE_DSLITE" -o "$IFACE_DSLITE" = 1 ] && IFACE_DSLITE=${INTERFACE}_dslite json_init json_add_string name "$IFACE_DSLITE" json_add_string ifname "@$INTERFACE" json_add_string proto "dslite" - json_add_string peeraddr "$AFTR_IP" + json_add_string peeraddr "$AFTR" json_add_string tunlink "$INTERFACE" [ -n "$ZONE_DSLITE" ] || ZONE_DSLITE=$ZONE [ -n "$ZONE_DSLITE" ] && json_add_string zone "$ZONE_DSLITE" [ -n "$IFACE_DSLITE_DELEGATE" ] && json_add_boolean delegate "$IFACE_DSLITE_DELEGATE" json_close_object ubus call network add_dynamic "$(json_dump)" + elif [ "$IFACE_464XLAT" != 0 -a -f /lib/netifd/proto/464xlat.sh ]; then + [ -z "$IFACE_464XLAT" -o "$IFACE_464XLAT" = 1 ] && IFACE_464XLAT=${INTERFACE}_464xlat + json_init + json_add_string name "$IFACE_464XLAT" + json_add_string ifname "@$INTERFACE" + json_add_string proto "464xlat" + json_add_string tunlink "$INTERFACE" + [ -n "$ZONE_464XLAT" ] || ZONE_464XLAT=$ZONE + [ -n "$ZONE_464XLAT" ] && json_add_string zone "$ZONE_464XLAT" + [ -n "$IFACE_464XLAT_DELEGATE" ] && json_add_boolean delegate "$IFACE_464XLAT_DELEGATE" + json_close_object + ubus call network add_dynamic "$(json_dump)" fi # TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN |