Author: cyrus Date: 2015-07-29 08:13:15 +0200 (Wed, 29 Jul 2015) New Revision: 46518
Modified: trunk/package/network/ipv6/odhcp6c/Makefile trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script Log: odhcp6c: minor fixes Better synchronize RA & DHCPv6 events Accumulate some events to avoid flooding Restart softwires for address and prefix changes Signed-off-by: Steven Barth <[email protected]> Modified: trunk/package/network/ipv6/odhcp6c/Makefile =================================================================== --- trunk/package/network/ipv6/odhcp6c/Makefile 2015-07-28 21:54:44 UTC (rev 46517) +++ trunk/package/network/ipv6/odhcp6c/Makefile 2015-07-29 06:13:15 UTC (rev 46518) @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_VERSION:=2015-07-18 +PKG_VERSION:=2015-07-29 PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/sbyx/odhcp6c.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=024525798c5f6aba3af9b2ef7b3af2f3c14f1db8 +PKG_SOURCE_VERSION:=dc186d6d2b0dd4ad23ca5fc69c00e81f796ff6d9 PKG_MAINTAINER:=Steven Barth <[email protected]> PKG_LICENSE:=GPL-2.0 Modified: trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script =================================================================== --- trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script 2015-07-28 21:54:44 UTC (rev 46517) +++ trunk/package/network/ipv6/odhcp6c/files/dhcpv6.script 2015-07-29 06:13:15 UTC (rev 46518) @@ -5,6 +5,8 @@ setup_interface () { local device="$1" + local prefsig="" + local addrsig="" proto_init_update "*" 1 # Merge RA-DNS @@ -34,6 +36,7 @@ for prefix in $PREFIXES; do proto_add_ipv6_prefix "$prefix" + prefsig="$prefsig ${prefix%%,*}" local entry="${prefix#*/}" entry="${entry#*,}" entry="${entry#*,}" @@ -68,6 +71,7 @@ local valid="${entry%%,*}" proto_add_ipv6_address "$addr" "$mask" "$preferred" "$valid" 1 + addrsig="$addrsig $addr/$mask" if [ -z "$RA_ADDRESSES" -a -z "$RA_ROUTES" -a \ -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then @@ -136,6 +140,8 @@ json_add_string ifname "@$INTERFACE" json_add_string proto map json_add_string type "$MAPTYPE" + json_add_string _prefsig "$prefsig" + [ "$MAPTYPE" = lw4o6 ] && json_add_string _addrsig "$addrsig" json_add_string rule "$MAPRULE" json_add_string tunlink "$INTERFACE" [ -n "$ZONE_MAP" ] || ZONE_MAP=$ZONE @@ -163,6 +169,7 @@ json_add_string ifname "@$INTERFACE" json_add_string proto "464xlat" json_add_string tunlink "$INTERFACE" + json_add_string _addrsig "$addrsig" [ -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" _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
