From cdb535ac3231cdcbb15f8682e0f165424e282003 Mon Sep 17 00:00:00 2001 From: "Aleksandr V. Piskunov" Date: Tue, 16 Jul 2024 16:39:17 +0300 Subject: [PATCH] 6in4: allow specifying tunnel device name Accept 'device' option, allowing to specify custom l3 device name, instead of default autogenerated one (prefix "6in4-" + interface name) Signed-off-by: Aleksandr V. Piskunov Link: https://github.com/openwrt/openwrt/pull/15961 Signed-off-by: Hauke Mehrtens --- package/network/ipv6/6in4/files/6in4.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index 5b5c7b36af9..99b2b763124 100755 --- a/package/network/ipv6/6in4/files/6in4.sh +++ b/package/network/ipv6/6in4/files/6in4.sh @@ -45,10 +45,12 @@ proto_6in4_setup() { local iface="$2" local link="6in4-$cfg" - local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey - json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey + local mtu ttl tos ipaddr peeraddr ip6addr ip6prefix ip6prefixes tunlink tunnelid username password updatekey device + json_get_vars mtu ttl tos ipaddr peeraddr ip6addr tunlink tunnelid username password updatekey device json_for_each_item proto_6in4_add_prefix ip6prefix ip6prefixes + [ -n "$device" ] && link="$device" + [ -z "$peeraddr" ] && { proto_notify_error "$cfg" "MISSING_ADDRESS" proto_block_restart "$cfg" @@ -156,6 +158,7 @@ proto_6in4_init_config() { proto_config_add_int "mtu" proto_config_add_int "ttl" proto_config_add_string "tos" + proto_config_add_string "device" } [ -n "$INCLUDE_ONLY" ] || {