diff options
| author | Hans Dedecker <dedeckeh@gmail.com> | 2018-08-09 17:56:19 +0200 |
|---|---|---|
| committer | Jo-Philipp Wich <jo@mein.io> | 2018-12-18 11:01:56 +0100 |
| commit | 7a52e0a7ab0847002c6f1e6d02083739ef641ab4 (patch) | |
| tree | 71d5075f83813da11c114924669270238d99290d /package | |
| parent | cc6da6fa1ad6ce55cbab3f9cbb966bd7df83869e (diff) | |
| download | upstream-7a52e0a7ab0847002c6f1e6d02083739ef641ab4.tar.gz upstream-7a52e0a7ab0847002c6f1e6d02083739ef641ab4.tar.bz2 upstream-7a52e0a7ab0847002c6f1e6d02083739ef641ab4.zip | |
odhcp6c: apply IPv6/ND configuration earlier
Apply IPv6/ND configuration before proto_send_update so that all config info
is available when netifd is handling the notify_proto ubus call.
In particular this fixes an issue when netifd is updating the downstream IPv6 mtu
as netifd was still using the not yet updated upstream IPv6 mtu to set the
downstream IPv6 mtu
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(backported from 2e02fdb3637c7a0320d230a3232d61e874c1e4d1)
Diffstat (limited to 'package')
| -rw-r--r-- | package/network/ipv6/odhcp6c/Makefile | 2 | ||||
| -rwxr-xr-x | package/network/ipv6/odhcp6c/files/dhcpv6.script | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index c9a893b57b..451f0962bb 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcp6c -PKG_RELEASE:=14.1 +PKG_RELEASE:=15 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcp6c.git diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script index dcb7a95d98..28955a358f 100755 --- a/package/network/ipv6/odhcp6c/files/dhcpv6.script +++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script @@ -7,6 +7,14 @@ setup_interface () { local device="$1" local prefsig="" local addrsig="" + + # Apply IPv6 / ND configuration + HOPLIMIT=$(cat /proc/sys/net/ipv6/conf/$device/hop_limit) + [ -n "$RA_HOPLIMIT" -a -n "$HOPLIMIT" ] && [ "$RA_HOPLIMIT" -gt "$HOPLIMIT" ] && echo "$RA_HOPLIMIT" > /proc/sys/net/ipv6/conf/$device/hop_limit + [ -n "$RA_MTU" ] && [ "$RA_MTU" -ge 1280 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu 2>/dev/null + [ -n "$RA_REACHABLE" ] && [ "$RA_REACHABLE" -gt 0 ] && echo "$RA_REACHABLE" > /proc/sys/net/ipv6/neigh/$device/base_reachable_time_ms + [ -n "$RA_RETRANSMIT" ] && [ "$RA_RETRANSMIT" -gt 0 ] && echo "$RA_RETRANSMIT" > /proc/sys/net/ipv6/neigh/$device/retrans_time_ms + proto_init_update "*" 1 # Merge RA-DNS @@ -203,13 +211,6 @@ setup_interface () { ubus call network add_dynamic "$(json_dump)" fi - # Apply IPv6 / ND configuration - HOPLIMIT=$(cat /proc/sys/net/ipv6/conf/$device/hop_limit) - [ -n "$RA_HOPLIMIT" -a -n "$HOPLIMIT" ] && [ "$RA_HOPLIMIT" -gt "$HOPLIMIT" ] && echo "$RA_HOPLIMIT" > /proc/sys/net/ipv6/conf/$device/hop_limit - [ -n "$RA_MTU" ] && [ "$RA_MTU" -ge 1280 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu 2>/dev/null - [ -n "$RA_REACHABLE" ] && [ "$RA_REACHABLE" -gt 0 ] && echo "$RA_REACHABLE" > /proc/sys/net/ipv6/neigh/$device/base_reachable_time_ms - [ -n "$RA_RETRANSMIT" ] && [ "$RA_RETRANSMIT" -gt 0 ] && echo "$RA_RETRANSMIT" > /proc/sys/net/ipv6/neigh/$device/retrans_time_ms - # TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN } |