hak5
/
openwrt-owl
mirror of https://github.com/hak5/openwrt-owl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

6in4: add support for native IPv6 prefix handling 

SVN-Revision: 35171
owl
Steven Barth 2013-01-15 13:08:05 +00:00
parent a1e92f6dd1
commit 2a94f67029
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/ipv6/6in4/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=6in4 PKG_NAME:=6in4
PKG_VERSION:=12 PKG_VERSION:=13
PKG_RELEASE:=1 PKG_RELEASE:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

7
package/network/ipv6/6in4/files/6in4.sh
View File

@ -14,8 +14,8 @@ proto_6in4_setup() {
local iface="$2" local iface="$2"
local link="6in4-$cfg" local link="6in4-$cfg"
local mtu ttl ipaddr peeraddr ip6addr tunnelid username password local mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password
json_get_vars mtu ttl ipaddr peeraddr ip6addr tunnelid username password json_get_vars mtu ttl ipaddr peeraddr ip6addr ip6prefix tunnelid username password
[ -z "$peeraddr" ] && { [ -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_ADDRESS"
@ -43,6 +43,8 @@ proto_6in4_setup() {
proto_add_ipv6_address "$local6" "$mask6" proto_add_ipv6_address "$local6" "$mask6"
} }
[ -n "$ip6prefix" ] && proto_add_ipv6_prefix "$ip6prefix"
proto_add_tunnel proto_add_tunnel
json_add_string mode sit json_add_string mode sit
json_add_int mtu "${mtu:-1280}" json_add_int mtu "${mtu:-1280}"
@ -79,6 +81,7 @@ proto_6in4_init_config() {
proto_config_add_string "ipaddr" proto_config_add_string "ipaddr"
proto_config_add_string "ip6addr" proto_config_add_string "ip6addr"
proto_config_add_string "ip6prefix"
proto_config_add_string "peeraddr" proto_config_add_string "peeraddr"
proto_config_add_string "tunnelid" proto_config_add_string "tunnelid"
proto_config_add_string "username" proto_config_add_string "username"