odhcp6c: add preliminary CER-ID support

SVN-Revision: 40351
owl
Steven Barth 2014-03-31 06:43:50 +00:00
parent a558ce7e21
commit a22190340a
2 changed files with 15 additions and 2 deletions

View File

@ -8,14 +8,14 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=odhcp6c PKG_NAME:=odhcp6c
PKG_VERSION:=2014-03-26 PKG_VERSION:=2014-03-31
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:=6c8109e0c77d5a54950ba607d1ec1f83d5efb5b7 PKG_SOURCE_VERSION:=47fac6f603c236d7b149e0ec593269322572b352
PKG_MAINTAINER:=Steven Barth <steven@midlink.org> PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
include $(INCLUDE_DIR)/package.mk 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) CMAKE_OPTIONS += -DEXT_PREFIX_CLASS=$(CONFIG_PACKAGE_odhcp6c_ext_prefix_class)
endif endif
ifneq ($(CONFIG_PACKAGE_odhcp6c_ext_cer_id),0)
CMAKE_OPTIONS += -DEXT_CER_ID=$(CONFIG_PACKAGE_odhcp6c_ext_cer_id)
endif
define Package/odhcp6c define Package/odhcp6c
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
@ -37,6 +41,11 @@ define Package/odhcp6c/config
int "Prefix Class Extension ID (0 = disabled)" int "Prefix Class Extension ID (0 = disabled)"
depends on PACKAGE_odhcp6c depends on PACKAGE_odhcp6c
default 0 default 0
config PACKAGE_odhcp6c_ext_cer_id
int "CER-ID Extension ID (0 = disabled)"
depends on PACKAGE_odhcp6c
default 0
endef endef
define Package/odhcp6c/install define Package/odhcp6c/install

View File

@ -75,6 +75,10 @@ setup_interface () {
fi fi
done done
proto_add_data
[ -n "$CER" ] && json_add_string cer "$CER"
proto_close_data
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