diff --git a/bbfdm/Makefile b/bbfdm/Makefile index 305f7f6fc..de5ff5250 100644 --- a/bbfdm/Makefile +++ b/bbfdm/Makefile @@ -11,7 +11,7 @@ USE_LOCAL:=0 ifneq ($(USE_LOCAL),1) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git -PKG_SOURCE_VERSION:=262a98fe2aa0131e798a0a30fe5b157b66b257df +PKG_SOURCE_VERSION:=8ed9c7bb5f555ea5d496cf02bf4d5358db9f0659 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_MIRROR_HASH:=skip endif @@ -58,17 +58,6 @@ define Package/bbf_configmngr MENU:=1 endef -define Package/active-port - SECTION:=utils - CATEGORY:=Utilities - SUBMENU:=TRx69 - TITLE:= Device.IP.ActivePort object - DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +bbfdmd - DEPENDS+=+@BUSYBOX_DEFAULT_NETSTAT - DEPENDS+=+@BUSYBOX_DEFAULT_AWK - MENU:=1 -endef - define Package/libbbfdm/config source "$(SOURCE)/Config_bbfdm.in" endef @@ -89,10 +78,6 @@ define Package/bbf_configmngr/description Daemon for handling bbf reload services via ubus bbf.config endef -define Package/active-port/description - Provides Device.IP.ActivePort data model object. -endef - ifeq ($(USE_LOCAL),1) define Build/Prepare $(CP) ~/git/bbfdm/* $(PKG_BUILD_DIR)/ @@ -181,14 +166,6 @@ ifeq ($(CONFIG_BBF_CONFIGMNGR_SCRIPT_BACKEND),y) endif endef -define Package/active-port/install - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) ./files/etc/init.d/active-port $(1)/etc/init.d/active-port - $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/active-port $(1)/usr/sbin/ - $(BBFDM_INSTALL_CORE_PLUGIN) ./files/etc/active-port/active-port.json $(1) -endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/include @@ -198,7 +175,6 @@ define Build/InstallDev endef $(eval $(call BuildPackage,bbf_configmngr)) -$(eval $(call BuildPackage,active-port)) $(eval $(call BuildPackage,libbbfdm-api)) $(eval $(call BuildPackage,libbbfdm)) $(eval $(call BuildPackage,bbfdmd)) diff --git a/bbfdm/files/etc/active-port/active-port.json b/bbfdm/files/etc/active-port/active-port.json deleted file mode 100644 index 487de76ca..000000000 --- a/bbfdm/files/etc/active-port/active-port.json +++ /dev/null @@ -1,109 +0,0 @@ -{ - "json_plugin_version": 2, - "Device.IP.ActivePort.{i}.": { - "type": "object", - "protocols": [ - "cwmp", - "usp" - ], - "description": "This table lists the ports on which TCP connections are listening or established.", - "access": false, - "array": true, - "mapping": [ - { - "type": "ubus", - "ubus": { - "object": "active-port", - "method": "dump", - "args": {}, - "key": "connections" - } - } - ], - "LocalIPAddress": { - "type": "string", - "read": true, - "write": false, - "protocols": [ - "cwmp", - "usp" - ], - "description": "Connection local IP address", - "mapping": [ - { - "data": "@Parent", - "type": "json", - "key": "local_ip" - } - ] - }, - "LocalPort": { - "type": "unsignedInt", - "read": true, - "write": false, - "protocols": [ - "cwmp", - "usp" - ], - "description": "Connection local port", - "mapping": [ - { - "data": "@Parent", - "type": "json", - "key": "local_port" - } - ] - }, - "RemoteIPAddress": { - "type": "string", - "read": true, - "write": false, - "protocols": [ - "cwmp", - "usp" - ], - "description": "The remote IP address of the source of inbound packets", - "mapping": [ - { - "data": "@Parent", - "type": "json", - "key": "remote_ip" - } - ] - }, - "RemotePort": { - "type": "unsignedInt", - "read": true, - "write": false, - "protocols": [ - "cwmp", - "usp" - ], - "description": "The remote port of the source of inbound packets", - "mapping": [ - { - "data": "@Parent", - "type": "json", - "key": "remote_port" - } - ] - }, - "Status": { - "type": "string", - "read": true, - "write": false, - "protocols": [ - "cwmp", - "usp" - ], - "description": "Current operational status of the connection", - "mapping": [ - { - "data": "@Parent", - "type": "json", - "key": "status" - } - ] - } - } -} diff --git a/bbfdm/files/etc/init.d/active-port b/bbfdm/files/etc/init.d/active-port deleted file mode 100644 index bf55f61fc..000000000 --- a/bbfdm/files/etc/init.d/active-port +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=64 -STOP=10 - -USE_PROCD=1 -PROG=/usr/sbin/active-port - -start_service() -{ - procd_open_instance "active-port" - procd_set_param command ${PROG} - procd_set_param respawn - procd_close_instance "active-port" -}