diff options
| author | Aleksandr V. Piskunov | 2024-07-16 13:39:17 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2024-09-22 14:28:51 +0000 |
| commit | cdb535ac3231cdcbb15f8682e0f165424e282003 (patch) | |
| tree | e3c86a2b27d8a74532761371c6ca3a9fff0633da | |
| parent | e8d6db714698ece5e70c161a46649b04d77ea734 (diff) | |
| download | openwrt-cdb535ac3231cdcbb15f8682e0f165424e282003.tar.gz | |
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 <aleksandr.v.piskunov@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/15961
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rwxr-xr-x | package/network/ipv6/6in4/files/6in4.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package/network/ipv6/6in4/files/6in4.sh b/package/network/ipv6/6in4/files/6in4.sh index 5b5c7b36af..99b2b76312 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" ] || { |