6in4: make local ip6addr optional
SVN-Revision: 33761
This commit is contained in:
parent
3a31553a0e
commit
a00110a063
2 changed files with 9 additions and 7 deletions
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=6in4
|
||||
PKG_VERSION:=11
|
||||
PKG_VERSION:=12
|
||||
PKG_RELEASE:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
|
|
@ -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
|
||||
|
||||
[ -z "$ip6addr" -o -z "$peeraddr" ] && {
|
||||
[ -z "$peeraddr" ] && {
|
||||
proto_notify_error "$cfg" "MISSING_ADDRESS"
|
||||
proto_block_restart "$cfg"
|
||||
return
|
||||
|
@ -33,14 +33,16 @@ proto_6in4_setup() {
|
|||
fi
|
||||
}
|
||||
|
||||
local local6="${ip6addr%%/*}"
|
||||
local mask6="${ip6addr##*/}"
|
||||
[[ "$local6" = "$mask6" ]] && mask6=
|
||||
|
||||
proto_init_update "$link" 1
|
||||
proto_add_ipv6_address "$local6" "$mask6"
|
||||
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}"
|
||||
|
|
Loading…
Reference in a new issue