odhcp6c: minor fixes

[librecmc/librecmc.git] / package / network / ipv6 / odhcp6c / files / dhcpv6.script

diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 650c9b2e8f57462f34cd62a56fe5cb5d563108b5..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
@@ -76,6 +80,7 @@ setup_interface () {
        done
 
        for entry in $RA_ROUTES; do
+               local duplicate=$NOSOURCEFILTER
                local addr="${entry%%/*}"
                entry="${entry#*/}"
                local mask="${entry%%,*}"
@@ -86,7 +91,15 @@ setup_interface () {
                entry="${entry#*,}"
                local metric="${entry%%,*}"
 
-               if [ -z "$gw" ]; then
+               for xentry in $RA_ROUTES; do
+                       local xprefix="${xentry%%,*}"
+                       xentry="${xentry#*,}"
+                       local xgw="${xentry%%,*}"
+
+                       [ -n "$gw" -a -z "$xgw" -a "$addr/$mask" = "$xprefix" ] && duplicate=1
+               done
+
+               if [ -z "$gw" -o "$duplicate" = 1 ]; then
                        proto_add_ipv6_route "$addr" "$mask" "$gw" "$metric" "$valid"
                else
                        for prefix in $PREFIXES $ADDRESSES; do
@@ -127,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
@@ -154,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"