odhcp6c: added support for DS-Lite + various fixes
SVN-Revision: 36625
This commit is contained in:
parent
973dad61b0
commit
ad93a571c6
@ -8,14 +8,14 @@
|
|||||||
include $(TOPDIR)/rules.mk
|
include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=odhcp6c
|
PKG_NAME:=odhcp6c
|
||||||
PKG_VERSION:=2013-05-05
|
PKG_VERSION:=2013-05-13
|
||||||
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
||||||
|
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
|
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=493b90de720d198a988460bee83340dafbbfa10d
|
PKG_SOURCE_VERSION:=aeb7c37224051811553c898b2a784944f26276b0
|
||||||
PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
|
PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
@ -69,6 +69,20 @@ setup_interface () {
|
|||||||
|
|
||||||
proto_send_update "$INTERFACE"
|
proto_send_update "$INTERFACE"
|
||||||
|
|
||||||
|
if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then
|
||||||
|
uci -q batch <<-EOF >/dev/null
|
||||||
|
set network.$IFACE_DSLITE.proto=dslite
|
||||||
|
set network.$IFACE_DSLITE.auto=0
|
||||||
|
set network.$IFACE_DSLITE.peeraddr=$AFTR_IP
|
||||||
|
set network.$IFACE_DSLITE.tunlink=$INTERFACE
|
||||||
|
commit network
|
||||||
|
EOF
|
||||||
|
|
||||||
|
ifdown "$IFACE_DSLITE"
|
||||||
|
/etc/init.d/network reload
|
||||||
|
ifup "$IFACE_DSLITE"
|
||||||
|
fi
|
||||||
|
|
||||||
# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN
|
# TODO: $SNTP_IP $SIP_IP $SNTP_FQDN $SIP_DOMAIN
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,8 +18,8 @@ proto_dhcpv6_setup() {
|
|||||||
local config="$1"
|
local config="$1"
|
||||||
local iface="$2"
|
local iface="$2"
|
||||||
|
|
||||||
local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
|
local reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite
|
||||||
json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix
|
json_get_vars reqaddress reqprefix clientid reqopts noslaaconly norelease ip6prefix iface_dslite
|
||||||
|
|
||||||
|
|
||||||
# Configure
|
# Configure
|
||||||
@ -40,6 +40,7 @@ proto_dhcpv6_setup() {
|
|||||||
done
|
done
|
||||||
|
|
||||||
[ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
|
[ -n "$ip6prefix" ] && proto_export "USERPREFIX=$ip6prefix"
|
||||||
|
[ -n "$iface_dslite" ] && proto_export "IFACE_DSLITE=$iface_dslite"
|
||||||
|
|
||||||
proto_export "INTERFACE=$config"
|
proto_export "INTERFACE=$config"
|
||||||
proto_run_command "$config" odhcp6c \
|
proto_run_command "$config" odhcp6c \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user