aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-03-31 06:43:50 +0000
committerSteven Barth <steven@midlink.org>2014-03-31 06:43:50 +0000
commitf289cd075053af40fd15070256cd007a817bd6d2 (patch)
treedee18be7ffdd2f387385194515b04d5ce5195e47
parent8ed950b602ba0508732a7e69f15a25680cdb551e (diff)
downloadupstream-f289cd075053af40fd15070256cd007a817bd6d2.tar.gz
upstream-f289cd075053af40fd15070256cd007a817bd6d2.tar.bz2
upstream-f289cd075053af40fd15070256cd007a817bd6d2.zip
odhcp6c: add preliminary CER-ID support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40351 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/network/ipv6/odhcp6c/Makefile13
-rwxr-xr-xpackage/network/ipv6/odhcp6c/files/dhcpv6.script4
2 files changed, 15 insertions, 2 deletions
diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index 78ac07e90b..3f02d70fb1 100644
--- a/package/network/ipv6/odhcp6c/Makefile
+++ b/package/network/ipv6/odhcp6c/Makefile
@@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c
-PKG_VERSION:=2014-03-26
+PKG_VERSION:=2014-03-31
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE_URL:=git://github.com/sbyx/odhcp6c.git
PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6c8109e0c77d5a54950ba607d1ec1f83d5efb5b7
+PKG_SOURCE_VERSION:=47fac6f603c236d7b149e0ec593269322572b352
PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk
@@ -25,6 +25,10 @@ ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_prefix_class),0)
CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcp6c_ext_prefix_class)
endif
+ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_cer_id),0)
+ CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcp6c_ext_cer_id)
+endif
+
define Package/odhcp6c
SECTION:=net
CATEGORY:=Network
@@ -37,6 +41,11 @@ define Package/odhcp6c/config
int "Prefix Class Extension ID (0 = disabled)"
depends on PACKAGE_odhcp6c
default 0
+
+ config PACKAGE_odhcp6c_ext_cer_id
+ int "CER-ID Extension ID (0 = disabled)"
+ depends on PACKAGE_odhcp6c
+ default 0
endef
define Package/odhcp6c/install
diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
index 851e94be91..d228014dd4 100755
--- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
@@ -75,6 +75,10 @@ setup_interface () {
fi
done
+ proto_add_data
+ [ -n "$CER" ] && json_add_string cer "$CER"
+ proto_close_data
+
proto_send_update "$INTERFACE"
if [ -n "$AFTR_IP " -a -n "$IFACE_DSLITE" ]; then