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

Convert DHCP->6rd and DHCPv6->DS-Lite autoconfig to dynamic interface 

SVN-Revision: 39061
lede-17.01
Steven Barth 2013-12-15 19:38:53 +00:00
parent 36197755dc
commit e49d67f192
5 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/network/config/netifd/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=netifd PKG_NAME:=netifd
PKG_VERSION:=2013-12-14 PKG_VERSION:=2013-12-14.1
PKG_RELEASE=$(PKG_SOURCE_VERSION) PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

23
package/network/config/netifd/files/lib/netifd/dhcp.script
View File

@ -44,19 +44,18 @@ setup_interface () {
ip6rd="${ip6rd#* }" ip6rd="${ip6rd#* }"
local ip6rdbr="${ip6rd%% *}" local ip6rdbr="${ip6rd%% *}"
uci -q batch <<-EOF >/dev/null json_init
set network.$IFACE6RD.proto=6rd json_add_string name "$IFACE6RD"
set network.$IFACE6RD.auto=0 json_add_string ifname "@$INTERFACE"
set network.$IFACE6RD.peeraddr=$ip6rdbr json_add_string proto "6rd"
set network.$IFACE6RD.ip4prefixlen=$v4mask json_add_string peeraddr "$ip6rdbr"
set network.$IFACE6RD.ip6prefix=$ip6rdprefix json_add_int ip4prefixlen "$v4mask"
set network.$IFACE6RD.ip6prefixlen=$ip6rdprefixlen json_add_string ip6prefix "$ip6rdprefix"
commit network json_add_int ip6prefixlen "$ip6rdprefixlen"
EOF json_add_string tunlink "$INTERFACE"
json_close_object
ifdown "$IFACE6RD" ubus call network add_dynamic "$(json_dump)"
/etc/init.d/network reload
ifup "$IFACE6RD"
fi fi
# TODO # TODO

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

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

6
package/network/ipv6/6rd/files/6rd.sh
View File

@ -14,8 +14,8 @@ proto_6rd_setup() {
local iface="$2" local iface="$2"
local link="6rd-$cfg" local link="6rd-$cfg"
local mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen local mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink
json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen json_get_vars mtu ttl ipaddr peeraddr ip6prefix ip6prefixlen ip4prefixlen tunlink
[ -z "$ip6prefix" -o -z "$peeraddr" ] && { [ -z "$ip6prefix" -o -z "$peeraddr" ] && {
proto_notify_error "$cfg" "MISSING_ADDRESS" proto_notify_error "$cfg" "MISSING_ADDRESS"
@ -57,6 +57,7 @@ proto_6rd_setup() {
json_add_string local "$ipaddr" json_add_string local "$ipaddr"
json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen" json_add_string 6rd-prefix "$ip6prefix/$ip6prefixlen"
json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen" json_add_string 6rd-relay-prefix "$ip4prefix/$ip4prefixlen"
[ -n "$tunlink" ] && json_add_string link "$tunlink"
proto_close_tunnel proto_close_tunnel
proto_send_update "$cfg" proto_send_update "$cfg"
@ -77,6 +78,7 @@ proto_6rd_init_config() {
proto_config_add_string "ip6prefix" proto_config_add_string "ip6prefix"
proto_config_add_string "ip6prefixlen" proto_config_add_string "ip6prefixlen"
proto_config_add_string "ip4prefixlen" proto_config_add_string "ip4prefixlen"
proto_config_add_string "tunlink"
} }
[ -n "$INCLUDE_ONLY" ] || { [ -n "$INCLUDE_ONLY" ] || {

19
package/network/ipv6/odhcp6c/files/dhcpv6.script
View File

@ -78,17 +78,14 @@ setup_interface () {
proto_send_update "$INTERFACE" proto_send_update "$INTERFACE"
if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then
uci -q batch <<-EOF >/dev/null json_init
set network.$IFACE_DSLITE.proto=dslite json_add_string name "$IFACE_DSLITE"
set network.$IFACE_DSLITE.auto=0 json_add_string ifname "@$INTERFACE"
set network.$IFACE_DSLITE.peeraddr=$AFTR_IP json_add_string proto "dslite"
set network.$IFACE_DSLITE.tunlink=$INTERFACE json_add_string peeraddr "$AFTR_IP"
commit network json_add_string tunlink "$INTERFACE"
EOF json_close_object
ubus call network add_dynamic "$(json_dump)"
ifdown "$IFACE_DSLITE"
/etc/init.d/network reload
ifup "$IFACE_DSLITE"
fi fi
# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN # TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN