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 <steven@midlink.org>
Backport of r46518

SVN-Revision: 48839

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 75de54c493d737bf13a6e6dbb278563a91b369b9..aa81e02dcab2f05965c37ca804d1070288952afa 100644 (file)
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -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 <steven@midlink.org>
 PKG_LICENSE:=GPL-2.0
 

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 33f6d9b4cb9f391b2d16fd2cc83291e8d6e18662..677d35f4f92e82d6a7fe9ca01a35e071097baca8 100755 (executable)
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -5,6 +5,8 @@
 
 setup_interface () {
        local device="$1"
+       local prefsig=""
+       local addrsig=""
        proto_init_update "*" 1
 
        # Merge RA-DNS
@@ -34,6 +36,7 @@ setup_interface () {
 
        for prefix in $PREFIXES; do
                proto_add_ipv6_prefix "$prefix"
+               prefsig="$prefsig ${prefix%%,*}"
                local entry="${prefix#*/}"
                entry="${entry#*,}"
                entry="${entry#*,}"
@@ -68,6 +71,7 @@ setup_interface () {
                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 @@ setup_interface () {
                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 @@ setup_interface () {
                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"