Author: cyrus Date: 2015-09-03 17:53:33 +0200 (Thu, 03 Sep 2015) New Revision: 46779
Modified: trunk/package/network/ipv6/odhcp6c/Makefile trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh Log: odhcp6c: add RFC 7278 3gpp IPv6 prefix extension Use option extendprefix 1 to enable Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/ipv6/odhcp6c/Makefile =================================================================== --- trunk/package/network/ipv6/odhcp6c/Makefile 2015-09-03 13:15:19 UTC (rev 46778) +++ trunk/package/network/ipv6/odhcp6c/Makefile 2015-09-03 15:53:33 UTC (rev 46779) @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_VERSION:=2015-07-29 +PKG_VERSION:=2015-09-03 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 Modified: trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script =================================================================== --- trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script 2015-09-03 13:15:19 UTC (rev 46778) +++ trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script 2015-09-03 15:53:33 UTC (rev 46779) @@ -77,6 +77,11 @@ -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then RA_ROUTES="::/0,$SERVER,$valid,4096" fi + + # RFC 7278 + if [ "$mask" -eq 64 -a -z "$PREFIXES" -a -n "$EXTENDPREFIX" ]; then + proto_add_ipv6_prefix "$entry" + fi done for entry in $RA_ROUTES; do Modified: trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh =================================================================== --- trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh 2015-09-03 13:15:19 UTC (rev 46778) +++ trunk/package/network/ipv6/odhcp6c/files/dhcpv6.sh 2015-09-03 15:53:33 UTC (rev 46779) @@ -13,6 +13,7 @@ proto_config_add_string 'reqopts:list(uinteger)' proto_config_add_string 'noslaaconly:bool' proto_config_add_string 'forceprefix:bool' + proto_config_add_string 'extendprefix:bool' proto_config_add_string 'norelease:bool' proto_config_add_string 'ip6prefix:ip6addr' proto_config_add_string iface_dslite @@ -35,8 +36,8 @@ local config="$1" local iface="$2" - local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter - json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter + local reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter + json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter # Configure @@ -78,6 +79,7 @@ [ -n "$zone" ] && proto_export "ZONE=$zone" [ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1" [ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1" + [ "$extendprefix" = "1" ] && proto_export "EXTENDPREFIX=1" proto_export "INTERFACE=$config" proto_run_command "$config" odhcp6c \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
