projects
/
openwrt-github
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
6in4: make local ip6addr optional
[openwrt-github/.git]
/
package
/
network
/
ipv6
/
6in4
/
files
/
6in4.sh
diff --git
a/package/network/ipv6/6in4/files/6in4.sh
b/package/network/ipv6/6in4/files/6in4.sh
index 71bc68940c6bf0956acced3779dcaaab237294e5..651d7b97b7e20ecbae6623b3104f51ec61a50e85 100755
(executable)
--- a/
package/network/ipv6/6in4/files/6in4.sh
+++ b/
package/network/ipv6/6in4/files/6in4.sh
@@
-17,7
+17,7
@@
proto_6in4_setup() {
local mtu ttl ipaddr peeraddr ip6addr tunnelid username password
json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password
local mtu ttl ipaddr peeraddr ip6addr tunnelid username password
json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password
- [ -z "$
ip6addr" -o -z "$
peeraddr" ] && {
+ [ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS"
proto_block_restart "$cfg"
return
proto_notify_error "$cfg" "MISSING_ADDRESS"
proto_block_restart "$cfg"
return
@@
-33,14
+33,16
@@
proto_6in4_setup() {
fi
}
fi
}
- local local6="${ip6addr%%/*}"
- local mask6="${ip6addr##*/}"
- [[ "$local6" = "$mask6" ]] && mask6=
-
proto_init_update "$link" 1
proto_init_update "$link" 1
- proto_add_ipv6_address "$local6" "$mask6"
proto_add_ipv6_route "::" 0
proto_add_ipv6_route "::" 0
+ [ -n "$ip6addr" ] && {
+ local local6="${ip6addr%%/*}"
+ local mask6="${ip6addr##*/}"
+ [[ "$local6" = "$mask6" ]] && mask6=
+ proto_add_ipv6_address "$local6" "$mask6"
+ }
+
proto_add_tunnel
json_add_string mode sit
json_add_int mtu "${mtu:-1280}"
proto_add_tunnel
json_add_string mode sit
json_add_int mtu "${mtu:-1280}"