asterisk-1.8.x-mod: Makefile: Added place holders for more easy configuring of make options DEBUG and OPTIMIZE

voice-client: No longer depends on asterisk18-mod (avoids circular dependancy)

4g-support/Makefile

@@ -0,0 +1,31 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=4g-support
+PKG_VERSION:=1.0.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/4g-support
+  CATEGORY:=Network
+  TITLE:=4G Network Setup Tools
+endef
+
+define Package/4g-support/description
+	4g-support contains necessary tools to setup 4G WAN connection
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/4g-support/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,4g-support))

4g-support/files/etc/gcom/ncmconnection.gcom

@@ -0,0 +1,62 @@
+opengt
+set com 115200n81
+set comecho off
+set senddelay 0.05
+waitquiet 1 0.2
+
+:start
+ if $env("USE_DISCONNECT")="1" goto disconnect
+ send "AT^^NDISDUP=1,1,\""
+ send $env("USE_APN")
+
+ if $env("USE_AUTHTYPE")="-1" goto noauth
+ else goto auth
+
+:noauth
+ send "\"^m"
+ goto result
+
+:auth
+ send "\",\""
+ send $env("USE_USERID")
+ send "\",\""
+ send $env("USE_PASSWORD")
+ send "\","
+ send $env("USE_AUTHTYPE")
+ send "^m"
+ goto result
+
+:result
+ waitfor 5 "OK","ERR","ERROR"
+ if % = 0 goto connok
+ if % = 1 goto connerr
+ if % = 2 goto connerr
+
+:connok
+ print "WWAN connection established.\r\n"
+ goto done
+
+:connerr
+ print "WWAN error. Connection failed.\r\n"
+ exit 1
+
+:disconnect
+ send "AT^^NDISDUP=1,0,\""
+ send $env("USE_APN")
+ send "\"^m"
+
+ waitfor 5 "OK","ERR","ERROR"
+ if % = 0 goto disconnok
+ if % = 1 goto disconnerr
+ if % = 2 goto disconnerr
+
+:disconnok
+ print "WWAN connection disconnected.\r\n"
+ goto done
+
+:disconnerr
+ print "WWAN disconnection error.\r\n"
+ exit 1
+
+:done
+ exit 0

4g-support/files/etc/hotplug.d/net/05-mobile

@@ -0,0 +1,35 @@
+. /lib/network/config.sh
+. /usr/share/libubox/jshn.sh
+
+iface_status() {
+	local iface=$1
+	local up
+	json_load "$(ifstatus $iface)"
+	json_get_var up up
+	json_close_object
+	return $up
+}
+
+case "$ACTION" in
+        add|register)
+                if [ "${INTERFACE:0:4}" == "wwan" ]; then
+                        netname=$(get_network_of "$INTERFACE")
+                        for net in $netname; do
+				local service=$(uci -q get network.$net.service)
+				local cnt=0
+				while $(iface_status $net); do
+		                        ifup $net
+					if [ "$service" == "qmi" ]; then
+						cnt=$(($cnt+1))
+						# quit trying if still not online after three times
+						[ $cnt -eq 3 ] && break
+						sleep 5
+					else
+						break
+					fi
+				done
+                        done
+                fi
+        ;;
+esac
+

4g-support/files/etc/hotplug.d/usb/30-usbnet

@@ -0,0 +1,66 @@
+#!/bin/sh
+
+local usb_dir uVid uPid uMa uPr uSe bConf bNumConfs vendor product mdmtyp netdev comdev cdcdev ttydev usbno usbbr
+
+sanitize() {
+	sed -e 's/[[:space:]]\+$//; s/[[:space:]]\+/_/g' "$@"
+}
+
+find_usb_attrs() {
+	usb_dir="/sys/$DEVPATH"
+	[ -f "$usb_dir/idVendor" ] || usb_dir="${usb_dir%/*}"
+
+	uVid=$(cat "$usb_dir/idVendor")
+	uPid=$(cat "$usb_dir/idProduct")
+	uMa=$(sanitize "$usb_dir/manufacturer")
+	uPr=$(sanitize "$usb_dir/product")
+	uSe=$(sanitize "$usb_dir/serial")
+	bNumConfs=$(cat "$usb_dir/bNumConfigurations")
+	bConf=$(cat "$usb_dir/bConfigurationValue")
+	netdev=$(find $usb_dir -name wwan* | awk -F'/' '{print$NF}' | head -2 | tail -1)
+	cdcdev=$(find $usb_dir -name cdc-wdm* | awk -F'/' '{print$NF}' | head -2 | tail -1)
+	ttydev=$(ls $(find $usb_dir -name tty | head -2 | tail -1) | tail -1)
+	if [ -n "$cdcdev" ]; then
+		comdev=$cdcdev
+		mdmtyp=$(grep $uVid:$uPid /etc/modemdb | grep 'qmi\|mbim' | awk '{print$2}' | head -1)
+		vendor=$(grep $uVid:$uPid /etc/modemdb | grep 'qmi\|mbim' | awk '{print$3}' | head -1)
+		product=$(grep $uVid:$uPid /etc/modemdb | grep 'qmi\|mbim' | awk '{print$4}' | head -1)
+	else
+		comdev=$ttydev
+		mdmtyp=$(grep $uVid:$uPid /etc/modemdb | grep 'ncm' | awk '{print$2}' | head -1)
+		vendor=$(grep $uVid:$uPid /etc/modemdb | grep 'ncm' | awk '{print$3}' | head -1)
+		product=$(grep $uVid:$uPid /etc/modemdb | grep 'ncm' | awk '{print$4}' | head -1)
+	fi
+	[ -n "$mdmtyp" ] || mdmtyp=$(grep $uVid:$uPid /etc/modemdb | awk '{print$2}' | head -1)
+	[ -n "$vendor" ] || vendor=$(grep $uVid:$uPid /etc/modemdb | awk '{print$3}' | head -1)
+	[ -n "$product" ] || product=$(grep $uVid:$uPid /etc/modemdb | awk '{print$4}' | head -1)
+}
+
+convert_to_mbim() {
+	if [ "$mdmtyp" == "mbim" ] && [ "$bNumConfs" == "2" ]; then
+		[ "$bConf" == "2" ] || echo 2 > $usb_dir/bConfigurationValue
+	fi
+}
+
+usbno=$(echo $DEVPATH | cut -d'/' -f5)
+usbbr=$(echo $DEVPATH | cut -d'/' -f7)
+case "$usbbr" in
+	*:*) usbbr=$(echo $DEVPATH | cut -d'/' -f6) ;;
+esac
+
+find_usb_attrs
+if [ "$ACTION" = add ]; then
+	convert_to_mbim "$uVid:$uPid"
+	if [ -n "$uVid" ] && [ -n "$uPid" ] && [ -n "$mdmtyp" ] && [ -n "$netdev" ] && [ -n "$comdev" ]; then
+		if [ -n "$usbno" ] && [ -n "$usbbr" ]; then
+			sed -i "/$usbno:$usbbr/ d" /var/usbnets
+			echo $usbno:$usbbr $uVid:$uPid $uMa $uPr $netdev $comdev $mdmtyp $vendor $product >> /var/usbnets
+		fi
+	fi
+fi
+
+if [ "$ACTION" = remove ]; then
+	if [ -n "$usbno" ] && [ -n "$usbbr" ]; then
+		sed -i "/$usbno:$usbbr/ d" /var/usbnets
+	fi
+fi

4g-support/files/etc/modemdb

@@ -0,0 +1,100 @@
+1bbb:011e	qmi
+1a8d:1001	ecm
+1a8d:100c	ecm
+1a8d:100d	ecm
+16d8:6280	qmi
+16d8:6803	qmi
+16d8:6804	qmi
+16d8:7003	qmi
+16d8:700a	qmi
+2001:7d01	mbim
+2001:7d02	mbim
+2001:7d03	mbim
+12d1:14ac	qmi
+12d1:140c	qmi
+12d1:1506	qmi	Huawei		E367/392/398
+12d1:1506	ncm	Huawei		E3276
+12d1:14d2	qmi
+12d1:1c07	ncm
+12d1:1436	ecm
+12d1:14c9	qmi
+12d1:14db	ecm
+12d1:151d	mbim
+12d1:151e	qmi	Huawei		E353
+12d1:1c1e	ncm
+12d1:150c	qmi
+12d1:150f	qmi
+12d1:151b	qmi
+12d1:142d	ecm
+12d1:1432	ecm
+12d1:1c1f	ncm
+12d1:1433	qmi
+12d1:1465	ecm
+12d1:14ca	qmi
+12d1:14cf	ncm
+12d1:14bc	ecm
+12d1:14ae	ecm
+12d1:1576	mbim
+12d1:1577	mbim
+12d1:1400	mbim
+12d1:14f7	mbim
+12d1:1464	qmi
+12d1:14cb	qmi
+12d1:14cc	qmi
+12d1:14c6	qmi
+12d1:14fa	mbim
+12d1:1578	mbim
+12d1:14c8	qmi
+12d1:14f8	mbim
+12d1:1575	mbim
+12d1:1579	mbim
+12d1:157a	mbim
+12d1:157b	mbim
+12d1:157f	mbim
+12d1:1f16	mbim	Vodafone	K5150
+12d1:1404	qmi
+19f2:1700	ecm	
+1410:b001	qmi
+1527:1000	ecm
+0b3c:c005	qmi
+0f3d:68a2	qmi
+1199:68a2	qmi	SierraWireless	M7710
+1199:68c0	qmi	SierraWireless	M7304
+1349:1100	qmi
+1349:1200	qmi	
+1199:683c	qmi
+2360:2100	qmi
+2360:2200	qmi
+2360:2300	qmi
+2507:0000	qmi	
+19d2:0055	qmi
+19d2:0052	qmi
+19d2:0063	qmi
+19d2:1008	qmi
+19d2:1010	qmi
+19d2:2002	qmi
+19d2:1176	qmi
+19d2:1023	mbim
+19d2:0104	qmi
+19d2:1018	qmi
+19d2:1032	mbim
+19d2:1402	qmi
+19d2:1405	ecm
+19d2:1426	qmi
+19d2:0031	qmi
+19d2:0124	qmi
+19d2:1254	qmi
+19d2:0017	qmi
+19d2:0002	qmi
+19d2:0121	qmi
+19d2:1252	qmi
+19d2:0157	qmi
+19d2:0167	qmi
+19d2:0199	qmi
+19d2:0257	qmi
+19d2:0326	qmi
+19d2:0349	ecm
+19d2:1408	ecm
+19d2:0284	qmi
+19d2:0019	qmi
+19d2:0265	qmi

4g-support/files/lib/netifd/proto/4g.sh

@@ -0,0 +1,159 @@
+#!/bin/sh
+INCLUDE_ONLY=1
+
+. /lib/functions.sh
+. ../netifd-proto.sh
+init_proto "$@"
+
+proto_4g_init_config() {
+	proto_config_add_string "modem"
+	proto_config_add_string "service"
+	proto_config_add_string "comdev"
+	proto_config_add_string "ipaddr"
+	proto_config_add_string "netmask"
+	proto_config_add_string "hostname"
+	proto_config_add_string "clientid"
+	proto_config_add_string "vendorid"
+	proto_config_add_boolean "broadcast"
+	proto_config_add_string "reqopts"
+	proto_config_add_string "apn"
+	proto_config_add_string "username"
+	proto_config_add_string "password"
+	proto_config_add_boolean "lte_apn_use"
+	proto_config_add_string "lte_apn"
+	proto_config_add_string "lte_username"
+	proto_config_add_string "lte_password"
+	proto_config_add_string "pincode"
+	proto_config_add_string "technology"
+	proto_config_add_string "auto"
+}
+
+proto_4g_setup() {
+	local config="$1"
+	local iface="$2"
+
+        local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone
+        json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone
+
+        local opt dhcpopts
+        for opt in $reqopts; do
+                append dhcpopts "-O $opt"
+        done
+
+        for opt in $sendopts; do
+                append dhcpopts "-x $opt"
+        done
+
+        [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
+        [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
+        [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
+        [ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
+        [ -n "$zone6rd" ] && proto_export "ZONE6RD=$zone6rd"
+        [ -n "$zone" ] && proto_export "ZONE=$zone"
+        [ "$delegate" = "0" ] && proto_export "IFACE6RD_DELEGATE=0"
+
+        json_get_var comdev comdev
+        json_get_var apn apn
+        json_get_var service service
+        json_get_var pincode pincode
+
+
+#	if [ -n "$modem" ]; then
+#		service=$(echo $modem | cut -d':' -f1)
+#		comdev=$(echo $modem | cut -d':' -f2)
+#		iface=$(echo $modem | cut -d':' -f3)
+#	fi
+	
+	case "$service" in
+		ecm)
+		;;
+		eem)
+		;;
+		mbim)
+			local mbimdev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
+			local comdev="${comdev:-$mbimdev}"
+			[ -n "$pincode" ] && {
+				if ! mbimcli -d $comdev --query-pin-state 2>&1 | grep -q "unlocked"; then
+					set -o pipefail
+					if ! mbimcli -d $comdev --enter-pin="${pincode}" 2>&1; then
+						mbimcli -d $comdev --query-pin-state
+						proto_notify_error "$config" PIN_FAILED
+						proto_block_restart "$interface"
+						return 1
+					fi
+				fi
+			}
+			APN="$apn" mbim-network $comdev start
+		;;
+		ncm)
+			[ -n "$pincode" ] && echo $pincode | gcom -d $comdev
+			USE_APN="$apn" gcom -d $comdev -s /etc/gcom/ncmconnection.gcom
+		;;
+		qmi)
+			local qmidev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
+			local comdev="${comdev:-$qmidev}"
+			[ -n "$pincode" ] && {
+				if ! qmicli -d $comdev --dms-uim-get-pin-status 2>&1 | grep -q "enabled-verified\|disabled" >/dev/null; then
+					set -o pipefail
+					if ! qmicli -d $comdev --dms-uim-verify-pin="PIN,${pincode}" 2>&1; then
+						qmicli -d $comdev --dms-uim-get-pin-status
+						proto_notify_error "$config" PIN_FAILED
+						proto_block_restart "$interface"
+						return 1
+					fi
+				fi
+			}
+			APN="$apn" qmi-network $comdev start
+		;;		
+	esac
+	
+	proto_export "INTERFACE=$config"
+	proto_run_command "$config" udhcpc -R \
+		-p /var/run/udhcpc-$iface.pid \
+		-s /lib/netifd/dhcp.script \
+		-f -t 0 -i "$iface" \
+		${ipaddr:+-r $ipaddr} \
+		${hostname:+-H $hostname} \
+		${vendorid:+-V $vendorid} \
+		$clientid $broadcast $dhcpopts
+}
+
+proto_4g_teardown() {
+	local interface="$1"
+	local iface="$2"
+	local modem service comdev
+
+        config_load network
+        config_get service $interface service
+        config_get comdev $interface comdev
+
+#	config_get modem $interface modem
+#	if [ -n "$modem" ]; then
+#		service=$(echo $modem | cut -d':' -f1)
+#		comdev=$(echo $modem | cut -d':' -f2)
+#		iface=$(echo $modem | cut -d':' -f3)
+#	fi
+	
+	case "$service" in
+		ecm)
+		;;
+		eem)
+		;;
+		mbim)
+			local mbimdev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
+			local comdev="${comdev:-$mbimdev}"
+			mbim-network $comdev stop
+		;;
+		ncm)
+			USE_DISCONNECT=1 gcom -d $comdev -s /etc/gcom/ncmconnection.gcom
+		;;
+		qmi)
+			local qmidev=/dev/$(basename $(ls /sys/class/net/${iface}/device/usb/cdc-wdm* -d))
+			local comdev="${comdev:-$qmidev}"
+			qmi-network $comdev stop
+		;;		
+	esac
+	proto_kill_command "$interface"
+}
+
+add_protocol 4g

asterisk-1.8.x-mod/Makefile

@@ -0,0 +1,847 @@
+#
+# Copyright (C) 2008-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=asterisk18-mod
+PKG_VERSION:=1.8.10.1
+
+PKG_SOURCE_VERSION:=ffa46ba1d5abf22fa83d0bd06ea56fe8e638dd43
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
+
+PKG_RELEASE:=$(PKG_SOURCE_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION)-$(PKG_RELEASE).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/ltqtapi.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/asterisk18-mod/Default
+  SUBMENU:=Telephony
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=http://www.asterisk.org/
+endef
+
+define Package/asterisk18-mod/Default/description
+ Asterisk is a complete PBX in software. It provides all of the features
+ you would expect from a PBX and more. Asterisk does voice over IP in three
+ protocols, and can interoperate with almost all standards-based telephony
+ equipment using relatively inexpensive hardware.
+endef
+
+
+define Package/asterisk18-mod
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Complete open source PBX, v1.8x
+  MENU:=1
+  DEPENDS:= +natalie-dect-h +PACKAGE_bcmkernel:bcmkernel +PACKAGE_bcmopen:bcmopen +libopenssl +libncurses +libpopt +libpthread +uci +ubus +zlib @!TARGET_avr32
+ifeq ($(CONFIG_PACKAGE_voice-client),y)
+  DEPENDS+= +voice-client
+endif
+endef
+
+define Package/asterisk18-mod/description
+$(call Package/asterisk18-mod/Default/description)
+endef
+
+define Package/asterisk18-mod-sounds
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Sound files
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-sounds/description
+$(call Package/asterisk18-mod/Default/description)
+ This package contains sound files for Asterisk.
+endef
+
+define Package/asterisk18-mod-voicemail
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Voicemail support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-voicemail/description
+$(call Package/asterisk18-mod/Default/description)
+ This package contains voicemail related modules for Asterisk.
+endef
+
+define Package/asterisk18-mod-app-transfer
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Call transfer support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-app-transfer/description
+$(call Package/asterisk18-mod/Default/description)
+ This package contains the call transfer support module for Asterisk.
+endef
+
+define Package/asterisk18-mod-app-softhangup
+$(call Package/asterisk18-mod/Default)
+  TITLE:=SoftHangup application
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-app-softhangup/description
+$(call Package/asterisk18-mod/Default/description)
+ This package contains the SoftHangup support module for Asterisk.
+endef
+
+define Package/asterisk18-mod-app-meetme
+$(call Package/asterisk18-mod/Default)
+  TITLE:=conferencing support
+  DEPENDS:= asterisk18-mod +dahdi-tools-libtonezone +dahdi
+endef
+
+define Package/asterisk18-mod-app-meetme/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the MeetMe application driver Conferencing support to
+ Asterisk.
+endef
+
+define Package/asterisk18-mod-chan-iax2
+$(call Package/asterisk18-mod/Default)
+  TITLE:=IAX support
+  DEPENDS:= asterisk18-mod +asterisk18-res-crypto
+endef
+
+define Package/asterisk18-mod-chan-iax2/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides IAX support to
+ Asterisk.
+endef
+
+define Package/asterisk18-mod-cdr
+$(call Package/asterisk18-mod/Default)
+  TITLE:=CDR support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-cdr/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides Call Detail Record support to
+ Asterisk.
+endef
+
+define Package/asterisk18-mod-res-musiconhold
+$(call Package/asterisk18-mod/Default)
+  TITLE:=MOH support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-res-musiconhold/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides Music On Hold support to
+ Asterisk.
+endef
+
+define Package/asterisk18-mod-res-voice
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Voice client/pbx support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-res-voice/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides Voice Client/pbx support to
+ Asterisk.
+endef
+
+define Package/asterisk18-mod-res-srtp
+$(call Package/asterisk18-mod/Default)
+  TITLE:=SRTP support
+  DEPENDS:= asterisk18-mod libsrtp +asterisk18-mod-res-crypto
+endef
+
+define Package/asterisk18-mod-res-srtp/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides SRTP support to
+ Asterisk.
+endef
+
+define Package/asterisk18-mod-res-stun
+$(call Package/asterisk18-mod/Default)
+  TITLE:=STUN support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-app-queue
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Queue support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-chan-gtalk
+$(call Package/asterisk18-mod/Default)
+  TITLE:=GTalk support
+  DEPENDS:= asterisk18-mod +libiksemel
+endef
+
+define Package/asterisk18-mod-chan-gtalk/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_gtalk and res_jabber for GTalk
+ support to Asterisk.
+endef
+
+define Package/asterisk18-mod-chan-mobile
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Mobile channel support
+  DEPENDS:= asterisk18-mod +bluez-libs
+endef
+
+define Package/asterisk18-mod-chan-mobile/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_mobile support to Asterisk.
+endef
+
+define Package/asterisk18-mod-res-timing-timerfd
+$(call Package/asterisk18-mod/Default)
+  TITLE:= Timerfd Timing Interface
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-res-timing-pthread
+$(call Package/asterisk18-mod/Default)
+  TITLE:= pthread Timing Interface
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-res-fax
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Generic FAX Resource for FAX technology resource modules
+  DEPENDS:= asterisk18-mod +asterisk18-mod-res-timing-pthread
+endef
+
+define Package/asterisk18-mod-res-fax-spandsp
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Spandsp T.38 and G.711 FAX Resource
+  DEPENDS:= asterisk18-mod +asterisk18-mod-res-fax +libspandsp
+endef
+
+define Package/asterisk18-mod-chan-mgcp
+$(call Package/asterisk18-mod/Default)
+  TITLE:=MGCP channel support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-chan-mgcp/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_mgcp support to Asterisk.
+endef
+
+define Package/asterisk18-mod-chan-skinny
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Skinny channel support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-chan-skinny/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_skinny support to Asterisk.
+endef
+
+define Package/asterisk18-mod-chan-brcm
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Broadcom channel support
+  DEPENDS:= asterisk18-mod
+endef
+
+define Package/asterisk18-mod-chan-brcm/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_brcm support to Asterisk.
+endef
+
+define Package/asterisk18-mod-curl
+$(call Package/asterisk18-mod/Default)
+  TITLE:=CURL support
+  DEPENDS:= asterisk18-mod +libcurl
+endef
+
+define Package/asterisk18-mod-curl/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides CURL
+ support to Asterisk.
+endef
+
+define Package/asterisk18-mod-mysql
+$(call Package/asterisk18-mod/Default)
+  TITLE:=MySQL support
+  DEPENDS:= asterisk18-mod +PACKAGE_asterisk18-mysql:libmysqlclient
+endef
+
+define Package/asterisk18-mod-mysql/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides MySQL
+ support to Asterisk.
+endef
+
+define Package/asterisk18-mod-chan-lantiq
+$(call Package/asterisk18-mod/Default)
+  TITLE:=Lantiq TAPI support
+  DEPENDS:= asterisk18-mod $(LTQ_TAPI_DEPENDS)
+  URL:=http://git.nanl.de/?p=asterisk_channel_lantiq.git
+  MAINTAINER:=Mirko Vogt <mirko@openwrt.org>
+endef
+
+define Package/asterisk18-mod-chan-lantiq/description
+$(call Package/asterisk18-mod/Default/description)
+ This package provides the channel chan_lantiq support to Asterisk.
+endef
+
+CONFIGURE_ARGS+= \
+	--without-inotify
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-app-meetme),)
+  CONFIGURE_ARGS+= \
+	--with-dahdi="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+	--without-dahdi
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-chan-gtalk),)
+  CONFIGURE_ARGS+= \
+	--with-gnutls="$(STAGING_DIR)/usr" \
+	--with-iksemel="$(STAGING_DIR)/usr"
+  SITE_VARS+= \
+	ac_cv_lib_iksemel_iks_start_sasl=yes \
+	ac_cv_lib_gnutls_gnutls_bye=yes
+else
+  CONFIGURE_ARGS+= \
+	--without-gnutls \
+	--without-iksemel
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-curl),)
+  CONFIGURE_ARGS+= \
+	--with-curl="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+	--without-curl
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-mysql),)
+  CONFIGURE_ARGS+= \
+	--with-mysqlclient="$(STAGING_DIR)/usr/bin"
+else
+  CONFIGURE_ARGS+= \
+	--without-mysqlclient
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-res-fax-spandsp),)
+  CONFIGURE_ARGS+= \
+    --with-spandsp="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+    --without-spandsp
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-chan-mobile),)
+  CONFIGURE_ARGS+= \
+	--with-bluetooth="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+	--without-bluetooth
+endif
+
+ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-mod-res-srtp),)
+  CONFIGURE_ARGS+= \
+	--with-srtp="$(STAGING_DIR)/usr"
+else
+  CONFIGURE_ARGS+= \
+	--without-srtp
+endif
+
+ifeq ($(CONFIG_TARGET_IBOARDID),"D301")
+  EXTRA_CFLAGS += -DNTR_SUPPORT
+endif
+
+CONFIGURE_ARGS+= \
+	--without-curses \
+	--with-gsm=internal \
+	--without-cap \
+	--without-gtk \
+	--without-gtk2 \
+	--without-isdnnet \
+	--without-kde \
+	--without-misdn \
+	--without-nbs \
+	--with-ncurses="$(STAGING_DIR)/usr" \
+	--without-netsnmp \
+	--without-newt \
+	--without-odbc \
+	--without-ogg \
+	--without-osptk \
+	--with-popt="$(STAGING_DIR)/usr" \
+	--without-pri \
+	--without-qt \
+	--without-radius \
+	--without-sdl \
+	--without-suppserv \
+	--without-tds \
+	--without-termcap \
+	--without-tinfo \
+	--without-vorbis \
+	--without-vpb \
+	--with-z="$(STAGING_DIR)/usr" \
+	--with-sounds-cache="$(DL_DIR)" \
+	--disable-xmldoc
+
+EXTRA_CFLAGS+= $(TARGET_CPPFLAGS)
+EXTRA_LDFLAGS+= $(TARGET_LDFLAGS)
+
+ifeq ($(CONFIG_DEBUG),y)
+	CONFIGURE_ARGS+= \
+		--enable-dev-mode
+	MENUSELECT_ARGS+= \
+		--enable BETTER_BACKTRACES
+	MENUSELECT_ARGS+= \
+		--enable DEBUG_THREADS
+	MENUSELECT_ARGS+= \
+		--enable DONT_OPTIMIZE
+	MENUSELECT_ARGS+= \
+		--enable MALLOC_DEBUG
+	#MENUSELECT_ARGS+= \
+	#	--disable LOADABLE_MODULES
+	#MENUSELECT_ARGS+= \
+	#	--enable LOW_MEMORY
+	#MENUSELECT_ARGS+= \
+	#	--enable STATIC_BUILD
+
+	DEBUG:=
+	OPTIMIZE:=
+
+	#CONFIGURE_ARGS+= \
+	#	--enable-coverage
+else
+	MENUSELECT_ARGS+= \
+		--enable LOW_MEMORY
+	DEBUG:=
+	OPTIMIZE:=
+endif
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+ifneq ($(CONFIG_TARGET_lantiq),)
+	$(CP) ./src-lantiq/* $(PKG_BUILD_DIR)/
+endif
+endef
+
+define Build/Configure
+	-rm $(PKG_BUILD_DIR)/menuselect.makeopts
+	$(call Build/Configure/Default,,$(SITE_VARS))
+	if test -n "$(MENUSELECT_ARGS)" ; then \
+		$(MAKE) -C "$(PKG_BUILD_DIR)" menuselect.makeopts ; \
+		(cd $(PKG_BUILD_DIR) && ./menuselect/menuselect $(MENUSELECT_ARGS)) ; \
+	fi
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		include/asterisk/version.h \
+		include/asterisk/buildopts.h defaults.h \
+		makeopts.embed_rules
+	ASTCFLAGS="$(EXTRA_CFLAGS)" \
+	ASTLDFLAGS="$(EXTRA_LDFLAGS)" \
+	$(MAKE) -C "$(PKG_BUILD_DIR)" \
+		ASTVARLIBDIR="/usr/lib/asterisk" \
+		ASTDATADIR="/usr/lib/asterisk" \
+		ASTKEYDIR="/usr/lib/asterisk" \
+		ASTDBDIR="/usr/lib/asterisk" \
+		NOISY_BUILD="1" \
+		DEBUG="$(DEBUG)" \
+		OPTIMIZE="$(OPTIMIZE)" \
+		DESTDIR="$(PKG_INSTALL_DIR)" \
+		all install samples
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/asterisk-1.8/include/asterisk/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk/*.h $(1)/usr/include/asterisk-1.8/include/asterisk/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/asterisk.h $(1)/usr/include/asterisk-1.8/include/
+endef
+
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
+define Package/asterisk18-mod/conffiles
+/etc/asterisk/asterisk.conf
+/etc/asterisk/modules.conf
+/etc/asterisk/extensions.conf
+/etc/asterisk/sip.conf
+/etc/asterisk/sip_notify.conf
+/etc/asterisk/features.conf
+/etc/asterisk/indications.conf
+/etc/asterisk/logger.conf
+/etc/asterisk/manager.conf
+/etc/asterisk/rtp.conf
+/etc/default/asterisk
+/etc/init.d/asterisk
+endef
+else
+define Package/asterisk18-mod/conffiles
+/etc/default/asterisk
+/etc/init.d/asterisk
+endef
+endif
+
+define Package/asterisk18-mod/install
+	$(INSTALL_DIR) $(1)/etc/asterisk/ssl
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
+	for f in asterisk extensions features \
+		indications logger manager modules \
+		sip sip_notify rtp; do \
+		$(CP) $(PKG_INSTALL_DIR)/etc/asterisk/$$$$f.conf $(1)/etc/asterisk/ ; \
+	done
+endif
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	for f in app_dial app_echo app_playback app_macro \
+		chan_sip res_rtp_asterisk res_rtp_multicast \
+		codec_ulaw codec_gsm \
+		format_gsm format_pcm format_wav format_wav_gsm \
+		pbx_config \
+		func_strings func_timeout func_callerid func_logic; do \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$$$$f.so $(1)/usr/lib/asterisk/modules/ ; \
+	done
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/asterisk $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/default
+	$(INSTALL_DATA)  ./files/asterisk.default $(1)/etc/default/asterisk
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN)  ./files/asterisk.init $(1)/etc/init.d/asterisk
+endef
+
+define Package/asterisk18-mod-sounds/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/* $(1)/usr/lib/asterisk/sounds/
+	rm -f $(1)/usr/lib/asterisk/sounds/vm-*
+	rm -f $(1)/usr/lib/asterisk/sounds/conf-*
+endef
+
+
+define Package/asterisk18-mod-voicemail/conffiles
+/etc/asterisk/voicemail.conf
+endef
+
+define Package/asterisk18-mod-voicemail/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/voicemail.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*voicemail.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_adsi.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_smdi.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/vm-*.gsm $(1)/usr/lib/asterisk/sounds/
+endef
+
+define Package/asterisk18-mod-app-meetme/conffiles
+/etc/asterisk/meetme.conf
+endef
+
+define Package/asterisk18-mod-app-meetme/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/meetme.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_meetme.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/sounds/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/sounds/en/conf-*.gsm $(1)/usr/lib/asterisk/sounds/
+endef
+
+define Package/asterisk18-mod-chan-iax2/conffiles
+/etc/asterisk/iax.conf
+/etc/asterisk/iaxprov.conf
+endef
+
+define Package/asterisk18-mod-cdr/conffiles
+/etc/asterisk/cdr.conf
+/etc/asterisk/cdr_custom.conf
+/etc/asterisk/cdr_manager.conf
+/etc/asterisk/cdr_odbc.conf
+/etc/asterisk/cdr_pgsql.conf
+/etc/asterisk/cdr_tds.conf
+endef
+
+define Package/asterisk18-mod-res-musiconhold/conffiles
+/etc/asterisk/musiconhold.conf
+endef
+
+define Package/asterisk18-mod-chan-iax2/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iax.conf $(1)/etc/asterisk/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/iaxprov.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_iax2.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-cdr/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr*.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/*cdr*.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-musiconhold/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/musiconhold.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_musiconhold.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-voice/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_voice.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-chan-gtalk/conffiles
+/etc/asterisk/gtalk.conf
+/etc/asterisk/jabber.conf
+endef
+
+define Package/asterisk18-mod-chan-gtalk/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/gtalk.conf $(1)/etc/asterisk/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/jabber.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_gtalk.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_jabber.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-chan-mobile/conffiles
+/etc/asterisk/chan_mobile.conf
+endef
+
+define Package/asterisk18-mod-chan-mobile/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/chan_mobile.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mobile.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-timing-timerfd/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_timerfd.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-timing-pthread/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_timing_pthread.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-fax/conffiles
+/etc/asterisk/res_fax.conf
+endef
+
+define Package/asterisk18-mod-res-fax/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_fax.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-fax-spandsp/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_fax_spandsp.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-chan-mgcp/conffiles
+/etc/asterisk/mgcp.conf
+endef
+
+define Package/asterisk18-mod-chan-mgcp/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/mgcp.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_mgcp.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-chan-skinny/conffiles
+/etc/asterisk/skinny.conf
+endef
+
+define Package/asterisk18-mod-chan-skinny/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/skinny.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_skinny.so $(1)/usr/lib/asterisk/modules/
+endef
+
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
+define Package/asterisk18-mod-chan-brcm/conffiles
+/etc/asterisk/brcm.conf
+endef
+endif
+
+define Package/asterisk18-mod-chan-brcm/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+ifneq ($(CONFIG_PACKAGE_voice-client),y)
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/brcm.conf $(1)/etc/asterisk/
+endif
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_brcm.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-curl/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/func_curl.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_curl.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-app-transfer/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_transfer.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-app-softhangup/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_softhangup.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-mysql/conffiles
+/etc/asterisk/app_mysql.conf
+/etc/asterisk/res_config_mysql.conf
+/etc/asterisk/cdr_mysql.conf
+endef
+
+define Package/asterisk18-mod-mysql/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/app_mysql.conf $(1)/etc/asterisk/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/res_config_mysql.conf $(1)/etc/asterisk/
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/cdr_mysql.conf $(1)/etc/asterisk/
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_mysql.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/cdr_mysql.so $(1)/usr/lib/asterisk/modules/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-chan-lantiq/conffiles
+/etc/asterisk/lantiq.conf
+endef
+
+define Package/asterisk18-mod-chan-lantiq/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/asterisk/lantiq.conf $(1)/etc/asterisk/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_lantiq.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-srtp/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-res-stun/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_stun_monitor.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Package/asterisk18-mod-app-queue/install
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/app_queue.so $(1)/usr/lib/asterisk/modules/
+endef
+
+define Buildasterisk18-modModuleTemplate
+
+  define Package/asterisk18-mod-$(subst _,-,$(1))
+  $$(call Package/asterisk18-mod/Default)
+    TITLE:=$(2) support
+    DEPENDS:= asterisk18-mod $(4)
+  endef
+
+  define Package/asterisk18-mod-$(subst _,-,$(1))/description
+  $$(call Package/asterisk18-mod/Default/description)
+    This package provides support $(3) in Asterisk.
+  endef
+
+  define Package/asterisk18-mod-$(subst _,-,$(1))/install
+	$(INSTALL_DIR) $$(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/$(1).so $$(1)/usr/lib/asterisk/modules/
+  endef
+
+  $$(eval $$(call BuildPackage,asterisk18-mod-$(subst _,-,$(1))))
+endef
+
+$(eval $(call BuildPackage,asterisk18-mod))
+$(eval $(call BuildPackage,asterisk18-mod-voicemail))
+$(eval $(call BuildPackage,asterisk18-mod-sounds))
+$(eval $(call BuildPackage,asterisk18-mod-app-meetme))
+$(eval $(call BuildPackage,asterisk18-mod-app-transfer))
+$(eval $(call BuildPackage,asterisk18-mod-app-softhangup))
+$(eval $(call BuildPackage,asterisk18-mod-chan-iax2))
+$(eval $(call BuildPackage,asterisk18-mod-cdr))
+$(eval $(call BuildPackage,asterisk18-mod-res-musiconhold))
+$(eval $(call BuildPackage,asterisk18-mod-res-voice))
+$(eval $(call BuildPackage,asterisk18-mod-chan-gtalk))
+$(eval $(call BuildPackage,asterisk18-mod-chan-mobile))
+$(eval $(call BuildPackage,asterisk18-mod-res-fax))
+$(eval $(call BuildPackage,asterisk18-mod-res-fax-spandsp))
+$(eval $(call BuildPackage,asterisk18-mod-res-timing-timerfd))
+$(eval $(call BuildPackage,asterisk18-mod-res-timing-pthread))
+$(eval $(call BuildPackage,asterisk18-mod-chan-mgcp))
+$(eval $(call BuildPackage,asterisk18-mod-chan-skinny))
+$(eval $(call BuildPackage,asterisk18-mod-chan-brcm))
+$(eval $(call BuildPackage,asterisk18-mod-curl))
+$(eval $(call BuildPackage,asterisk18-mod-mysql))
+$(eval $(call BuildPackage,asterisk18-mod-chan-lantiq))
+$(eval $(call BuildPackage,asterisk18-mod-res-srtp))
+$(eval $(call BuildPackage,asterisk18-mod-res-stun))
+$(eval $(call BuildPackage,asterisk18-mod-app-queue))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_directed_pickup,Directed call pickup,support for directed call pickup))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_exec,Exec application,support for application execution))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_minivm,Minimal voicemail system,a voicemail system in small building blocks working together based on the Comedian Mail voicemail system))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_readexten,Extension to variable,a trivial application to read an extension into a variable))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_read,Variable read,a trivial application to read a variable))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_sayunixtime,Say Unix time,an application to say Unix time))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_sms,SMS,SMS support (ETSI ES 201 912 protocol 1)))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_stack,Stack applications, stack applications Gosub Return etc., +asterisk18-res-agi))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_system,System exec,support for executing system commands))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_talkdetect,File playback with audio detect,for file playback with audio detect))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_waituntil,Sleep,support sleeping until the given epoch))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_while,While loop,a while loop implementation))
+$(eval $(call Buildasterisk18-modModuleTemplate,chan_agent,Agents proxy channel, an implementation of agents proxy channel))
+$(eval $(call Buildasterisk18-modModuleTemplate,chan_local,Local proxy channel, an implementation of local proxy channel))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_alaw,Signed linear to alaw translation,translation between signed linear and alaw codecs))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_ulaw,Signed linear to ulaw translation,translation between signed linear and ulaw codecs))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_a_mu,Alaw to ulaw translation,translation between alaw and ulaw codecs))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_g722,G.722,a high bit rate 48/56/64Kbps ITU standard codec))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_g726,Signed linear to G.726 translation,translation between signed linear and ITU G.726-32kbps codecs))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_ilbc,iLBC,internet Low Bitrate Codec))
+$(eval $(call Buildasterisk18-modModuleTemplate,codec_gsm,GSM,GSM codec))
+$(eval $(call Buildasterisk18-modModuleTemplate,format_g726,G.726,support for headerless G.726 16/24/32/40kbps data format))
+$(eval $(call Buildasterisk18-modModuleTemplate,format_g729,G.729,support for raw headerless G729 data))
+$(eval $(call Buildasterisk18-modModuleTemplate,format_sln,Raw slinear format,support for raw slinear format))
+$(eval $(call Buildasterisk18-modModuleTemplate,format_sln16,Raw slinear 16 format,support for Raw slinear 16 format))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_db,Database interaction,functions for interaction with the database))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_devstate,Blinky lights control,functions for manually controlled blinky lights))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_vmcount,vmcount dialplan,a vmcount dialplan function))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_extstate,Hinted extension state,retrieving the state of a hinted extension for dialplan control))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_global,Global variable,global variable dialplan functions))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_shell,Shell,support for shell execution))
+$(eval $(call Buildasterisk18-modModuleTemplate,pbx_ael,Asterisk Extension Logic,support for symbolic Asterisk Extension Logic))
+$(eval $(call Buildasterisk18-modModuleTemplate,res_ael_share,Shareable AEL code,support for shareable AEL code mainly between internal and external modules))
+$(eval $(call Buildasterisk18-modModuleTemplate,pbx_spool,Call Spool,outgoing call spool support))
+$(eval $(call Buildasterisk18-modModuleTemplate,res_agi,Asterisk Gateway Interface,support for the Asterisk Gateway Interface extension))
+$(eval $(call Buildasterisk18-modModuleTemplate,res_crypto,Provide Crypto,Cryptographic Signature capability))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_alarmreceiver,Alarm receiver,Central Station Alarm receiver for Ademco Contact ID))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_setcallerid,Set callerid,support for setting callerid))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_verbose,Verbose logging,Verbose logging application))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_channel,Channel info,Channel info dialplan function))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_blacklist,Blacklist on callerid,looking up the callerid number and see if it is blacklisted))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_originate,Originate a call,originating an outbound call and connecting it to a specified extension or application))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_uri,URI encoding and decoding,Encodes and decodes URI-safe strings))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_disa,Direct Inward System Access,Direct Inward System Access))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_senddtmf,Send DTMF digits,Sends arbitrary DTMF digits))
+$(eval $(call Buildasterisk18-modModuleTemplate,func_cut,CUT function,CUT function))
+$(eval $(call Buildasterisk18-modModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_playtones,Playtones application,play a tone list))
+$(eval $(call Buildasterisk18-modModuleTemplate,app_record,Record sound file,to record a sound file))

asterisk-1.8.x-mod/files/asterisk.default

@@ -0,0 +1,4 @@
+## startup options for /etc/init.d/asterisk
+
+ENABLE_ASTERISK="yes"
+OPTIONS=""

asterisk-1.8.x-mod/files/asterisk.init

@@ -0,0 +1,57 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=10
+
+USE_PROCD=1
+NAME=asterisk
+PROG=/usr/sbin/asterisk
+DEFAULT=/etc/default/asterisk
+
+init_asterisk() {
+	# do not start asterisk until the
+	# router receives a default route
+	while ! ip r | grep -q default; do
+		sleep 1
+	done
+
+	[ -f $DEFAULT ] && . $DEFAULT
+	[ -d /var/run/asterisk ] || mkdir -p /var/run/asterisk
+	[ -d /var/log/asterisk ] || mkdir -p /var/log/asterisk
+        [ -d /var/spool/asterisk ] || mkdir -p /var/spool/asterisk
+
+        # does the board have a fxs relay?
+        local fxsRelayGpio=$(db -q get hw.board.fxsRelayGpio)
+        if [ "$fxsRelayGpio" != "" ]; then
+                /sbin/brcm_fw_tool set -x $fxsRelayGpio -p 1
+        fi
+}
+
+service_triggers() {
+        procd_add_reload_trigger voice_client
+}
+
+start_service() {
+	init_asterisk
+
+	procd_open_instance
+	procd_set_param command "$PROG" -f
+	procd_set_param respawn
+	procd_close_instance
+#	service_start /usr/sbin/asterisk
+}
+
+reload_service() {
+	asterisk -rx "core reload"
+	asterisk -rx "dialplan reload"
+	asterisk -rx "brcm reload"
+}
+
+restart() {
+	reload
+}
+
+stop_service() {
+        service_stop /usr/sbin/asterisk
+}
+

ated/Makefile

@@ -1,77 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ated
-PKG_VERSION:=1.2.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-# support parallel build
-#PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-#PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ated
-	CATEGORY:=Utilities
-	TITLE:=Daemon for handling wifi calibration
-	URL:=
-	DEPENDS:= libc
-endef
-
-define Package/ated/description
-	Daemon for handling wifi calibration
-endef
-
-#TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/mips/include
-
-MAKE_FLAGS += \
-	v=2 \
-	m=3
-
-
-#TARGET_CPPFLAGS := \
-#	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
-#	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-#	$(TARGET_CPPFLAGS)
-
-# we donot wwant to have any install.
-define Build/Install/Default
-endef
-
-define Package/ated/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ated $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ated))

bashdb/Makefile

@@ -1,65 +0,0 @@
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bashdb
-PKG_VERSION:=4.4-0.92
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-#PKG_SOURCE_URL:=http://sourceforge.net/projects/bashdb/files/bashdb/$(PKG_VERSION)
-PKG_SOURCE_URL:=@SF/bashdb/
-PKG_MD5SUM:=b72c17870bfab2fd791b1f6de4d79f9e
-#PKG_CAT:=zcat
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Bash script debugging utility.
-  URL:=http://sourceforge.net/projects/bashdb/
-endef
-
-define Package/$(PKG_NAME)/description
-  Bash script debugging utility.
-endef
-
-define Build/Compile
-        $(MAKE) -C $(PKG_BUILD_DIR) \
-                $(TARGET_CONFIGURE_OPTS) \
-                CFLAGS="$(TARGET_CFLAGS) -DLINUX $(TARGET_CPPFLAGS) \
-                        -I./src" \
-                LIBS="$(TARGET_LDFLAGS)" \
-                DESTDIR="$(PKG_INSTALL_DIR)"
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bashdb $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/share
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.sh  $(1)/usr/share/$(PKG_NAME)/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.inc  $(1)/usr/share/$(PKG_NAME)/
-
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/init
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/init/*.sh  $(1)/usr/share/$(PKG_NAME)/init/
-
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command/show_sub
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command/set_sub
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/command/info_sub
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/*.sh $(1)/usr/share/$(PKG_NAME)/command/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/show_sub/*.sh $(1)/usr/share/$(PKG_NAME)/command/show_sub/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/set_sub/*.sh $(1)/usr/share/$(PKG_NAME)/command/set_sub/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/command/info_sub/*.sh $(1)/usr/share/$(PKG_NAME)/command/info_sub/
-
-	$(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/lib
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/*.sh $(1)/usr/share/$(PKG_NAME)/lib/
-endef
-
-$(eval $(call BuildPackage,bashdb))

bbf/Config_bbfdm.in

@@ -1,27 +0,0 @@
-if PACKAGE_libbbfdm
-
-config LIBBBFDM_VENDOR_PREFIX
-    string "Vendor Prefix"
-    default "X_IOPSYS_EU_"
-
-config BBF_TR181
-	bool "Compile with tr181 device features"
-	default y
-
-config BBF_TR104
-	bool "Compile with tr104 voice features"
-	default y
-
-config BBF_TR143
-	bool "Compile with tr143 diagnostics features"
-	default y
-
-config BBF_TR157
-	bool "Compile with tr157 bulkdata collector features"
-	default y
-	
-config BBF_TR064
-	bool "Compile with tr064 features"
-	default n
-
-endif

bbf/Makefile

@@ -1,126 +0,0 @@
-#
-# Copyright (C) 2019 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libbbfdm
-PKG_VERSION:=2.6-2020-11-13
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=192a2f48b0d066e182e2bbe193a826487c90f11f
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libbbf_api
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for libbbfdm API
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
-define Package/libbbfdm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls
-endef
-
-define Package/libbbfdm/config
-	source "$(SOURCE)/Config_bbfdm.in"
-endef
-
-define Package/libbbf_api/description
- Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
-endef
-
-define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR104, TR143, TR157 and TR064 data models
-endef
-
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBBBFDM_VENDOR_PREFIX)\\\"
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_BBF_TR181),y)
-CONFIGURE_ARGS += \
-	--enable-tr181
-endif
-
-ifeq ($(CONFIG_BBF_TR104),y)
-CONFIGURE_ARGS += \
-	--enable-tr104
-endif
-
-ifeq ($(CONFIG_BBF_TR143),y)
-CONFIGURE_ARGS += \
-	--enable-tr143
-endif
-
-ifeq ($(CONFIG_BBF_TR157),y)
-CONFIGURE_ARGS += \
-	--enable-tr157
-endif
-
-ifeq ($(CONFIG_BBF_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-tr064
-endif
-
-ifeq ($(CONFIG_PACKAGE_libopenssl),y)
-CONFIGURE_ARGS += \
-	--enable-libopenssl
-endif
-
-ifeq ($(CONFIG_PACKAGE_libmbedtls),y)
-CONFIGURE_ARGS += \
-	--enable-libmbedtls
-endif
-
-define Package/libbbf_api/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
-endef
-
-define Package/libbbfdm/install
-	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/bbfdm
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
-	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbbf_api))
-$(eval $(call BuildPackage,libbbfdm))

bbk_cli/Makefile

@@ -1,42 +0,0 @@
-#
-# Copright (C) 2018 The Internet Foundation In Sweden
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bbk_cli
-PKG_SOURCE_VERSION:=7b810a696c78b746185c11282bdbe3fb7f8c5d4b
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/dotse/bbk.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bbk_cli
-	CATEGORY:=Utilities
-	DEPENDS:=+libpthread +libstdcpp
-	TITLE:=Bredbandskollen CLI - A bandwidth measurement tool
-endef
-
-define Package/bbk_cli/description
-	To measure connection speed in an environment that is missing a web browser, 
-	for example, in a server, you can use our command line interface bbk_cli, 
-	which is available for some of the most common operating systems.
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/src/cli CROSS_COMPILE="$(TARGET_CROSS)"
-endef
-
-define Package/bbk_cli/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/cli/cli $(1)/sbin/bbk_cli
-endef
-
-$(eval $(call BuildPackage,bbk_cli))

bbk_cli/patches/0001-add-openwrt-cross-compile-support.patch

@@ -1,25 +0,0 @@
-diff --git a/src/framework/engine.h b/src/framework/engine.h
-index 57a48ad..9e1bc36 100644
---- a/src/framework/engine.h
-+++ b/src/framework/engine.h
-@@ -10,6 +10,7 @@
- #include <map>
- #include <vector>
- #include <string>
-+#include <sys/select.h>
- 
- #include "logger.h"
- 
-diff --git a/src/framework/mk.inc b/src/framework/mk.inc
-index 793e211..13275be 100644
---- a/src/framework/mk.inc
-+++ b/src/framework/mk.inc
-@@ -7,7 +7,7 @@ OS:=$(shell uname)
- CXXFLAGS += -O2 -W -Wall -I$(DIRLEVEL)
- 
- ifeq ($(OS),Linux)
--CXX = g++
-+CXX = $(CROSS_COMPILE)g++
- endif
- 
- ifeq ($(OS),Darwin)

bluez/Makefile

@@ -0,0 +1,81 @@
+#
+# Copyright (C) 2006-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bluez
+PKG_VERSION:=5.28
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/bluetooth
+PKG_MD5SUM:=bc20a8285530758c68f6a60e4ca62a15
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/bluez
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libpthread +libusb-compat +glib2 +dbus +libreadline $(INTL_DEPENDS) $(ICONV_DEPENDS) 
+  TITLE:=Bluetooth stack new version 
+  URL:=http://www.bluez.org/
+endef
+
+define Package/bluez/conffiles
+/etc/config/bluetooth
+endef
+
+TARGET_LDFLAGS+= \
+                -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libiconv-full/lib \
+
+CONFIGURE_ARGS += \
+		--enable-shared \
+		--disable-cups \
+		--enable-debug \
+		--disable-test \
+		--disable-obex \
+		--disable-systemd \
+		--disable-udev \
+		--enable-tools \
+		--enable-experimental \
+		--enable-library \
+		--disable-static \
+
+define Build/Compile
+    $(MAKE) -C $(PKG_BUILD_DIR) \
+        LDFLAGS="$(TARGET_LDFLAGS) \
+            -L$(ICONV_PREFIX)/lib \
+            -L$(INTL_PREFIX)/lib -lm -lncurses" \
+        DESTDIR="$(PKG_INSTALL_DIR)" \
+        all install
+endef
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include/bluetooth
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/bluetooth/*.h $(1)/usr/include/bluetooth
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libbluetooth.* $(1)/usr/lib/
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/bluez.pc $(1)/usr/lib/pkgconfig/
+endef
+define Package/bluez/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+
+	$(INSTALL_DIR) $(1)/etc/bluetooth
+	$(INSTALL_DIR) $(1)/etc/dbus-1/system.d
+	$(CP)  $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/bluetooth.conf $(1)/etc/dbus-1/system.d/
+
+	$(INSTALL_DIR) $(1)/usr/lib/bluetooth
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/bluetooth/* $(1)/usr/lib/bluetooth
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libblue* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,bluez))

bootchart2/Makefile

@@ -1,46 +0,0 @@
-# 
-# Copyright (C) 2007-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bootchart2
-PKG_VERSION:=0.14.7
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/mmeeks/bootchart.git
-PKG_SOURCE_VERSION:=3ab81137cafe25c2ca4bc3a5f322a63646f9ce8d
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/bootchart2
- SECTION:=base
- CATEGORY:=Utilities
- TITLE:=Bootchart2
- URL:=https://github.com/mmeeks/bootchart
-endef
-
-define Package/bootchart2/description
- Bootchart is a tool for performance analysis and visualization of the GNU/Linux boot process. 
-endef
-
-define Package/bootchart2/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bootchart-collector $(1)/sbin
-	$(CP) ./files/* $(1)/
-endef
-
-
-
-
-$(eval $(call BuildPackage,bootchart2))

bootchart2/files/lib/preinit/11_bootchart

@@ -1,10 +0,0 @@
-
-do_bootchart()
-{
-	[ -f /dev/null ] || mknod /dev/null c 1 3
-	mkdir -p /lib/bootchart/tmpfs
-	echo "starting bootchart"
-	/sbin/bootchart_run_preinit boot &
-}
-
-boot_hook_add preinit_essential do_bootchart

bootchart2/files/lib/preinit/72_bootchart

@@ -1,7 +0,0 @@
-
-bootchart_rootfs_pivot()
-{
-	mount -o move /rom/lib/bootchart/tmpfs /lib/bootchart/tmpfs	
-}
-
-boot_hook_add preinit_mount_root bootchart_rootfs_pivot

bootchart2/files/sbin/bootchart_run_preinit

@@ -1,59 +0,0 @@
- #! /bin/sh
-# this is intended to be started in preinit.
-# 11_bootchart, starts it
-# 72_bootchart, fixup mount point after pivot 
-#
-# program can be killed early with
-# bootchart_run_preinit stop
-
-trap "stop; exit 0;" SIGINT SIGTERM 
-
-STOP_AFTER=250
-HZ=50
-
-if [ -z "$1" ]
-then
-	echo "you need to specify start or stop"
-	exit 1
-fi
-
-start()
-{
-	/sbin/bootchart-collector $HZ &
-}
-
-stop()
-{
-	echo "bootchart DUMP"
-	
-	mkdir /tmp/bootchart
-	/sbin/bootchart-collector --dump /tmp/bootchart
-	cd /tmp/bootchart
-	tar -zcf /tmp/bootchart.tgz header *.log
-	cd /
-	rm -rf /tmp/bootchart
-}
-
-case $1 in
-    boot) # secret option for preinit
-	start
-	sleep $STOP_AFTER
-	# test to see if someone has manually killed us
-	if [ -f /tmp/bootchart.tgz ]
-	then
-	    exit 0
-	fi
-	stop
-	;;
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    *)
-	echo "you need to specify start or stop, not $1"
-	exit 1
-	;;
-esac
-

bootchart2/patches/0001-add_spu_sys_time.patch

@@ -1,40 +0,0 @@
-diff --git a/pybootchartgui/draw.py b/pybootchartgui/draw.py
-index 7c3f60c..5c9f046 100644
---- a/pybootchartgui/draw.py
-+++ b/pybootchartgui/draw.py
-@@ -63,6 +63,7 @@ AXIS_FONT_SIZE = 11
- LEGEND_FONT_SIZE = 12
- 
- # CPU load chart color.
-+CPU_SYS_COLOR = (0.65, 0.13, 0.36, 1.0)
- CPU_COLOR = (0.40, 0.55, 0.70, 1.0)
- # IO wait chart color.
- IO_COLOR = (0.76, 0.48, 0.48, 0.5)
-@@ -300,21 +301,19 @@ def render_charts(ctx, options, clip, trace, curr_y, w, h, sec_w):
- 	# render bar legend
- 	ctx.set_font_size(LEGEND_FONT_SIZE)
- 
--	draw_legend_box(ctx, "CPU (user+sys)", CPU_COLOR, off_x, curr_y+20, leg_s)
--	draw_legend_box(ctx, "I/O (wait)", IO_COLOR, off_x + 120, curr_y+20, leg_s)
-+	draw_legend_box(ctx, "CPU (user)", CPU_COLOR, off_x, curr_y+20, leg_s)
-+	draw_legend_box(ctx, "CPU (sys)", CPU_SYS_COLOR, off_x + 120, curr_y+20, leg_s)
-+	draw_legend_box(ctx, "I/O (wait)", IO_COLOR, off_x + 120 + 120 , curr_y+20, leg_s)
- 
- 	# render I/O wait
- 	chart_rect = (off_x, curr_y+30, w, bar_h)
- 	if clip_visible (clip, chart_rect):
- 		draw_box_ticks (ctx, chart_rect, sec_w)
- 		draw_annotations (ctx, proc_tree, trace.times, chart_rect)
--		draw_chart (ctx, IO_COLOR, True, chart_rect, \
--			    [(sample.time, sample.user + sample.sys + sample.io) for sample in trace.cpu_stats], \
--			    proc_tree, None)
-+		draw_chart (ctx, IO_COLOR, True, chart_rect, [(sample.time, sample.user + sample.sys + sample.io) for sample in trace.cpu_stats], proc_tree, None)
- 		# render CPU load
--		draw_chart (ctx, CPU_COLOR, True, chart_rect, \
--			    [(sample.time, sample.user + sample.sys) for sample in trace.cpu_stats], \
--			    proc_tree, None)
-+		draw_chart (ctx, CPU_SYS_COLOR, True, chart_rect, [(sample.time, sample.user + sample.sys) for sample in trace.cpu_stats], proc_tree, None)
-+		draw_chart (ctx, CPU_COLOR, True, chart_rect, [(sample.time, sample.user ) for sample in trace.cpu_stats], proc_tree, None)
- 
- 	curr_y = curr_y + 30 + bar_h
- 

btle_alarm/Makefile

@@ -0,0 +1,47 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=btle_alarm
+PKG_VERSION:=1.0.6
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=b505d7ae1524a213ca3de7f8ee15a7d51c6bbbd5
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://public.inteno.se:/btle_alarm
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/btle_alarm
+  SECTION:=base
+  CATEGORY:=Utilities
+  TITLE:=Ethernet bridging configuration utility
+  #DESCRIPTION:=This variable is obsolete. use the Package/name/description define instead!
+  URL:=http://btle_alarm.sourceforge.net/
+  DEPENDS:=+bluez +libncurses
+endef
+
+define Package/btle_alarm/description
+ Ethernet bridging configuration utility
+ Manage ethernet bridging; a way to connect networks together to
+ form a larger network.
+endef
+
+define Package/btle_alarm/install
+
+	$(CP) ./files/* $(1)/
+
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/btle_alarm $(1)/sbin/
+
+	$(INSTALL_DIR) $(1)/etc/config/
+	$(INSTALL_DATA) ./files/btle_alarm.conf $(1)/etc/config/btle_alarm
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN)  ./files/etc/init.d/* $(1)/etc/init.d/
+
+endef
+
+$(eval $(call BuildPackage,btle_alarm))

btle_alarm/files/btle_alarm.conf

@@ -0,0 +1,2 @@
+config info 'Device'
+        option mac 'D0:39:72:B6:23:D6'

btle_alarm/files/etc/init.d/btle_alarm

@@ -0,0 +1,29 @@
+#!/bin/sh /etc/rc.common
+#
+# Copyright (C) 2009 OpenWrt.org
+#
+
+START=99
+
+start() {
+        for i in down reset up;do
+            hciconfig hci0 $i
+        done
+        mac=`uci get btle_alarm.Device.mac`
+        if [ $? -eq 0 ];then
+            hcitool lewladd $mac
+        else
+            hcitool lewladd D0:39:72:B6:43:8A
+            hcitool lewladd D0:39:72:B6:18:AA
+        fi
+       sleep 1
+        /sbin/btle_alarm &> /dev/null &
+        echo $! > /tmp/btle_alarm.pid
+}
+
+stop() {
+        hciconfig hci0 down
+        kill -9 `cat /tmp/btle_alarm.pid`
+        rm /tmp/btle_alarm.pid
+        sleep 1
+}

bulkdata/Makefile

@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.0
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
-endef
-
-define Package/$(PKG_NAME)/description
-	BBF BulkData Collection
-endef
-
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/files/etc/config/bulkdata

@@ -1,43 +0,0 @@
-
-config bulkdata 'bulkdata'
-	option enable '0'
-	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
-	option log_level '3'
-
-config profile
-	option profile_id '1'
-	option enable '0'
-	option name ''
-	option nbre_of_retained_failed_reports '0'
-	option protocol 'http'
-	option encoding_type ''
-	option reporting_interval '86400'
-	option time_reference '0'
-	option csv_encoding_field_separator ','
-	option csv_encoding_row_separator '
'
-	option csv_encoding_escape_character '"'
-	option csv_encoding_report_format 'column'
-	option csv_encoding_row_time_stamp 'unix'
-	option json_encoding_report_format 'objecthierarchy'
-	option json_encoding_report_time_stamp 'unix'
-	option http_url ''
-	option http_username ''
-	option http_password ''
-	option http_compression 'none'
-	option http_method 'post'
-	option http_use_date_header '1'
-	option http_retry_enable '0'
-	option http_retry_minimum_wait_interval '5'
-	option http_retry_interval_multiplier '2000'
-	option http_persist_across_reboot '0'
-
-config profile_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-
-config profile_http_request_uri_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-

bulkdata/files/etc/init.d/bulkdatad

@@ -1,34 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Bulkdata Software
-# Copyright (C) 2020 iopsys Software Solutions AB
-# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-
-START=99
-STOP=10
-
-USE_PROCD=1
-PROG="/usr/sbin/bulkdatad"
-
-start_service() {
-	local bulkdata_enable=`uci -q get bulkdata.bulkdata.enable`
-	if [ "$bulkdata_enable" = "1" ]; then
-		procd_open_instance
-		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
-	fi
-}
-
-boot() {
-	start
-}
-
-reload_service() {
-	stop
-	start 
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger bulkdata
-}

bulkdata/src/Makefile

@@ -1,23 +0,0 @@
-PROG = bulkdatad
-LIB = libbulkdata.so
-
-PROG_OBJS = bulkdata.o common.o config.o http.o log.o report.o times.o buci.o
-LIB_OBJS = datamodel.o
-
-PROG_CFLAGS = $(CFLAGS) -Wall -Werror -fPIC
-PROG_LDFLAGS = $(LDFLAGS) -lubus -luci -lubox -ljson-c -lcurl -lblobmsg_json -lbbfdm
-LIB_LDFLAGS = $(LDFLAGS) -lbbf_api
-
-%.o: %.c
-	$(CC) $(PROG_CFLAGS) $(FPIC) -c -o $@ $<
-
-all: $(PROG) $(LIB)
-
-$(PROG): $(PROG_OBJS)
-	$(CC) $(PROG_CFLAGS) -o $@ $^ $(PROG_LDFLAGS)
-
-$(LIB): $(LIB_OBJS)
-	$(CC) $(PROG_CFLAGS) $(LIB_LDFLAGS) -shared -o $@ $^
-
-clean:
-	rm -f *.o $(PROG) $(LIB)

bulkdata/src/buci.c

@@ -1,265 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#include <strings.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <errno.h>
-#include <unistd.h>
-#include <ctype.h>
-
-#include "buci.h"
-
-struct uci_context *uci_ctx = NULL;
-
-int buci_init(void)
-{
-	uci_ctx = uci_alloc_context();
-	if (!uci_ctx) {
-		return -1;
-	}
-	return 0;
-}
-
-int buci_fini(void)
-{
-	if (uci_ctx) {
-		uci_free_context(uci_ctx);
-	}
-
-	return 0;
-}
-
-static bool buci_validate_section(const char *str)
-{
-	if (!*str)
-		return false;
-
-	for (; *str; str++) {
-		unsigned char c = *str;
-
-		if (isalnum(c) || c == '_')
-			continue;
-
-		return false;
-	}
-	return true;
-}
-
-static int buci_init_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *package, char *section, char *option, char *value)
-{
-	memset(ptr, 0, sizeof(struct uci_ptr));
-
-	/* value */
-	if (value) {
-		ptr->value = value;
-	}
-	ptr->package = package;
-	if (!ptr->package)
-		goto error;
-
-	ptr->section = section;
-	if (!ptr->section) {
-		ptr->target = UCI_TYPE_PACKAGE;
-		goto lastval;
-	}
-
-	ptr->option = option;
-	if (!ptr->option) {
-		ptr->target = UCI_TYPE_SECTION;
-		goto lastval;
-	} else {
-		ptr->target = UCI_TYPE_OPTION;
-	}
-
-lastval:
-	if (ptr->section && !buci_validate_section(ptr->section))
-		ptr->flags |= UCI_LOOKUP_EXTENDED;
-
-	return 0;
-
-error:
-	return -1;
-}
-
-struct uci_section *buci_walk_section(char *package, char *section_type, struct uci_section *prev_section)
-{
-	struct uci_ptr ptr;
-	struct uci_element *e;
-	struct uci_section *next_section;
-
-	if (section_type == NULL) {
-		if (prev_section) {
-			e = &prev_section->e;
-			if (e->list.next == &prev_section->package->sections)
-				return NULL;
-			e = container_of(e->list.next, struct uci_element, list);
-			next_section = uci_to_section(e);
-			return next_section;
-		}
-		else {
-			if (buci_init_ptr(uci_ctx, &ptr, package, NULL, NULL, NULL)) {
-				return NULL;
-			}
-			if (uci_lookup_ptr(uci_ctx, &ptr, NULL, true) != UCI_OK) {
-				return NULL;
-			}
-			if (ptr.p->sections.next == &ptr.p->sections)
-				return NULL;
-			e = container_of(ptr.p->sections.next, struct uci_element, list);
-			next_section = uci_to_section(e);
-
-			return next_section;
-		}
-	}
-	else {
-		struct uci_list *ul, *shead = NULL;
-
-		if (prev_section) {
-			ul = &prev_section->e.list;
-			shead = &prev_section->package->sections;
-		}
-		else {
-			if (buci_init_ptr(uci_ctx, &ptr, package, NULL, NULL, NULL)) {
-				return NULL;
-			}
-			if (uci_lookup_ptr(uci_ctx, &ptr, NULL, true) != UCI_OK) {
-				return NULL;
-			}
-			ul = &ptr.p->sections;
-			shead = &ptr.p->sections;
-		}
-		while (ul->next != shead) {
-			e = container_of(ul->next, struct uci_element, list);
-			next_section = uci_to_section(e);
-			if (strcmp(next_section->type, section_type) == 0)
-				return next_section;
-			ul = ul->next;
-		}
-		return NULL;
-	}
-	return NULL;
-}
-
-void buci_print_list(struct uci_list *uh, char **val, char *delimiter)
-{
-	struct uci_element *e;
-	static char buffer[512];
-	char *buf = buffer;
-	*buf = '\0';
-
-	uci_foreach_element(uh, e) {
-		if (*buf) {
-			strcat(buf, delimiter);
-			strcat(buf, e->name);
-		}
-		else {
-			strcpy(buf, e->name);
-		}
-	}
-	*val = buf;
-}
-
-struct uci_element *buci_lookup_list(struct uci_list *list, const char *name)
-{
-	struct uci_element *e;
-
-	uci_foreach_element(list, e) {
-		if (!strcmp(e->name, name))
-			return e;
-	}
-	return NULL;
-}
-
-int uci_lookup_ptr_bysection(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_section *section, char *option, char *value)
-{
-	struct uci_element *e;
-	memset(ptr, 0, sizeof(struct uci_ptr));
-
-	ptr->package = section->package->e.name;
-	ptr->section = section->e.name;
-	ptr->option = option;
-	ptr->value = value;
-	ptr->flags |= UCI_LOOKUP_DONE;
-
-	ptr->p = section->package;
-	ptr->s = section;
-
-	if (ptr->option) {
-		e = buci_lookup_list(&ptr->s->options, ptr->option);
-		if (!e)
-			return UCI_OK;
-		ptr->o = uci_to_option(e);
-		ptr->last = e;
-		ptr->target = UCI_TYPE_OPTION;
-	}
-	else {
-		ptr->last = &ptr->s->e;
-		ptr->target = UCI_TYPE_SECTION;
-	}
-
-	ptr->flags |= UCI_LOOKUP_COMPLETE;
-
-	return UCI_OK;
-}
-
-char *buci_get_value_bysection(struct uci_section *section, char *option)
-{
-	struct uci_ptr ptr;
-	char *val = "";
-
-	if (uci_lookup_ptr_bysection(uci_ctx, &ptr, section, option, NULL) != UCI_OK) {
-		return val;
-	}
-
-	if (!ptr.o)
-		return val;
-
-	if(ptr.o->type == UCI_TYPE_LIST) {
-		buci_print_list(&ptr.o->v.list, &val, " ");
-		return val;
-	}
-
-	if (ptr.o->v.string)
-		return ptr.o->v.string;
-	else
-		return val;
-}
-
-char *buci_get_value(char *package, char *section, char *option)
-{
-	struct uci_ptr ptr;
-	char *val = "";
-
-	if (!section || !option)
-		return val;
-
-	if (buci_init_ptr(uci_ctx, &ptr, package, section, option, NULL)) {
-		return val;
-	}
-	if (uci_lookup_ptr(uci_ctx, &ptr, NULL, true) != UCI_OK) {
-		return val;
-	}
-
-	if (!ptr.o)
-		return val;
-
-	if(ptr.o->type == UCI_TYPE_LIST) {
-		buci_print_list(&ptr.o->v.list, &val, " ");
-		return val;
-	}
-
-	if (ptr.o->v.string)
-		return ptr.o->v.string;
-	else
-		return val;
-}

bulkdata/src/buci.h

@@ -1,31 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __BUCI_H
-#define __BUCI_H
-
-#include <uci.h>
-
-int buci_init(void);
-int buci_fini(void);
-struct uci_section *buci_walk_section(char *package, char *section_type, struct uci_section *prev_section);
-void buci_print_list(struct uci_list *uh, char **val, char *delimiter);
-struct uci_element *buci_lookup_list(struct uci_list *list, const char *name);
-int uci_lookup_ptr_bysection(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_section *section, char *option, char *value);
-char *buci_get_value_bysection(struct uci_section *section, char *option);
-char *buci_get_value(char *package, char *section, char *option);
-
-#define buci_foreach_section(package, section_type, section) \
-	for (section = buci_walk_section(package, section_type, NULL); \
-		section != NULL; \
-		section = buci_walk_section(package, section_type, section))
-
-#endif //__BUCI_H

bulkdata/src/bulkdata.c

@@ -1,144 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <libubox/uloop.h>
-
-#include "http.h"
-#include "config.h"
-#include "log.h"
-#include "common.h"
-#include "report.h"
-#include "times.h"
-#include "bulkdata.h"
-
-struct bulkdata bulkdata_main = {0};
-int profiles_number = 0;
-
-void bulkdata_profile_cb(struct uloop_timeout *timeout);
-
-int get_retry_period(int min)
-{
-        srand(time(NULL));
-        return rand()%min + min;
-}
-
-static void bulkdata_run_profiles(struct bulkdata *bulkdata)
-{
-	unsigned int next_period;
-	int i = 0;
-
-	for (i = 0; i < profiles_number; i++) {
-		bulkdata->profile[i].utimer.cb = bulkdata_profile_cb;
-		LIST_HEAD(failedreports);
-		bulkdata->profile[i].failed_reports = &failedreports;
-		next_period = get_next_period(bulkdata->profile[i].time_reference, bulkdata->profile[i].reporting_interval);
-		bulkdata_log(SINFO, "The session of profile_id %d will be start in %d sec", bulkdata->profile[i].profile_id, next_period);
-		uloop_timeout_set(&bulkdata->profile[i].utimer, next_period * 1000);
-	}
-}
-
-int http_send_report(struct profile *profile, char *report)
-{
-	char *msg_in = NULL;
-	int http_code;
-
-	http_client_init(profile);
-	bulkdata_log(SINFO, "Send the report of profile_id %d to Bulkdata Collector", profile->profile_id);
-	http_code = http_send_message(profile, report, strlen(report), &msg_in);
-	http_client_exit();
-	return http_code;
-}
-
-void bulkdata_profile_cb(struct uloop_timeout *timeout)
-{
-	struct profile *profile;
-	unsigned int http_code, retry_period;
-	char *report = NULL;
-
-	profile = container_of(timeout, struct profile, utimer);
-	time_t now = time(NULL);
-
-	bulkdata_log(SINFO, "New session of profile_id %d started", profile->profile_id);
-	if(profile->retry_count == 0 || profile->next_retry > now || !profile->http_retry_enable) //Perdiodic execution
-		create_encoding_bulkdata_report(profile, &report);
-	else
-		create_failed_report(profile, &report);
-
-	bulkdata_log(SDEBUG, "The content of the profile_id report %d is :\n==========\n%s\n==========\n", profile->profile_id, report);
-	http_code= http_send_report(profile, report);
-	if(http_code != 200){
-		if(profile->retry_count == 0 || profile->next_retry > now || !profile->http_retry_enable) {  //Perdiodic execution
-			retry_period = get_retry_period(profile->http_retry_minimum_wait_interval);
-			profile->next_period = now + profile->reporting_interval;
-			profile->next_retry = now + retry_period;
-			profile->retry_count = 1;
-			profile->min_retry = profile->http_retry_minimum_wait_interval * 2;
-			if((profile->next_retry < profile->next_period) && profile->http_retry_enable) {
-				bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, retry_period);
-				uloop_timeout_set(timeout, 1000 * retry_period);
-			}
-			else {
-				bulkdata_log(SINFO, "Start New session of profile_id %d in %d sec", profile->profile_id, profile->reporting_interval);
-				uloop_timeout_set(timeout, 1000 * profile->reporting_interval);
-			}
-		} else { //Retry execution
-			retry_period= get_retry_period(profile->min_retry);
-			profile->min_retry*=2;
-			profile->next_retry+=retry_period;
-			profile->retry_count++;
-			if(profile->next_retry < profile->next_period) {
-				bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, retry_period);
-				uloop_timeout_set(timeout, 1000 * retry_period);
-			}
-			else {
-				bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, (profile->next_period-profile->next_retry+retry_period));
-				uloop_timeout_set(timeout, 1000 * (profile->next_period-profile->next_retry+retry_period));
-			}
-		}
-		if(profile->new_report){
-			bulkdata_add_failed_report(profile, profile->new_report);
-			FREE(profile->new_report);
-		}
-		FREE(report);
-	} else {
-		if(profile->retry_count == 0 || profile->next_retry > now || !profile->http_retry_enable) {
-			bulkdata_log(SINFO, "Start New session of profile_id %d in %d sec", profile->profile_id, profile->reporting_interval);
-			uloop_timeout_set(timeout, 1000 * profile->reporting_interval);
-		}
-		else {
-			bulkdata_log(SINFO, "Retry session of profile_id %d in %d sec", profile->profile_id, (profile->next_period-profile->next_retry));
-			uloop_timeout_set(timeout, 1000 * (profile->next_period-profile->next_retry));
-		}
-		FREE(profile->new_report);
-		FREE(report);
-		empty_failed_reports_list(profile);
-		profile->retry_count= 0;
-	}
-}
-
-int main(void)
-{
-	struct bulkdata *bulkdata = &bulkdata_main;
-	if (bulkdata_config_init(bulkdata) == -1)
-		return -1;
-	bulkdata_log(SINFO, "Start bulkdatad daemon");
-	
-	uloop_init();
-	bulkdata_run_profiles(bulkdata);
-	uloop_run();
-	uloop_done();
-
-	bulkdata_config_fini(bulkdata);
-	bulkdata_log(SINFO, "Stop bulkdatad daemon");
-	return 0;
-}

bulkdata/src/bulkdata.h

@@ -1,18 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __BULKDATA_H
-#define __BULKDATA_H
-
-extern struct bulkdata bulkdata_main;
-extern int profiles_number;
-
-#endif /* __BULKDATA_H */

bulkdata/src/bulkdata.md

@@ -1,105 +0,0 @@
-# README #
-
-bulkdatad is an implementation of The HTTP bulk data collection mechanism which is an extended feature of CPE and other agents implementing TR-069(CWMP) or TR-369(USP), defined by the Broadband Forum. It provides a means by which an Auto-Configuration Server (ACS), or USP Controller, can configure an agent to periodically send a JSON or CSV formatted set of Device information to an HTTP server running a data collection application.
-
-## Configuration File ##
-
-The bulkdatad UCI configuration is located in **'/etc/config/bulkdata'**, and contains 4 sections: **bulkdata**, **profile**, **profile\_parameter** and **profile\_http\_request\_uri\_parameter**.
-
-```
-config bulkdata 'bulkdata'
-	option enable '0'
-	option log_level '3'
-
-config profile
-	option profile_id '1'
-	option enable '0'
-	option csv_encoding_row_time_stamp 'unix'
-	option json_encoding_report_time_stamp 'unix'
-	option http_retry_minimum_wait_interval '5'
-	option http_retry_interval_multiplier '2000'
-
-config profile_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-
-config profile_http_request_uri_parameter
-	option profile_id '1'
-	option name ''
-	option reference ''
-```
-
-### bulkdata section ###
-
-It defines **bulkdata configuration**: enable and log\_level.
-
-| Name        |  Type   | Description                                                                                     |
-| ----------- | ------- | ----------------------------------------------------------------------------------------------- |
-| `enable`    | boolean | Enables the BulkData feature if set to **1**.                                                     |
-| `log_level` | integer | Specifies the log type to use, by default **'INFO'**. The possible types are **'EMERG', 'ALERT', 'CRITIC' ,'ERROR', 'WARNING', 'NOTICE', 'INFO' and 'DEBUG'**. |
-
-### profile section ###
-
-It defines **the profile section configuration**: enable, name,... The possible options for **profile** section are listed below:
-
-| Name                               |  Type   | Description                                    |
-| ---------------------------------- | ------- | ---------------------------------------------- |
-| `profile_id`                       | integer | The profile id to use. |
-| `enable`                           | boolean | If set to **1**, enables the bulkdata profile. |
-| `name`                             | string  | The name of the profile. |
-| `nbre_of_retained_failed_reports`  | integer | The number of failed reports to be retained and transmitted at the end of the current reporting interval. |
-| `protocol`                         | string  | The protocol used for the collection profile. |
-| `encoding_type`                    | string  | The encoding type used for the collection profile. |
-| `reporting_interval`               | integer | The reporting interval in seconds. |
-| `time_reference`                   | integer | The time reference to determine when the profile will be transmitted to the ACS collector. |
-| `csv_encoding_field_separator`     | string  | The field separator to use when encoding CSV data. |
-| `csv_encoding_row_separator`       | string  | The row separator to use when encoding CSV data. |
-| `csv_encoding_escape_character`    | string  | The escape character to use when encoding CSV data. |
-| `csv_encoding_report_format`       | string  | Describes how reports will be formatted. Two possible formats are supported: **'ParameterPerRow' and 'ParameterPerColumn'**. |
-| `csv_encoding_row_time_stamp`      | string  | The format of the timestamp to use for data inserted into the row. The row time stamp supported are **'Unix-Epoch', 'ISO-8601' and 'None'**. |
-| `json_encoding_report_format`      | string  | Describes the report format. The supported report formats are **'ObjectHierarchy' and 'NameValuePair'**. |
-| `json_encoding_report_time_stamp`  | string  | The format of the timestamp to use for the JSON Object named "CollectionTime". The supported timestamp are **'Unix-Epoch', 'ISO-8601' and 'None'**. |
-| `http_url`                         | string  | The URL of the collection server. |
-| `http_username`                    | string  | The username of the collection server. |
-| `http_password`                    | string  | The password of the collection server. |
-| `http_compression`                 | string  | The HTTP Compression mechanism used by the collection server. The supported compression mechanism are **'GZIP', 'Compress' and 'Deflate'**. |
-| `http_method`                      | string  | The HTTP method used by the collection server. Two methods are supported: **'POST' and 'PUT'**. |
-| `http_use_date_header`             | boolean | If set to **1**, the CPE encodes the HTTP Date Header. |
-| `http_retry_enable`                | boolean | If set to **1**, the CPE retries unsuccessful attempts to transfer data. |
-| `http_retry_minimum_wait_interval` | integer | The data transfer retry wait interval. |
-| `http_retry_interval_multiplier`   | integer | The retry interval multiplier. |
-| `http_persist_across_reboot`       | boolean | If set to **1**, failed data transfers must be persisted across reboots. |
-
-### profile_parameter section ###
-
-It defines **the profile\_parameter section configuration**: profile\_id, name, reference.
-
-| Name         |  Type   | Description                             |
-| ------------ | ------- | --------------------------------------- |
-| `profile_id` | integer | The id of the used profile.             |
-| `name`       | string  | The name of the profile parameter.      |
-| `reference`  | string  | The reference of the profile parameter. |
-
-### profile_http_request_uri_parameter section ###
-
-It defines **the profile\_http\_request\_uri\_parameter section configuration**: profile\_id, name, reference.
-
-| Name         |  Type   | Description                             |
-| ------------ | ------- | --------------------------------------- |
-| `profile_id` | integer | The id of the used profile.             |
-| `name`       | string  | The name of the Request-URI parameter.  |
-| `reference`  | string  | The reference of the profile parameter. |
-
-## Dependencies ##
-
-To successfully build bulkdatad, the following libraries are needed:
-
-| Dependency  | Link                                        | License        |
-| ----------- | ------------------------------------------- | -------------- |
-| libuci      | https://git.openwrt.org/project/uci.git     | LGPL 2.1       |
-| libubox     | https://git.openwrt.org/project/libubox.git | BSD            |
-| libjson-c   | https://s3.amazonaws.com/json-c_releases    | MIT            |
-| libcurl     | https://dl.uxnr.de/mirror/curl              | MIT            |
-| libbbfdm    | https://dev.iopsys.eu/iopsys/bbf.git        | LGPL 2.1       |
-

bulkdata/src/common.c

@@ -1,450 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include "common.h"
-
-static pathnode *head = NULL;
-static pathnode *temphead = NULL;
-
-int bulkdata_dm_ctx_init(struct dmctx *ctx)
-{
-	struct bulkdata *bulkdata = &bulkdata_main;
-	dm_ctx_init(ctx, DM_CWMP, bulkdata->amd_version, bulkdata->instance_mode);
-	return 0;
-}
-
-int bulkdata_dm_ctx_clean(struct dmctx *ctx)
-{
-	dm_ctx_clean(ctx);
-	return 0;
-}
-
-static char **str_split(const char* str, const char* delim, size_t* numtokens)
-{
-	char *s = strdup(str);
-	size_t tokens_alloc = 1;
-	size_t tokens_used = 0;
-	char **tokens = calloc(tokens_alloc, sizeof(char*));
-	char *token, *strtok_ctx;
-	for (token = strtok_r(s, delim, &strtok_ctx); token != NULL; token = strtok_r(NULL, delim, &strtok_ctx)) {
-		if (tokens_used == tokens_alloc) {
-			tokens_alloc *= 2;
-			tokens = realloc(tokens, tokens_alloc * sizeof(char*));
-		}
-		tokens[tokens_used++] = strdup(token);
-	}
-	// cleanup
-	if (tokens_used == 0) {
-		FREE(tokens);
-	} else {
-		tokens = realloc(tokens, tokens_used * sizeof(char*));
-	}
-	*numtokens = tokens_used;
-	FREE(s);
-	return tokens;
-}
-
-static bool bulkdata_match(const char *string, const char *pattern)
-{
-	regex_t re;
-	if (regcomp(&re, pattern, REG_EXTENDED) != 0) return 0;
-	int status = regexec(&re, string, 0, NULL, 0);
-	regfree(&re);
-	if (status != 0) return false;
-	return true;
-}
-
-static bool is_res_required(char *str, int *start, int *len)
-{
-	char temp_char[NAME_MAX] = {'\0'};
-
-	if (bulkdata_match(str, GLOB_CHAR)) {
-		int s_len = strlen(str);
-		int b_len = s_len, p_len = s_len;
-
-		char *star = strchr(str, '*');
-		if(star)
-			s_len = star - str;
-		*start = MIN(MIN(s_len, p_len), b_len);
-		if (*start == s_len)
-			*len = 1;
-
-		strncpy(temp_char, str+*start, *len);
-
-		if (bulkdata_match(temp_char, "[*+]+"))
-			return true;
-	}
-	*start = strlen(str);
-	return false;
-}
-
-static void insert(char *data, bool active)
-{
-	pathnode *link = (pathnode*) calloc(1, sizeof(pathnode));
-	if(!link) {
-		return;
-	}
-
-	link->ref_path = data;
-
-	if(active) {
-		link->next = head;
-		head = link;
-	} else {
-		link->next = temphead;
-		temphead = link;
-	}
-}
-
-static void swap_heads(void)
-{
-	pathnode *temp = head;
-	head = temphead;
-	temphead = temp;
-}
-
-static void deleteList(void)
-{
-	pathnode *ptr = head, *temp;
-	while(ptr != NULL) {
-		temp = ptr;
-		free(ptr->ref_path);
-		if(ptr->next != NULL) {
-			ptr = ptr->next;
-		} else {
-			ptr = NULL;
-		}
-		free(temp);
-	}
-	head = NULL;
-	swap_heads();
-}
-
-void bulkdata_add_data_to_list(struct list_head *dup_list, char *name, char *value, char *type)
-{
-	struct resultsnode *link;
-	link = calloc(1, sizeof(struct resultsnode));
-	list_add_tail(&link->list, dup_list);
-	link->name = strdup(name);
-	link->data = strdup(value);
-	link->type = strdup(type);
-}
-
-void bulkdata_delete_data_from_list(struct resultsnode *link)
-{
-	list_del(&link->list);
-	FREE(link->name);
-	FREE(link->data);
-	FREE(link->type);
-	FREE(link);
-}
-
-void bulkdata_free_data_from_list(struct list_head *dup_list)
-{
-	struct resultsnode *link;
-	while (dup_list->next != dup_list) {
-		link = list_entry(dup_list->next, struct resultsnode, list);
-		bulkdata_delete_data_from_list(link);
-	}
-}
-
-static bool bulkdata_get(int operation, char *path, struct dmctx *dm_ctx)
-{
-	int fault = 0;
-
-	switch(operation) {
-		case CMD_GET_NAME:
-			fault = dm_entry_param_method(dm_ctx, CMD_GET_NAME, path, "true", NULL);
-			break;
-		case CMD_GET_VALUE:
-			fault = dm_entry_param_method(dm_ctx, CMD_GET_VALUE, path, NULL, NULL);
-			break;
-		default:
-			return false;
-	}
-
-	if (dm_ctx->list_fault_param.next != &dm_ctx->list_fault_param) {
-		return false;
-	}
-	if (fault) {
-		return false;
-	}
-	return true;
-}
-
-char *bulkdata_get_value_param(char *path)
-{
-	struct dmctx ctx = {0};
-	struct dm_parameter *n;
-	char *value = NULL;
-
-	bulkdata_dm_ctx_init(&ctx);
-	if(bulkdata_get(CMD_GET_VALUE, path, &ctx)) {
-		list_for_each_entry(n, &ctx.list_parameter, list) {
-			value = strdup(n->data);
-			break;
-		}
-	}
-	bulkdata_dm_ctx_clean(&ctx);
-	return value;
-}
-
-void bulkdata_get_value(char *path, struct list_head *list)
-{
-	struct dmctx ctx = {0};
-	struct dm_parameter *n;
-
-	bulkdata_dm_ctx_init(&ctx);
-	if(bulkdata_get(CMD_GET_VALUE, path, &ctx)) {
-		list_for_each_entry(n, &ctx.list_parameter, list) {
-			bulkdata_add_data_to_list(list, n->name, n->data, n->type);
-		}
-	}
-	bulkdata_dm_ctx_clean(&ctx);
-}
-
-bool bulkdata_get_name(char *path)
-{
-	struct dmctx ctx = {0};
-	struct dm_parameter *n;
-	bool ret = false;
-
-	bulkdata_dm_ctx_init(&ctx);
-	if(bulkdata_get(CMD_GET_NAME, path, &ctx)) {
-		list_for_each_entry(n, &ctx.list_parameter, list) {
-			insert(strdup(n->name), false);
-		}
-		ret = true;
-	}
-	bulkdata_dm_ctx_clean(&ctx);
-	return ret;
-}
-
-static void fill_node_path(void)
-{
-	pathnode *p=head;
-	while(p!=NULL) {
-		bulkdata_get_name(p->ref_path);
-		p=p->next;
-	}
-	deleteList();
-}
-
-static void bulkdata_filter_results(char *path, int start, int end)
-{
-	int startpos = start, m_index = 0, m_len = 0;
-	char *pp = path + startpos;
-	char exp[NAME_MAX] = {'\0'};
-
-	if(start >= end) {
-		return;
-	}
-
-	if(!is_res_required(pp, &m_index, &m_len)) {
-		//append rest of the path to the final list
-		if(pp == path ) {
-			insert(strdup(pp), true);
-			return;
-		}
-
-		pathnode *p = head;
-		while(p != NULL) {
-			char name[NAME_MAX] = {'\0'};
-			strcpy(name, p->ref_path);
-			strcat(name, pp);
-			insert(strdup(name), false);
-			p = p->next;
-		}
-		deleteList();
-		return;
-	}
-
-	// Get the string before the match
-	char name[NAME_MAX]={'\0'};
-	strncpy(name, pp, m_index);
-
-	pathnode *p = head;
-	if(p == NULL) {
-		insert(strdup(name), false);
-	}
-
-	while(p != NULL) {
-		char ref_name[NAME_MAX] = {'\0'};
-		sprintf(ref_name, "%s%s", p->ref_path, name);
-		insert(strdup(ref_name), false);
-		p = p->next;
-	}
-	deleteList();
-
-	startpos += m_index;
-	strncpy(exp, pp+m_index, m_len);
-	pp = path + startpos;
-	fill_node_path();
-	startpos += 2;
-	bulkdata_filter_results(path, startpos, end);
-}
-
-static void bulkdata_parse_results(struct list_head *list)
-{
-	pathnode *p = head;
-	while(p != NULL) {
-		bulkdata_get_value(p->ref_path, list);
-		p = p->next;
-	}
-	deleteList();
-}
-
-void bulkdata_get_value_results(char *path, struct list_head *list)
-{
-	bulkdata_filter_results(path, 0, strlen(path));
-	bulkdata_parse_results(list);
-}
-
-char *create_request_url(struct profile *profile)
-{
-	int i = 0, http_uri_number = profile->profile_http_request_uri_parameter_number;
-	char *value, *uri_param = NULL, *uri_tmp = NULL, *http_url = NULL; 
-
-	for (i = 0; i < http_uri_number; i++)
-	{
-		if((profile->profile_http_uri_parameter[i].reference == NULL) || (profile->profile_http_uri_parameter[i].name == NULL))
-			continue;
-		value = bulkdata_get_value_param(profile->profile_http_uri_parameter[i].reference);
-		if(!uri_param) {
-			asprintf(&uri_param, "&%s=%s", profile->profile_http_uri_parameter[i].name, value);
-			free(value);
-		}
-		else {
-			uri_tmp = strdup(uri_param);
-			free(uri_param);
-			asprintf(&uri_param, "%s&%s=%s", uri_tmp, profile->profile_http_uri_parameter[i].name, value);
-			free(value);
-			free(uri_tmp);
-		}
-	}
-	if(uri_param) {
-		asprintf(&http_url, "%s%s", profile->http_url, uri_param);
-		free(uri_param);
-	} else {
-		asprintf(&http_url, "%s", profile->http_url);
-	}
-	return http_url;
-}
-
-char *get_bulkdata_profile_parameter_name(char *paramref, char *paramname, char *param)
-{
-	char **paramarr, *idx1 = NULL, *idx2 = NULL, *res = NULL, *instance = NULL, *tmp = NULL, *retparam = NULL, *s = NULL;
-	int i, j = 0;
-	size_t length;
-
-	if(paramname == NULL || strlen(paramname) <= 0)
-		return strdup(param);
-	paramarr = str_split(paramref, "*", &length);
-	res = strdup(paramname);
-	for(i = 0; i < length; i++) {
-		if(i == length - 1)
-			break;
-		j++;
-		idx1 = strstr(param, paramarr[i]);
-		idx2 = strstr(param, paramarr[i+1]);
-		instance = (char*)calloc(idx2 - idx1 - strlen(paramarr[i]) + 1, sizeof(char));
-		memcpy(instance, idx1 + strlen(paramarr[i]), idx2 - idx1 - strlen(paramarr[i]));
-		tmp = strdup(res);
-		FREE(res);
-		asprintf(&res, "%s.%s", tmp, instance);
-		FREE(tmp);
-		FREE(instance);
-	}
-	if ((s = strstr(param,paramarr[j]) ) != NULL && strlen(s) == strlen(paramarr[j]))
-		asprintf(&retparam, "%s", res);
-	else
-		asprintf(&retparam, "%s.%s", res, strstr(param, paramarr[j]) + strlen(paramarr[j]));
-
-	FREE(res);
-	for(int k = 0; k < length; k++)
-		FREE(paramarr[k]);
-	FREE(paramarr);
-
-	return retparam;
-}
-
-void append_string_to_string(char *strappend, char **target)
-{
-	char *tmp = NULL;
-
-	if(strappend == NULL || strlen(strappend) <= 0)
-		return;
-	if(*target == NULL || strlen(*target) <= 0) {
-		*target = strdup(strappend);
-		return;
-	} else {
-		tmp = strdup(*target);
-		FREE(*target);
-	}
-	asprintf(target, "%s%s", tmp, strappend);
-	FREE(tmp);
-}
-
-void bulkdata_add_failed_report(struct profile *profile, char *freport)
-{
-	struct failed_reports *report, *retreport, *rtmp;
-
-	if(profile->nbre_failed_reports < profile->nbre_of_retained_failed_reports || profile->nbre_of_retained_failed_reports < 0) {
-		profile->nbre_failed_reports++;
-	} else {
-		list_for_each_entry_safe(retreport, rtmp, profile->failed_reports, list) {
-			bulkdata_delete_failed_report(retreport);
-			break;
-		}
-	}
-	report = calloc(1, sizeof(struct failed_reports));
-	list_add_tail(&report->list, profile->failed_reports);
-	report->freport= strdup(freport);
-}
-
-void bulkdata_delete_failed_report(struct failed_reports *report)
-{
-	if(report != NULL) {
-		list_del(&report->list);
-		FREE(report->freport);
-		FREE(report);
-	}
-}
-
-struct failed_reports* empty_failed_reports_list(struct profile *profile)
-{
-	struct failed_reports *report, *rtmp;
-
-	if(list_empty(profile->failed_reports))
-		return NULL;
-	list_for_each_entry_safe(report, rtmp, profile->failed_reports, list) {
-		list_del(&report->list);
-		FREE(report->freport);
-		FREE(report);
-	}
-	return NULL;
-}
-
-void add_failed_reports_to_report_csv(struct profile *profile, char **report, int isnext)
-{
-	struct failed_reports *retreport = NULL;
-	int j = 0;
-
-	if(list_empty(profile->failed_reports))
-		return;
-	list_for_each_entry(retreport, profile->failed_reports, list) {
-		if(!j && isnext) {
-			j = 1;
-			continue;
-		}
-		append_string_to_string(retreport->freport, report);
-	}
-}

bulkdata/src/common.h

@@ -1,69 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __COMMON_H
-#define __COMMON_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <regex.h>
-#include <sys/param.h>
-
-#include <libubox/blobmsg.h>
-#include <libubox/blobmsg_json.h>
-#include <libubox/utils.h>
-#include <libubus.h>
-
-#include <libbbfdm/dmentry.h>
-#include <libbbfdm/dmbbfcommon.h>
-
-#include "config.h"
-#include "log.h"
-#include "bulkdata.h"
-
-typedef struct pathnode {
-	char *ref_path;
-	struct pathnode *next;
-} pathnode;
-
-typedef struct resultsnode {
-	struct list_head list;
-	char *name;
-	char *data;
-	char *type;
-} resultsnode;
-
-struct failed_reports {
-	struct list_head list;
-	char *freport;
-};
-
-#define GLOB_CHAR "[[+*]+"
-
-int bulkdata_dm_ctx_init(struct dmctx *ctx);
-int bulkdata_dm_ctx_clean(struct dmctx *ctx);
-
-char *bulkdata_get_value_param(char *path);
-void bulkdata_get_value(char *path, struct list_head *list);
-
-void bulkdata_free_data_from_list(struct list_head *dup_list);
-void bulkdata_get_value_results(char *path, struct list_head *list);
-char *create_request_url(struct profile *profile);
-char *get_bulkdata_profile_parameter_name(char *paramref, char *paramname, char *param);
-void append_string_to_string(char *strappend, char **target);
-void bulkdata_add_failed_report(struct profile *profile, char *freport);
-void bulkdata_delete_failed_report(struct failed_reports *report);
-
-struct failed_reports *empty_failed_reports_list(struct profile *profile);
-void add_failed_reports_to_report_csv(struct profile *profile, char **report, int isnext);
-
-#endif //__COMMON_H

bulkdata/src/config.c

@@ -1,524 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include <stdio.h>
-#include <strings.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <libbbfdm/deviceinfo.h>
-
-#include "log.h"
-#include "config.h"
-#include "buci.h"
-#include "common.h"
-#include "bulkdata.h"
-
-int get_log_level_config(struct bulkdata *bulkdata)
-{
-	char *value = NULL;
-
-	buci_init();
-	value = buci_get_value("bulkdata", "bulkdata", "log_level");
-	if(value != NULL && *value != '\0')
-		bulkdata->log_level = atoi(value);
-	else
-		bulkdata->log_level = DEFAULT_LOGLEVEL;
-	bulkdata_log(SDEBUG,"Log Level of Bulkdata is : %d", bulkdata->log_level);
-	buci_fini();
-	return 0;
-}
-
-int get_amd_version_config(struct bulkdata *bulkdata)
-{
-	char *value = NULL;
-
-	buci_init();
-	value = buci_get_value("cwmp", "cpe", "amd_version");
-	if(value != NULL && *value != '\0')
-		bulkdata->amd_version = atoi(value);
-	else
-		bulkdata->amd_version = DEFAULT_AMD_VERSION;
-	bulkdata_log(SDEBUG,"CWMP Amendment Version is : %d", bulkdata->amd_version);
-	buci_fini();
-	return 0;
-}
-
-int get_instance_mode_config(struct bulkdata *bulkdata)
-{
-	char *value = NULL;
-
-	buci_init();
-	value = buci_get_value("cwmp", "cpe", "instance_mode");
-	if(value != NULL && *value != '\0') {
-		if(!strcmp(value, "InstanceNumber"))
-			bulkdata->instance_mode = INSTANCE_MODE_NUMBER;
-		else
-			bulkdata->instance_mode = INSTANCE_MODE_ALIAS;
-	}
-	else
-		bulkdata->instance_mode = DEFAULT_INSTANCE_MODE;
-	bulkdata_log(SDEBUG,"CWMP Instance Mode is : %d", bulkdata->instance_mode);
-	buci_fini();
-
-	return 0;
-}
-
-int get_device_id_config(struct bulkdata *bulkdata)
-{
-	struct dmctx dmctx = {0};
-
-	bulkdata_dm_ctx_init(&dmctx);
-	bulkdata->device_id.manufacturer_oui = strdup(get_deviceid_manufactureroui());
-	bulkdata->device_id.product_class = strdup(get_deviceid_productclass());
-	bulkdata->device_id.serial_number = strdup(get_deviceid_serialnumber());
-	bulkdata_dm_ctx_clean(&dmctx);
-
-	return 0;
-}
-
-int load_profile_config(struct bulkdata *bulkdata, struct uci_section *s, int i)
-{
-	char *value = NULL;
-
-	value = buci_get_value_bysection(s, "profile_id");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_id = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The profile_id of profile_id %d is : %d", i, bulkdata->profile[i].profile_id);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "nbre_of_retained_failed_reports");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].nbre_of_retained_failed_reports = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The nombre of retained failed reports of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].nbre_of_retained_failed_reports);
-	}
-
-	value = buci_get_value_bysection(s, "protocol");
-	if(value != NULL && *value != '\0' && strcasecmp(value, "http")==0) {
-		bulkdata->profile[i].protocol = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The protocol of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].protocol);
-	} else
-		return -1;
-	
-	value = buci_get_value_bysection(s, "encoding_type");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].encoding_type = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The encoding type of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].encoding_type);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "reporting_interval");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].reporting_interval = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The reporting interval of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].reporting_interval);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "time_reference");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].time_reference = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The time reference of profile_id %d is : %ld", bulkdata->profile[i].profile_id, bulkdata->profile[i].time_reference);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_field_separator");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_field_separator = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding field separator of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_field_separator);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_row_separator");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_row_separator = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding row separator of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_row_separator);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_escape_character");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_escape_character = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding escape character of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_escape_character);
-	}
-
-	value = buci_get_value_bysection(s, "csv_encoding_report_format");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_report_format = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding report format of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_report_format);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "csv_encoding_row_time_stamp");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].csv_encoding_row_time_stamp = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The csv encoding row time stamp of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].csv_encoding_row_time_stamp);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "json_encoding_report_format");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].json_encoding_report_format = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The json encoding report format of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].json_encoding_report_format);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "json_encoding_report_time_stamp");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].json_encoding_report_time_stamp = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The json encoding report time stamp of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].json_encoding_report_time_stamp);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_url");
-	if(value != NULL && *value != '\0') {
-		char *url = NULL;
-		asprintf(&url, "%s?oui=%s&pc=%s&sn=%s", value, bulkdata->device_id.manufacturer_oui, bulkdata->device_id.serial_number, bulkdata->device_id.serial_number);
-		bulkdata->profile[i].http_url = strdup(url);
-		free(url);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP url of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_url);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_username");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_username = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP username of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_username);
-	} else {
-		bulkdata->profile[i].http_username = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "http_password");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_password = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP password of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_password);
-	} else {
-		bulkdata->profile[i].http_password = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "http_compression");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_compression = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP compression of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_compression);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_method");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_method = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP method of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_method);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_use_date_header");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_use_date_header = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP use date header of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_use_date_header);
-	}
-
-	value = buci_get_value_bysection(s, "http_retry_enable");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_retry_enable = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP retry enable of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_retry_enable);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_retry_minimum_wait_interval");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_retry_minimum_wait_interval = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP retry minimum wait interval of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_retry_minimum_wait_interval);
-	}
-
-	value = buci_get_value_bysection(s, "http_retry_interval_multiplier");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_retry_interval_multiplier = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP retry interval multiplier of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_retry_interval_multiplier);
-	}
-
-	value = buci_get_value_bysection(s, "http_persist_across_reboot");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_persist_across_reboot = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP persist across reboot of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_persist_across_reboot);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "http_ssl_capath");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_ssl_capath = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP ssl capath of profile_id %d is : %s", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_ssl_capath);
-	} else {
-		bulkdata->profile[i].http_ssl_capath = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "http_insecure_enable");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].http_insecure_enable = atoi(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP insecure enable of profile_id %d is : %d", bulkdata->profile[i].profile_id, bulkdata->profile[i].http_insecure_enable);
-	}
-
-	bulkdata->profile[i].retry_count = 0;
-	bulkdata->profile[i].nbre_failed_reports = 0;
-
-	return 0;
-}
-
-int get_profiles_enable(struct bulkdata *bulkdata)
-{
-	struct uci_section *s;
-	char *enable;
-	int i = 0, nbr_profiles = 0;
-
-	buci_init();
-
-	buci_foreach_section("bulkdata", "profile", s) {
-		enable = buci_get_value_bysection(s, "enable");
-		if(strcmp(enable, "1") == 0) {
-			nbr_profiles++;
-		}
-	}
-
-	if(nbr_profiles != 0)
-		bulkdata->profile = calloc(2, sizeof(struct profile));
-	
-	buci_foreach_section("bulkdata", "profile", s) {
-		enable = buci_get_value_bysection(s, "enable");
-		if(strcmp(enable, "1") == 0) {
-			if(load_profile_config(bulkdata, s, i) == -1) {
-				bulkdata_log(SCRIT,"Not able to start bulkdata: some required bulkdata configurations in profile must be set");
-				return -1;
-			}
-			i++;
-		}
-	}
-	profiles_number = nbr_profiles;
-
-	buci_fini();
-	return 0;
-}
-
-int load_profile_parameter_config(struct bulkdata *bulkdata, struct uci_section *s, int i, int j)
-{
-	char *value = NULL;
-
-	value = buci_get_value_bysection(s, "name");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_parameter[j].name = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The parameter name %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_parameter[j].name);
-	} else {
-		bulkdata->profile[i].profile_parameter[j].name = NULL;
-	}
-
-	value = buci_get_value_bysection(s, "reference");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_parameter[j].reference = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The parameter reference %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_parameter[j].reference);
-	} else
-		return -1;
-
-	return 0;
-}
-
-int get_profiles_parameters(struct bulkdata *bulkdata)
-{
-	struct uci_section *s;
-	char *profile_id;
-	int i, j, nbr_profile_parameters;
-
-	buci_init();
-
-	for (i = 0; i < profiles_number; i++) {
-		j = 0;
-		nbr_profile_parameters = 0;
-		buci_foreach_section("bulkdata", "profile_parameter", s) {
-			profile_id = buci_get_value_bysection(s, "profile_id");
-			if(bulkdata->profile[i].profile_id != atoi(profile_id))
-				continue;
-			nbr_profile_parameters++;
-			if(nbr_profile_parameters == 1) {
-				bulkdata->profile[i].profile_parameter = calloc(1, sizeof(struct profile_parameter));
-			} else {
-				bulkdata->profile[i].profile_parameter = realloc(bulkdata->profile[i].profile_parameter, nbr_profile_parameters * sizeof(struct profile_parameter));
-			}
-			if(load_profile_parameter_config(bulkdata, s, i, j) == -1) {
-				bulkdata_log(SCRIT,"Not able to start bulkdata: some required bulkdata configurations in profile_parameter must be set");
-				return -1;
-			}
-			j++;
-		}
-		bulkdata->profile[i].profile_parameter_number = nbr_profile_parameters;
-	}
-
-	buci_fini();
-	return 0;
-}
-
-int load_profile_http_request_uri_parameter_config(struct bulkdata *bulkdata, struct uci_section *s, int i, int j)
-{
-	char *value = NULL;
-
-	value = buci_get_value_bysection(s, "name");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_http_uri_parameter[j].name = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP resuest URI parameter name %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_http_uri_parameter[j].name);
-	} else
-		return -1;
-
-	value = buci_get_value_bysection(s, "reference");
-	if(value != NULL && *value != '\0') {
-		bulkdata->profile[i].profile_http_uri_parameter[j].reference = strdup(value);
-		value = NULL;
-		bulkdata_log(SDEBUG,"The HTTP resuest URI parameter reference %d of profile_id %d is : %s", j+1, bulkdata->profile[i].profile_id, bulkdata->profile[i].profile_http_uri_parameter[j].reference);
-	} else
-		return -1;
-
-	return 0;
-}
-
-int get_profile_http_request_uri_parameter(struct bulkdata *bulkdata)
-{
-	struct uci_section *s;
-	char *profile_id;
-	int i, j, nbr_profile_http_request_uri_parameter;
-
-	buci_init();
-
-	for (i = 0; i < profiles_number; i++) {
-		j = 0;
-		nbr_profile_http_request_uri_parameter = 0;
-		buci_foreach_section("bulkdata", "profile_http_request_uri_parameter", s) {
-			profile_id = buci_get_value_bysection(s, "profile_id");
-			if(bulkdata->profile[i].profile_id != atoi(profile_id))
-				continue;
-			nbr_profile_http_request_uri_parameter++;
-			if(nbr_profile_http_request_uri_parameter == 1) {
-				bulkdata->profile[i].profile_http_uri_parameter = calloc(1, sizeof(struct profile_http_request_uri_parameter));
-			} else {
-				bulkdata->profile[i].profile_http_uri_parameter = realloc(bulkdata->profile[i].profile_http_uri_parameter, nbr_profile_http_request_uri_parameter * sizeof(struct profile_http_request_uri_parameter));
-			}
-			if(load_profile_http_request_uri_parameter_config(bulkdata, s, i, j)== -1) {
-				bulkdata_log(SCRIT,"Not able to start bulkdata: some required bulkdata configurations in profile_http_request_uri_parameter must be set");
-				return -1;
-			}
-			j++;
-		}
-		bulkdata->profile[i].profile_http_request_uri_parameter_number = nbr_profile_http_request_uri_parameter;
-	}
-
-	buci_fini();
-	return 0;
-}
-
-int bulkdata_config_init(struct bulkdata *bulkdata)
-{
-	get_log_level_config(bulkdata);
-	get_amd_version_config(bulkdata);
-	get_instance_mode_config(bulkdata);
-	get_device_id_config(bulkdata);
-	if (get_profiles_enable(bulkdata) == -1)
-		return -1;
-	if (get_profiles_parameters(bulkdata) == -1)
-		return -1;
-	if (get_profile_http_request_uri_parameter(bulkdata) == -1)
-		return -1;
-	return 0;
-}
-
-int free_device_id_config(struct bulkdata *bulkdata)
-{
-	FREE(bulkdata->device_id.manufacturer_oui);
-	FREE(bulkdata->device_id.product_class);
-	FREE(bulkdata->device_id.serial_number);
-	return 0;
-}
-
-int free_profiles_enable(struct bulkdata *bulkdata)
-{
-	for(int i = 0; i < profiles_number; i++) {
-		FREE(bulkdata->profile[i].protocol);
-		FREE(bulkdata->profile[i].encoding_type);
-		FREE(bulkdata->profile[i].csv_encoding_field_separator);
-		FREE(bulkdata->profile[i].csv_encoding_row_separator);
-		FREE(bulkdata->profile[i].csv_encoding_escape_character);
-		FREE(bulkdata->profile[i].csv_encoding_report_format);
-		FREE(bulkdata->profile[i].csv_encoding_row_time_stamp);
-		FREE(bulkdata->profile[i].json_encoding_report_format);
-		FREE(bulkdata->profile[i].json_encoding_report_time_stamp);
-		FREE(bulkdata->profile[i].http_url);
-		FREE(bulkdata->profile[i].http_username);
-		FREE(bulkdata->profile[i].http_password);
-		FREE(bulkdata->profile[i].http_compression);
-		FREE(bulkdata->profile[i].http_method);
-		FREE(bulkdata->profile[i].http_ssl_capath);
-	}
-	FREE(bulkdata->profile);
-	return 0;
-}
-
-int free_profiles_parameters(struct bulkdata *bulkdata)
-{
-	for(int i = 0; i < profiles_number; i++) {
-		for(int j = 0; j < bulkdata->profile[i].profile_parameter_number; j++) {
-			FREE(bulkdata->profile[i].profile_parameter[j].name);
-			FREE(bulkdata->profile[i].profile_parameter[j].reference);
-		}
-		FREE(bulkdata->profile[i].profile_parameter);
-	}
-	return 0;
-}
-
-int free_profile_http_request_uri_parameter(struct bulkdata *bulkdata)
-{
-	for(int i = 0; i < profiles_number; i++) {
-		for(int j = 0; j < bulkdata->profile[i].profile_http_request_uri_parameter_number; j++) {
-			FREE(bulkdata->profile[i].profile_http_uri_parameter[j].name);
-			FREE(bulkdata->profile[i].profile_http_uri_parameter[j].reference);
-		}
-		FREE(bulkdata->profile[i].profile_http_uri_parameter);
-	}
-	return 0;
-}
-
-int bulkdata_config_fini(struct bulkdata *bulkdata)
-{
-	free_device_id_config(bulkdata);
-	free_profiles_parameters(bulkdata);
-	free_profile_http_request_uri_parameter(bulkdata);
-	free_profiles_enable(bulkdata);
-	return 0;
-}

bulkdata/src/config.h

@@ -1,103 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __CONFIG_H
-#define __CONFIG_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-#include <time.h>
-#include <libubox/uloop.h>
-
-#define DEFAULT_AMD_VERSION 2
-#define DEFAULT_INSTANCE_MODE 0
-
-typedef struct device_id {
-	char *manufacturer_oui;
-	char *product_class;
-	char *serial_number;
-} device_id;
-
-typedef struct profile_parameter {
-	int profile_id;
-	char *name;
-	char *reference;
-} profile_parameter;
-
-typedef struct profile_http_request_uri_parameter {
-	int profile_id;
-	char *name;
-	char *reference;
-} profile_http_request_uri_parameter;
-
-typedef struct profile {
-	struct uloop_timeout utimer;
-	int profile_id;
-	int nbre_of_retained_failed_reports;
-	int nbre_failed_reports;
-	int reporting_interval;
-	int profile_parameter_number;
-	int profile_http_request_uri_parameter_number;
-	int http_retry_minimum_wait_interval;
-	int http_retry_interval_multiplier;
-	int min_retry;
-	int retry_count;
-	char *protocol;
-	char *encoding_type;
-	char *csv_encoding_field_separator;
-	char *csv_encoding_row_separator;
-	char *csv_encoding_escape_character;
-	char *csv_encoding_report_format;
-	char *csv_encoding_row_time_stamp;
-	char *json_encoding_report_format;
-	char *json_encoding_report_time_stamp;
-	char *http_url;
-	char *http_username;
-	char *http_password;
-	char *http_compression;
-	char *http_method;
-	char *http_ssl_capath;
-	char *new_report;
-	time_t time_reference;
-	time_t next_retry;
-	time_t next_period;
-	bool http_persist_across_reboot;
-	bool http_insecure_enable;
-	bool enable;
-	bool http_use_date_header;
-	bool http_retry_enable;
-	struct profile_parameter *profile_parameter;
-	struct profile_http_request_uri_parameter *profile_http_uri_parameter;
-	struct list_head *failed_reports;
-} profile;
-
-typedef struct bulkdata {
-	struct device_id							device_id;
-	struct profile								*profile;
-	int 										log_level;
-	int 										amd_version;
-	unsigned int 								instance_mode;
-} bulkdata;
-
-int bulkdata_config_init(struct bulkdata *bulkdata);
-int bulkdata_config_fini(struct bulkdata *bulkdata);
-
-#ifndef FREE
-#define FREE(x) do { if(x) {free(x); x = NULL;} } while (0)
-#endif
-
-#endif //__CONFIG_H
-
-
-
-
-

bulkdata/src/datamodel.h

@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2020 iopsys Software Solutions AB
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 2.1
- * as published by the Free Software Foundation
- *
- *		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
- */
-
-#ifndef _BULKDATA_H_
-#define _BULKDATA_H_
-
-#include <libbbf_api/dmcommon.h>
-
-extern DMOBJ tDeviceBulkDataObj[];
-extern DMOBJ tBulkDataObj[];
-extern DMLEAF tBulkDataParams[];
-extern DMOBJ tBulkDataProfileObj[];
-extern DMLEAF tBulkDataProfileParams[];
-extern DMLEAF tBulkDataProfileParameterParams[];
-extern DMLEAF tBulkDataProfileCSVEncodingParams[];
-extern DMLEAF tBulkDataProfileJSONEncodingParams[];
-extern DMOBJ tBulkDataProfileHTTPObj[];
-extern DMLEAF tBulkDataProfileHTTPParams[];
-extern DMLEAF tBulkDataProfileHTTPRequestURIParameterParams[];
-
-#endif //__BULKDATA_H_
-

bulkdata/src/http.c

@@ -1,196 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*				Omar Kallel <omar.kallel@pivasoftware.com>
-*/
-
-#include "http.h"
-
-static struct http_client http_c;
-static CURL *curl;
-
-int http_client_init(struct profile *profile)
-{
-	char *url = create_request_url(profile);
-	if(url) {
-		asprintf(&http_c.url, "%s", url);
-		free(url);
-	}
-	bulkdata_log(SINFO, "ACS url: %s", http_c.url);
-
-	curl_global_init(CURL_GLOBAL_SSL);
-	curl = curl_easy_init();
-	if (!curl) return -1;
-
-	return 0;
-}
-
-void http_client_exit(void)
-{
-	FREE(http_c.url);
-
-	if (http_c.header_list) {
-		curl_slist_free_all(http_c.header_list);
-		http_c.header_list = NULL;
-	}
-
-	curl_easy_cleanup(curl);
-	curl_global_cleanup();
-
-}
-
-static size_t http_get_response(void *buffer, size_t size, size_t rxed, char **msg_in)
-{
-	char *c;
-
-	if (asprintf(&c, "%s%.*s", *msg_in, size * rxed, (char *)buffer) == -1) {
-		FREE(*msg_in);
-		return -1;
-	}
-
-	free(*msg_in);
-	*msg_in = c;
-
-	return size * rxed;
-}
-
-int http_send_message(struct profile *profile, char *msg_out, int msg_out_len, char **msg_in)
-{
-	CURLcode res;
-	long http_code = 0;
-	char errbuf[CURL_ERROR_SIZE];
-
-	http_c.header_list = NULL;
-	http_c.header_list = curl_slist_append(http_c.header_list, "User-Agent: iopsys-bulkdata");
-	if (!http_c.header_list) return -1;
-
-	if (profile->http_use_date_header) {
-		if (bulkdata_get_time() != NULL) {
-			http_c.header_list = curl_slist_append(http_c.header_list, bulkdata_get_time());
-			if (!http_c.header_list) return -1;
-		}
-	}
-
-	if (strcmp(profile->encoding_type, "json") == 0) {
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Type: application/json; charset=\"utf-8\"");
-		if (!http_c.header_list) return -1;
-
-		if(strcmp (profile->json_encoding_report_format, "objecthierarchy") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"ObjectHierarchy\"");
-			if (!http_c.header_list) return -1;
-		} else if(strcmp(profile->json_encoding_report_format, "namevaluepair") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"NameValuePair\"");
-			if (!http_c.header_list) return -1;
-		}
-	} else if(strcmp(profile->encoding_type, "csv") == 0) {
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Type: text/csv; charset=\"utf-8\"");
-		if (!http_c.header_list) return -1;
-
-		if(strcmp (profile->csv_encoding_report_format, "row") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"ParameterPerRow\"");
-			if (!http_c.header_list) return -1;
-		} else if(strcmp (profile->csv_encoding_report_format, "column") == 0) {
-			http_c.header_list = curl_slist_append(http_c.header_list, "BBF-Report-Format: \"ParameterPerColumn\"");
-			if (!http_c.header_list) return -1;
-		}
-	}
-
-	curl_easy_setopt(curl, CURLOPT_URL, http_c.url);
-	curl_easy_setopt(curl, CURLOPT_USERNAME, profile->http_username);
-	curl_easy_setopt(curl, CURLOPT_PASSWORD, profile->http_password);
-	curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_BASIC|CURLAUTH_DIGEST);
-	curl_easy_setopt(curl, CURLOPT_TIMEOUT, HTTP_TIMEOUT);
-	curl_easy_setopt(curl, CURLOPT_CONNECTTIMEOUT, HTTP_TIMEOUT);
-	curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L);
-	curl_easy_setopt(curl, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
-	curl_easy_setopt(curl, CURLOPT_NOBODY, 0);
-
-	if(strcasecmp(profile->http_compression, "gzip") == 0) {
-		curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "gzip");
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Encoding: gzip");
-	} else if(strcasecmp(profile->http_compression, "compress") == 0) {
-		curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "compress");
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Encoding: compress");
-	} else if(strcasecmp(profile->http_compression, "deflate") == 0) {
-		curl_easy_setopt(curl, CURLOPT_ACCEPT_ENCODING, "deflate");
-		http_c.header_list = curl_slist_append(http_c.header_list, "Content-Encoding: deflate");	
-	}
-
-	curl_easy_setopt(curl, CURLOPT_HTTPHEADER, http_c.header_list);
-	if(strcasecmp(profile->http_method, "put") == 0)
-		curl_easy_setopt(curl, CURLOPT_CUSTOMREQUEST, "PUT");
-	curl_easy_setopt(curl, CURLOPT_POSTFIELDS, msg_out);
-	if (msg_out)
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long) msg_out_len);
-	else
-		curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, 0);
-
-	curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, http_get_response);
-	curl_easy_setopt(curl, CURLOPT_WRITEDATA, msg_in);
-
-	curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, errbuf);
-	
-	if (profile->http_ssl_capath)
-		curl_easy_setopt(curl, CURLOPT_CAPATH, profile->http_ssl_capath);
-	if (profile->http_insecure_enable) {
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, false);
-		curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0);		
-	}
-	*msg_in = (char *) calloc (1, sizeof(char));
-
-	res = curl_easy_perform(curl);
-
-	if(res != CURLE_OK) {
-		size_t len = strlen(errbuf);
-		if(len) {
-			if (errbuf[len - 1] == '\n') errbuf[len - 1] = '\0';
-			bulkdata_log(SCRIT, "libcurl: (%d) %s", res, errbuf);
-		} else {
-			bulkdata_log(SCRIT, "libcurl: (%d) %s", res, curl_easy_strerror(res));
-		}
-	}
-
-	if (!strlen(*msg_in))
-		FREE(*msg_in);
-
-	curl_easy_getinfo(curl, CURLINFO_RESPONSE_CODE, &http_code);
-	if(http_code == 200)
-		bulkdata_log(SINFO, "Receive HTTP 200 OK from Bulkdata Collector");
-	else if(http_code == 401)
-		bulkdata_log(SINFO, "Receive HTTP 401 Unauthorized from Bulkdata Collector");
-	else if(http_code == 204)
-		bulkdata_log(SINFO, "Receive HTTP 204 No Content from Bulkdata Collector");
-	else
-		bulkdata_log(SINFO, "Receive HTTP %d from Bulkdata Collector", http_code);
-
-	if(http_code == 415)
-	{
-		strcpy(profile->http_compression, "None");
-		goto error;
-	}
-	if (http_code != 200 && http_code != 204)
-		goto error;
-
-	curl_easy_reset(curl);
-	if (http_c.header_list) {
-		curl_slist_free_all(http_c.header_list);
-		http_c.header_list = NULL;
-	}
-
-	if (res) goto error;
-
-	return http_code;
-
-error:
-	FREE(*msg_in);
-	if (http_c.header_list) {
-		curl_slist_free_all(http_c.header_list);
-		http_c.header_list = NULL;
-	}
-	return -1;
-}

bulkdata/src/http.h

@@ -1,37 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __HTTP_H
-#define __HTTP_H
-
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <curl/curl.h>
-#include "config.h"
-#include "log.h"
-#include "times.h"
-#include "common.h"
-
-#define HTTP_TIMEOUT 30
-
-struct http_client
-{
-	struct curl_slist *header_list;
-	char *url;
-};
-
-int http_client_init(struct profile *profile);
-void http_client_exit(void);
-int http_send_message(struct profile *profile, char *msg_out, int msg_out_len, char **msg_in);
-
-#endif //__HTTP_H

bulkdata/src/log.c

@@ -1,57 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <syslog.h>
-#include <time.h>
-
-#include "bulkdata.h"
-#include "config.h"
-#include "log.h"
-
-static const int log_syslogmap[] = {
-	[SCRIT] = LOG_CRIT,
-	[SWARNING] = LOG_WARNING,
-	[SNOTICE] = LOG_NOTICE,
-	[SINFO] = LOG_INFO,
-	[SDEBUG] = LOG_DEBUG
-};
-
-static const char* log_str[] = {
-	[SCRIT] = "CRITICAL",
-	[SWARNING] = "WARNING",
-	[SNOTICE] = "NOTICE",
-	[SINFO] = "INFO",
-	[SDEBUG] = "DEBUG"
-};
-
-void bulkdata_log(int priority, const char *format, ...)
-{
-	va_list vl;
-
-	if (priority <= bulkdata_main.log_level) {
-		time_t t = time(NULL);
-		struct tm tm = *localtime(&t);
-		va_start(vl, format);
-		printf("%d-%02d-%02d %02d:%02d:%02d [bulkdata] %s - ", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, log_str[priority]);
-		vprintf(format, vl);
-		va_end(vl);
-		printf("\n");
-
-		openlog("bulkdata", 0, LOG_DAEMON);
-		va_start(vl, format);
-		vsyslog(log_syslogmap[priority], format, vl);
-		va_end(vl);
-		closelog();
-	}
-}

bulkdata/src/log.h

@@ -1,28 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __LOG_H
-#define __LOG_H
-
-#define DEFAULT_LOGLEVEL SINFO
-
-enum bulkdata_log_level_enum {
-	SCRIT,
-	SWARNING,
-	SNOTICE,
-	SINFO,
-	SDEBUG,
-	__MAX_SLOG
-};
-
-void bulkdata_log(int priority, const char *format, ...);
-
-#endif //__LOG_H

bulkdata/src/report.c

@@ -1,336 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*		Author: Omar Kallel <omar.kallel@pivasoftware.com>
-*
-*/
-
-#include "report.h"
-
-static void add_new_json_obj(json_object *json_obj, char *name, char *data, char *type)
-{
-	json_object *jobj;
-	if(strstr(type, "unsignedInt") || strstr(type, "int") || strstr(type, "long"))
-		jobj = json_object_new_int64(atoi(data));
-	else if(strstr(type, "bool"))
-		jobj = json_object_new_boolean(atoi(data));
-	else
-		jobj = json_object_new_string(data);
-
-	json_object_object_add(json_obj, name, jobj);
-}
-
-static void create_json_bulkdata_report_object_hierarchy(struct profile *profile, char **report)
-{
-	struct json_object *json_obj, *json_obj1, *json_obj2;
-	struct resultsnode *p;
-	int i, j, profile_param_number = profile->profile_parameter_number;
-	char *param_name, *result, *pch, *pchr, *collection_time = NULL;
-	char buf[1024] = {0};
-
-	json_obj = json_object_new_object();
-	get_time_stamp(profile->json_encoding_report_time_stamp, &collection_time);
-	if(collection_time) {
-		if(strcmp(profile->json_encoding_report_time_stamp, "iso8601") == 0)
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_string(collection_time));
-		else
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_int64(atoi(collection_time)));
-		free(collection_time);
-	}
-	json_obj2 = json_obj;
-	for (i = 0; i < profile_param_number; i++) {
-		LIST_HEAD(results_list);
-		bulkdata_get_value_results(profile->profile_parameter[i].reference, &results_list);
-		list_for_each_entry(p, &results_list, list) {
-			char *argv[128] = {0};
-			j = 0;
-			param_name = get_bulkdata_profile_parameter_name(profile->profile_parameter[i].reference, profile->profile_parameter[i].name, p->name);
-			strcpy(buf, param_name);
-			for (pch = strtok_r(buf, ".", &pchr); pch != NULL; pch = strtok_r(NULL, ".", &pchr)) {
-				argv[j] = pch;
-				json_obj1 = (json_object *)dmjson_select_obj(json_obj, argv);
-				if (json_obj1)
-					json_obj2 = json_obj1;
-				else {
-					if (pchr != NULL && *pchr != '\0') {
-						json_object *new_obj = json_object_new_object();
-						json_object_object_add(json_obj2, pch, new_obj);
-						json_obj2 = new_obj;
-					}
-					else
-						add_new_json_obj(json_obj2, pch, p->data, p->type);
-				}
-				j++;
-			}
-		}
-		bulkdata_free_data_from_list(&results_list);
-		FREE(param_name);
-	}
-	result = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(result);
-	json_object_put(json_obj);
-}
-
-static void create_json_bulkdata_report_name_value_pair(struct profile *profile, char **report)
-{
-	struct json_object *json_obj;
-	struct resultsnode *p;
-	char *param_name, *result, *collection_time = NULL;
-	int i = 0, profile_param_number = profile->profile_parameter_number;
-
-	json_obj = json_object_new_object();
-	get_time_stamp(profile->json_encoding_report_time_stamp, &collection_time);
-	if(collection_time) {
-		if(strcmp(profile->json_encoding_report_time_stamp, "iso8601") == 0)
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_string(collection_time));
-		else
-			json_object_object_add(json_obj, "CollectionTime", json_object_new_int64(atoi(collection_time)));
-		free(collection_time);
-	}
-	for (i = 0; i < profile_param_number; i++) {
-		LIST_HEAD(results_list);
-		bulkdata_get_value_results(profile->profile_parameter[i].reference, &results_list);
-		list_for_each_entry(p, &results_list, list) {
-			param_name = get_bulkdata_profile_parameter_name(profile->profile_parameter[i].reference, profile->profile_parameter[i].name, p->name);
-			add_new_json_obj(json_obj, param_name, p->data, p->type);
-			FREE(param_name);
-		}
-		bulkdata_free_data_from_list(&results_list);
-	}
-	result = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(result);
-	json_object_put(json_obj);
-}
-
-static void add_failed_reports_to_report_json(struct profile *profile, char *new_report, char **report, int isnext)
-{
-	json_object *json_obj, *json_array, *json_string;
-	struct failed_reports *retreport = NULL;
-	char *msgout = NULL;
-	int j = 0;
-
-	json_obj = json_object_new_object();
-	json_array = json_object_new_array();
-	json_object_object_add(json_obj,"Report", json_array);
-
-	if(list_empty(profile->failed_reports))
-		goto new_report;
-
-	list_for_each_entry(retreport, profile->failed_reports, list) {
-		if(!j && isnext) {
-			j = 1;
-			continue;
-		}
-		json_string = json_tokener_parse(retreport->freport);
-		json_object_array_add(json_array, json_string);
-	}
-
-new_report :
-	if(new_report) {
-		json_string = json_tokener_parse(new_report);
-		json_object_array_add(json_array, json_string);
-	}
-
-	msgout = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(msgout);
-	json_object_put(json_obj);
-}
-
-static void create_report_json(char *new_report, char **report)
-{
-	json_object *json_obj, *json_array, *json_string;
-	char *msgout = NULL;
-
-	json_obj = json_object_new_object();
-	json_array = json_object_new_array();
-	json_object_object_add(json_obj,"Report", json_array);
-
-	if(new_report) {
-		json_string = json_tokener_parse(new_report);
-		json_object_array_add(json_array, json_string);
-	}
-
-	msgout = (char *)json_object_to_json_string_ext(json_obj, JSON_C_TO_STRING_PRETTY);
-	*report = strdup(msgout);
-	json_object_put(json_obj);
-}
-
-int create_json_bulkdata_report(struct profile *profile, char **report)
-{
-	/*
-	 * create json msg of current report
-	 * parse failed reports list and add it to the report
-	 * then add new report to the report
-	 */
-	char *msgout;
-
-	profile->new_report = NULL;
-	if(strcmp(profile->json_encoding_report_format, "objecthierarchy") == 0) {
-		create_json_bulkdata_report_object_hierarchy(profile, &msgout);
-	} else if(strcmp(profile->json_encoding_report_format, "namevaluepair") == 0) {
-		create_json_bulkdata_report_name_value_pair(profile, &msgout);
-	}
-
-	if(profile->nbre_of_retained_failed_reports != 0) {
-		if(profile->nbre_failed_reports >= profile->nbre_of_retained_failed_reports && profile->nbre_of_retained_failed_reports > 0)
-			add_failed_reports_to_report_json(profile, msgout, report, 1);
-		else
-			add_failed_reports_to_report_json(profile, msgout, report, 0);
-	} else {
-		create_report_json(msgout, report);
-	}
-
-	append_string_to_string(msgout, &profile->new_report);
-	FREE(msgout);
-	return 0;
-}
-
-int create_csv_bulkdata_report(struct profile *profile, char **report)
-{
-	/*
-	 * create csv msg of current report
-	 * parse failed reports list and add it to the report
-	 */
-	int i;
-	struct resultsnode *p;
-	char *str1 = NULL, *str2 = NULL, *str = NULL, *paramprofilename, *timestamp = NULL, *type = NULL, rowseparator = '\0', separator = '\0';
-
-	if(strcmp(profile->csv_encoding_row_separator, "&#10;") == 0)
-		rowseparator = '\n';
-	else if(strcmp(profile->csv_encoding_row_separator, "&#13;") == 0)
-		rowseparator = '\r';
-
-	if(profile->csv_encoding_field_separator)
-		separator = profile->csv_encoding_field_separator[0];
-
-	get_time_stamp(profile->csv_encoding_row_time_stamp, &timestamp);
-	/*
-	 * Create header ReportTimestamp,ParameterName,ParameterValue,ParameterType in case of ParameterPerRow
-	 */
-	if(strcmp(profile->csv_encoding_report_format, "row") == 0) {
-		if(timestamp == NULL)
-			asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-		else
-			asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-		append_string_to_string(str, report);
-		FREE(str);
-		if(profile->nbre_of_retained_failed_reports != 0) {
-			if(profile->nbre_failed_reports >= profile->nbre_of_retained_failed_reports && profile->nbre_of_retained_failed_reports > 0)
-				add_failed_reports_to_report_csv(profile, report, 1);
-			else
-				add_failed_reports_to_report_csv(profile, report, 0);
-		}
-	}
-	if(strcmp(profile->csv_encoding_report_format, "column") == 0 && timestamp != NULL) {
-		if(profile->nbre_of_retained_failed_reports != 0) {
-			if(profile->nbre_failed_reports >= profile->nbre_of_retained_failed_reports && profile->nbre_of_retained_failed_reports > 0)
-				add_failed_reports_to_report_csv(profile, report, 1);
-			else
-				add_failed_reports_to_report_csv(profile, report, 0);
-		}
-		append_string_to_string("ReportTimestamp", &str1);
-		append_string_to_string(timestamp, &str2);
-	}
-
-	/*
-	 * Add New reports
-	 */
-	profile->new_report = NULL;
-	for(i = 0; i < profile->profile_parameter_number; i++) {
-		LIST_HEAD(results_list);
-		bulkdata_get_value_results(profile->profile_parameter[i].reference, &results_list);
-		list_for_each_entry(p, &results_list, list) {
-			paramprofilename = get_bulkdata_profile_parameter_name(profile->profile_parameter[i].reference, profile->profile_parameter[i].name, p->name);
-			if(strcmp(profile->csv_encoding_report_format, "row") == 0) {
-				type = strstr(p->type, ":");
-				if(timestamp == NULL)
-					asprintf(&str, "%s%c%s%c%s%c", paramprofilename, separator, p->data, separator, type+1, rowseparator);
-				else
-					asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, paramprofilename, separator, p->data, separator, type+1, rowseparator);
-				append_string_to_string(str, report);
-				append_string_to_string(str, &profile->new_report);
-				FREE(str);
-			} else if(strcmp(profile->csv_encoding_report_format, "column") == 0) {
-				if(str1 == NULL || strlen(str1) <= 0)
-					asprintf(&str, "%s", paramprofilename);
-				else
-					asprintf(&str, "%c%s", separator, paramprofilename);
-				append_string_to_string(str, &str1);
-				FREE(str);
-				if(str2 == NULL || strlen(str2) <= 0)
-					asprintf(&str, "%s", p->data);
-				else
-					asprintf(&str, "%c%s", separator, p->data);
-				append_string_to_string(str, &str2);
-				FREE(str);
-			}
-			FREE(paramprofilename);
-		}
-		bulkdata_free_data_from_list(&results_list);
-	}
-	if(strcmp(profile->csv_encoding_report_format, "column") == 0) {
-		asprintf(&str, "%c", rowseparator);
-		append_string_to_string(str, &str1);
-		append_string_to_string(str, &str2);
-		append_string_to_string(str1, report);
-		append_string_to_string(str2, report);
-		append_string_to_string(str1, &profile->new_report);
-		append_string_to_string(str2, &profile->new_report);
-	}
-	FREE(str);
-	FREE(str1);
-	FREE(str2);
-	FREE(timestamp);
-	return 0;
-}
-
-static void create_json_failed_report(struct profile *profile, char **report)
-{
-	add_failed_reports_to_report_json(profile, NULL, report, 0);
-}
-
-static void create_csv_failed_report(struct profile *profile, char **report)
-{
-	char rowseparator = '\0', separator = '\0', *timestamp = NULL;
-
-	if(strcmp(profile->csv_encoding_row_separator, "&#10;") == 0) {
-		rowseparator = '\n';
-	} else if(strcmp(profile->csv_encoding_row_separator, "&#13;") == 0) {
-		rowseparator = '\r';
-	}
-
-	if(profile->csv_encoding_field_separator)
-		separator = profile->csv_encoding_field_separator[0];
-
-	get_time_stamp(profile->csv_encoding_row_time_stamp, &timestamp);
-	if(strcmp(profile->csv_encoding_report_format, "row") == 0) {
-		if(timestamp == NULL)
-			asprintf(report, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-		else
-			asprintf(report, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-	}
-	add_failed_reports_to_report_csv(profile, report, 0);
-}
-
-void create_encoding_bulkdata_report(struct profile *profile, char **report)
-{
-	if(strcasecmp(profile->encoding_type, "json") == 0) {
-		create_json_bulkdata_report(profile, report);
-	} else if(strcasecmp(profile->encoding_type, "csv") == 0) {
-		create_csv_bulkdata_report(profile, report);
-	}
-}
-
-void create_failed_report(struct profile *profile, char **report)
-{
-	if(strcasecmp(profile->encoding_type, "json") == 0) {
-		create_json_failed_report(profile, report);
-	} else if(strcasecmp(profile->encoding_type, "csv") == 0) {
-		create_csv_failed_report(profile, report);
-	}
-}

bulkdata/src/report.h

@@ -1,24 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*		Author: Omar Kallel <omar.kallel@pivasoftware.com>
-*
-*/
-
-#ifndef __REPORT_H_
-#define __REPORT_H_
-
-#include <json-c/json.h>
-#include "common.h"
-#include "times.h"
-#include "config.h"
-
-void create_encoding_bulkdata_report(struct profile *profile, char **report);
-void create_failed_report(struct profile *profile, char **report);
-
-#endif /* __REPORT_H_ */

bulkdata/src/times.c

@@ -1,62 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-#include "times.h"
-
-const char *bulkdata_get_time(void)
-{
-	static char local_time[64];
-
-	time_t t_time = time(NULL);
-	struct tm *t_tm = localtime(&t_time);
-	if (t_tm == NULL)
-		return NULL;
-
-	if (strftime(local_time, sizeof(local_time),"Date: %a, %d %b %Y %X%z GMT", t_tm) == 0)
-		return NULL;
-
-	return local_time;
-}
-
-void get_time_stamp(const char *format, char **timestamp)
-{
-	time_t now = time(NULL);
-
-	if (strcmp(format, "unix") == 0) {
-		asprintf(timestamp, "%ld", now);
-	} else if (strcmp(format, "iso8601") == 0) {
-		char buf[32] = {0};
-		struct tm *ts = localtime(&now);
-		strftime(buf, sizeof(buf), "%Y-%m-%dT%H:%M:%S%Z", ts);
-		asprintf(timestamp, "%s", buf);
-	} else
-		timestamp = NULL;
-}
-
-unsigned int get_next_period(time_t time_reference, int reporting_interval)
-{
-	unsigned int next_period;
-	time_t now = time(NULL);
-
-	if (now > time_reference)
-		next_period = reporting_interval - ((now - time_reference) % reporting_interval);
-	else
-		next_period = (time_reference - now) % reporting_interval;
-
-	if (next_period == 0)
-		next_period = reporting_interval;
-
-	return next_period;
-}

bulkdata/src/times.h

@@ -1,19 +0,0 @@
-/*
-*	This program is free software: you can redistribute it and/or modify
-*	it under the terms of the GNU General Public License as published by
-*	the Free Software Foundation, either version 2 of the License, or
-*	(at your option) any later version.
-*
-*	Copyright (C) 2020 iopsys Software Solutions AB
-*		Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-*
-*/
-
-#ifndef __TIMES_H
-#define __TIMES_H
-
-const char *bulkdata_get_time(void);
-void get_time_stamp(const char *format, char **timestamp);
-unsigned int get_next_period(time_t time_reference, int reporting_interval);
-
-#endif /* __TIMES_H */

catv/Makefile

@@ -1,19 +1,9 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=catv
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/catv

catv/files/etc/init.d/catv

@@ -10,16 +10,12 @@ USE_PROCD=1
 
 start_service() {
 	local enable=0
-	local filter=0
+        local filter=0
 
-	config_load catv
-	config_get_bool enable catv enable 0
-	config_get filter catv filter
-	if [ $enable -eq 0 ]; then
-		ubus call catv set-enable "{\"enable\":\"off\"}"
-	else
-		ubus call catv set-enable "{\"enable\":\"on\"}"
-	fi
+        config_load catv
+        config_get enable catv enable
+        config_get filter catv filter
+	ubus call catv set-enable "{\"enable\":\"$enable\"}"
 	ubus call catv set-filter "{\"filter\":\"$filter\"}"
 
 }

cifsd-tools/Makefile

@@ -1,53 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cifsd-tools
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd-tools.git
-PKG_SOURCE_DATE:=2019-02-14
-PKG_SOURCE_VERSION:=a7d7dfc40524b88dbcb2052034a75f446b3cefdd
-PKG_MIRROR_HASH:=a74f95a79c3cdcc78e66c080729141abee0d821e21a326d88b11d849738314fb
-
-PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/cifsd-tools
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  TITLE:=Kernel CIFS/SMB server support and userspace tools
-  DEPENDS:=+kmod-fs-cifsd +glib2 +libnl-core +libnl-genl $(ICONV_DEPENDS)
-endef
-
-define Package/cifsd-tools/description
-  Userspace tools (cifsd, cifsadmin) for the CIFS/SMB kernel fileserver.
-  The config file location is /etc/cifs/smb.conf
-endef
-
-define Package/cifsd-tools/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcifsdtools.so* $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/etc/cifs
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/smb.conf.example $(1)/etc/cifs
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/cifsd.config $(1)/etc/config/cifsd
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/cifsd.init $(1)/etc/init.d/cifsd
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{cifsadmin,cifsd} $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,cifsd-tools))

cifsd-tools/files/cifsd.config

@@ -1,9 +0,0 @@
-config global 'global'
-	option server_string	'CIFSD on OpenWRT'
-	option ipc_timeout	'8' # IPC timeout is used as a workaround for uninterruptible sleep until this is fixed upstream.
-
-config share
-	option name	'share'
-	option comment	'Default guest share'
-	option path	'/mnt'
-	option guest_ok	'yes'

cifsd-tools/files/cifsd.init

@@ -1,161 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-USE_PROCD=1
-PROG=/usr/sbin/cifsd
-USER_DB=/etc/cifs/cifsdpwd.db
-CIFS_ADMIN=cifsadmin
-
-EXTRA_COMMANDS="users"
-EXTRA_HELP="	users	Show list of users created by cifsadmin"
-
-users() {
-	[ -f "$USER_DB" ] && cut -d ':' $USER_DB -f1 || \
-		printf "No users available.\n"
-}
-
-validate_cifsd_global() {
-	uci_validate_section cifsd global global \
-		'server_string:string' \
-		'workgroup:string' \
-		'netbios_name:string' \
-		'interface:string' \
-		'ipc_timeout:uinteger'
-}
-
-validate_cifsd_share() {
-	uci_validate_section cifsd share "${1}" \
-		'name:string' \
-		'comment:string' \
-		'path:string' \
-		'guest_ok:bool' \
-		'read_only:bool' \
-		'allow_hosts:list' \
-		'deny_hosts:list' \
-		'users:string' \
-		'invalid_users:string' \
-		'create_mask:string' \
-		'dir_mask:string' \
-		'max_connections:uinteger' \
-		'veto_files:list'
-}
-
-validate_cifsd_users() {
-	uci_validate_section cifsd users "${1}" \
-		'user:string' \
-		'password:string' \
-		'desc:string'
-}
-
-load_cifsd_global() {
-	local server_string
-	local workgroup
-	local netbios_name
-	local ipc_timeout
-
-	validate_cifsd_global
-
-	echo -e "[global]" >> /var/etc/cifsd.conf
-	[ -n "$server_string" ] && echo -e "\tserver string = $server_string" >> /var/etc/cifsd.conf
-	[ -n "$workgroup" ] && echo -e "\tworkgroup = $workgroup" >> /var/etc/cifsd.conf
-	[ -n "$netbios_name" ] && echo -e "\tnetbios name = $netbios_name" >> /var/etc/cifsd.conf
-	[ -n "$ipc_timeout" ] && echo -e "\tipc timeout name = $ipc_timeout" >> /var/etc/cifsd.conf || \
-		echo -e "\tipc timeout name = 8" >> /var/etc/cifsd.conf
-}
-
-load_cifsd_share() {
-	local name
-	local comment
-	local path
-	local guest_ok
-	local allow_hosts
-	local deny_hosts
-	local users
-	local invalid_users
-	local max_connections
-	local veto_files
-	local dir_mask
-	local create_mask
-	local read_only
-
-	validate_cifsd_share ${1}
-
-	if [ -z "$name" -o -z "$path" ]; then
-		logread -t ${0} "Missing name or path."
-		return
-	fi
-
-	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/cifsd.conf
-	[ -n "$comment" ] && echo -e "\tcomment = $comment" >> /var/etc/cifsd.conf
-	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/cifsd.conf
-	[ -n "$allow_hosts" ] && echo -e "\tallow hosts = $allow_hosts" >> /var/etc/cifsd.conf
-	[ -n "$deny_hosts" ] && echo -e "\tdeny hosts = $deny_hosts" >> /var/etc/cifsd.conf
-	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/cifsd.conf
-	[ -n "$invalid_users" ] && echo -e "\tinvalid users = $invalid_users" >> /var/etc/cifsd.conf
-	[ -n "$max_connections" ] && echo -e "\tmax connections = $max_connections" >> /var/etc/cifsd.conf
-	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/cifsd.conf
-	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/cifsd.conf
-
-	if [ -n "$read_only" ]; then
-		echo -e "\tread only = $read_only" >> /var/etc/cifsd.conf
-		if [ "${read_only}" -eq "0" ]; then
-			echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
-		fi
-	else
-		echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
-	fi
-
-	[ -n "$veto_files" ] && echo -e "\tveto files = $veto_files" >> /var/etc/cifsd.conf
-}
-
-load_cifsd_users() {
-	local user
-	local password
-	local desc
-
-	validate_cifsd_users ${1}
-	[ $(which ${CIFS_ADMIN}) ] || {
-		logread -t ${0} "${CIFS_ADMIN} tools is not available"
-		return;
-	}
-
-	cifsadmin -a "${user}" -p "${password}"
-	if [ "$?" -ne 0 ]; then
-		logread -t ${0} "Failed to create/update ${user}"
-	fi
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "cifsd" /etc/init.d/cifsd restart
-}
-
-init_config() {
-	[ -f "/var/etc/cifsd.conf" ] && rm /var/etc/cifsd.conf
-
-	config_load cifsd
-	load_cifsd_global
-
-	# Delete existing users
-	[ -f "${USER_DB}" ] && {
-		rm -f "${USER_DB}"
-	}
-	config_foreach load_cifsd_users users
-	config_foreach load_cifsd_share share
-}
-
-start_service() {
-	. /lib/functions.sh
-	init_config
-
-	[ ! "$(grep cifsd /proc/modules)" ] && modprobe cifsd
-	procd_open_instance
-	procd_set_param command /usr/bin/env LANG=en_US.UTF-8 $PROG -c /var/etc/cifsd.conf
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service() {
-	killall cifsd
-	# IPC timeout will kill the remaining processes.
-}

cifsd/001-fix_implicit_declarations.patch

@@ -1,73 +0,0 @@
-For some reason, fs.h on Inteno kernel is missing inode->i_mutex nesting subclasses for the lock validator
-which is triggering implicit declaration error. To workaround this hardcore use of mutex_lock by removing
-kernel version check.
----
---- a/vfs.c
-+++ b/vfs.c
-@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
- 
- 	attrs->ia_valid |= ATTR_CTIME;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(inode);
--	err = notify_change(dentry, attrs, NULL);
--	inode_unlock(inode);
--#else
- 	mutex_lock(&inode->i_mutex);
- 	err = notify_change(dentry, attrs, NULL);
- 	mutex_unlock(&inode->i_mutex);
--#endif
- 
- 	if (update_size)
- 		put_write_access(inode);
-@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
- 	if (!dir->d_inode)
- 		goto out;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
--#else
- 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
--#endif
-+
- 	dentry = lookup_one_len(last, dir, strlen(last));
- 	if (IS_ERR(dentry)) {
- 		err = PTR_ERR(dentry);
-@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
- 
- 	dput(dentry);
- out_err:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
- out:
- 	path_put(&parent);
- 	return err;
-@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 	int err = 0;
- 
- 	dget(dentry);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(dir->d_inode);
--#else
- 	mutex_lock(&dir->d_inode->i_mutex);
--#endif
-+
- 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
- 		err = -ENOENT;
- 		goto out;
-@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 		err = vfs_unlink(dir->d_inode, dentry, NULL);
- 
- out:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
-+
- 	dput(dentry);
- 	if (err)
- 		cifsd_debug("failed to delete, err %d\n", err);

cifsd/Makefile

@@ -1,60 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=cifsd
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd.git
-PKG_SOURCE_DATE:=2019-03-05
-PKG_SOURCE_VERSION:=e1715ce125d55b125b1b58a6f1819ef8e54cc3ba
-PKG_MIRROR_HASH:=521585ebfda0ecc02372b1a38ebf762fbbcead6d0b754a47599a5bf6bfdb3fb6
-
-PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/fs-cifsd
-	SUBMENU:=Filesystems
-	TITLE:=CIFS/SMB kernel server support
-	FILES:=$(PKG_BUILD_DIR)/cifsd.$(LINUX_KMOD_SUFFIX)
-	DEPENDS+= \
-		+kmod-nls-base \
-		+kmod-nls-utf8 \
-		+kmod-crypto-md4 \
-		+kmod-crypto-md5 \
-		+kmod-crypto-hmac \
-		+kmod-crypto-ecb \
-		+kmod-crypto-des \
-		+kmod-crypto-sha256 \
-		+kmod-crypto-cmac \
-		+kmod-crypto-sha512 \
-		+kmod-crypto-aead \
-		+kmod-crypto-ccm
-	KCONFIG:= \
-		CONFIG_KEYS=y \
-		CONFIG_CRYPTO_ARC4=y
-endef
-
-define KernelPackage/fs-cifsd/description
-	Kernel module for a CIFS/SMBv2,3 fileserver.
-endef
-
-TARGET_CFLAGS+= -DCONFIG_CIFSD_ACL
-
-MAKE_OPTS:=\
-	ARCH="$(LINUX_KARCH)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	M="$(PKG_BUILD_DIR)"
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CONFIG_CIFS_SERVER=m \
-		modules
-endef
-
-$(eval $(call KernelPackage,fs-cifsd))

cifsd/patches/001-fix_implicit_declarations.patch

@@ -1,69 +0,0 @@
---- a/vfs.c
-+++ b/vfs.c
-@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
- 
- 	attrs->ia_valid |= ATTR_CTIME;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(inode);
--	err = notify_change(dentry, attrs, NULL);
--	inode_unlock(inode);
--#else
- 	mutex_lock(&inode->i_mutex);
- 	err = notify_change(dentry, attrs, NULL);
- 	mutex_unlock(&inode->i_mutex);
--#endif
- 
- 	if (update_size)
- 		put_write_access(inode);
-@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
- 	if (!dir->d_inode)
- 		goto out;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
--#else
- 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
--#endif
-+
- 	dentry = lookup_one_len(last, dir, strlen(last));
- 	if (IS_ERR(dentry)) {
- 		err = PTR_ERR(dentry);
-@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
- 
- 	dput(dentry);
- out_err:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
- out:
- 	path_put(&parent);
- 	return err;
-@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 	int err = 0;
- 
- 	dget(dentry);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(dir->d_inode);
--#else
- 	mutex_lock(&dir->d_inode->i_mutex);
--#endif
-+
- 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
- 		err = -ENOENT;
- 		goto out;
-@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 		err = vfs_unlink(dir->d_inode, dentry, NULL);
- 
- out:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
-+
- 	dput(dentry);
- 	if (err)
- 		cifsd_debug("failed to delete, err %d\n", err);

crashlog/Makefile

@@ -1,18 +1,9 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=crashlog
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
 
 include $(INCLUDE_DIR)/package.mk
 

crashlog/files/etc/init.d/crashlog

@@ -4,15 +4,16 @@ START=99
 
 send_log()
 {
-	nr=$(db get hw.board.serial_number)
-	hw=$(db get hw.board.model_name)
-	fam=$(db get hw.board.iopVerFam)
+	nr=$(db get hw.board.serialNumber)
+	hw=$(db get hw.board.hardware)
+	hwv=$(db get hw.board.hardwareVersion)
+	bid=$(db get hw.board.boardId)
 	sw=$(db get hw.board.iopVersion)
 	server=$(/sbin/uci get system.crashlog.server)
 
 	while true
 	do
-	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${fam}_${hw}_${sw}_${nr}
+	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${bid}_${hwv}_${hw}_${sw}_${nr}
 	    if [ $? == 0 ]
 	    then
 	       break;
@@ -27,7 +28,7 @@ fill_in_default()
     /sbin/uci add system log
     /sbin/uci rename system.@log[-1]=crashlog
     /sbin/uci set system.crashlog.enable=no
-    /sbin/uci set system.crashlog.server="crashlog.iopsys.eu"
+    /sbin/uci set system.crashlog.server="crash.inteno.se"
     /sbin/uci commit
 }
 

crashlog/files/sbin/logcore

@@ -20,7 +20,7 @@ fill_in_default()
     /sbin/uci add system log
     /sbin/uci rename system.@log[-1]=corelog
     /sbin/uci set system.corelog.enable=no
-    /sbin/uci set system.corelog.server="corelog.iopsys.eu"
+    /sbin/uci set system.corelog.server="crash.inteno.se"
     /sbin/uci commit
 }
 
@@ -50,11 +50,12 @@ cat >$TMP_CORE
 # more memory to work with. normally this would do nothing.
 cat >/dev/null
 
-nr=$(db get hw.board.serial_number)
-hw=$(db get hw.board.model_name)
-fam=$(hw.board.iopVerFam)
+nr=$(db get hw.board.serialNumber)
+hw=$(db get hw.board.hardware)
+hwv=$(db get hw.board.hardwareVersion)
+bid=$(db get hw.board.boardId)
 sw=$(db get hw.board.iopVersion)
 
-scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${fam}_${hw}_${sw}_${nr}
+scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${bid}_${hwv}_${hw}_${sw}_${nr}
 rm $TMP_CORE
 

dectmngr/Makefile

@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.24
+PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=6ba403663bc9cfdb8f89fb34de367f0796d68552
+PKG_NAME:=dectmngr
+
+
+LDFLAGS+= \
+        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+		-Wl,-rpath-link=$(STAGING_DIR)/lib
+
+RSTRIP:=true
+export BUILD_DIR
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dectmngr
+  CATEGORY:=Utilities
+  TITLE:=Broadcom endpoint test application
+  URL:=
+  DEPENDS:= +libevent2 +libjson +natalie-dect-h bcmkernel
+endef
+
+define Package/dectmngr/description
+	Dect proxy, manager and tools
+endef
+
+
+define Package/dectmngr/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/dect
+	$(INSTALL_DIR) $(1)/etc/init.d/
+	$(INSTALL_DIR) $(1)/etc/dect/
+	$(INSTALL_DIR) $(1)/etc/config/
+
+	cp $(PKG_BUILD_DIR)/dectmngr $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/atohx $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/dectproxy $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/dectdbgd $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/dect $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/dectcalib $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/dect_testmode $(1)/usr/bin/
+	cp files/etc/init.d/* $(1)/etc/init.d/
+	cp files/etc/hotplug.d/dect/* $(1)/etc/hotplug.d/dect/
+	cp files/etc/dect/* $(1)/etc/dect/
+	cp files/etc/config/* $(1)/etc/config/
+	cp files/sbin/dectreg $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,dectmngr))

dectmngr/files/etc/config/dect

@@ -0,0 +1,3 @@
+config dect 'dect'
+	option 'radio' 'auto'
+

dectmngr/files/etc/hotplug.d/dect/00-dectstate

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "$ACTION" == "led_blink" ]; then
+    ubus call led.dect set '{"state":"notice"}'
+fi
+
+if [ "$ACTION" == "led_on" ]; then
+    ubus call led.dect set '{"state":"ok"}'
+fi
+
+if [ "$ACTION" == "led_off" ]; then
+    ubus call led.dect set '{"state":"off"}'
+fi
+
+

dectmngr/files/etc/init.d/dect

@@ -0,0 +1,60 @@
+#!/bin/sh /etc/rc.common
+
+START=97
+STOP=10
+USE_PROCD=1
+
+DEST=
+DEFAULT=
+OPTIONS=""
+
+
+start_service() {
+	# avoid fp timing problem
+	echo 1 > /proc/sys/kernel/printk_with_interrupt_enabled
+	
+	# setup board specific dect parameters
+	cat /proc/nvram/rfpi | tr -d ' ' | atohx > /tmp/rfpi
+	cat /proc/nvram/fixed_emc | tr -d ' ' | atohx > /tmp/fixed_emc
+	cat /proc/nvram/bcm_def_freq | tr -d ' ' | atohx > /tmp/bcm_def_freq
+	DECTANTDIV=`db get hw.board.DectAntennaDiversity`
+	case "$DECTANTDIV" in
+		1|off) echo -ne "\x01" > /tmp/dect_antenna_diversity ;;
+		2) echo -ne "\x02" > /tmp/dect_antenna_diversity ;;
+		*) echo -ne "\x00" > /tmp/dect_antenna_diversity ;;
+	esac
+
+	if [ ! -f /etc/dect/nvs ]; then
+		cp /etc/dect/nvs_default /etc/dect/nvs
+		dd of=/etc/dect/nvs if=/tmp/rfpi conv=notrunc bs=1 seek=0
+		dd of=/etc/dect/nvs if=/tmp/fixed_emc conv=notrunc bs=1 seek=10
+		dd of=/etc/dect/nvs if=/tmp/bcm_def_freq conv=notrunc bs=1 seek=6
+		dd of=/etc/dect/nvs if=/tmp/dect_antenna_diversity conv=notrunc bs=1 seek=32
+		fsync /etc/dect/nvs
+	fi
+	
+	# init dectproxy
+	dectproxy > /dev/null 2>&1 &
+	dectmngr > /tmp/dectmngr 2>&1 &
+}
+
+stop_service() {
+        killall -9 dectproxy
+	killall -9 dectmngr
+}
+
+restart_service() {
+	echo "restarting dect"
+	killall dectmngr
+	dectmngr > /tmp/dectmngr 2>&1 &
+}
+
+reload_service() {
+	# reload config
+	dect -c
+}
+
+service_triggers() {
+        procd_add_reload_trigger dect
+}
+

dectmngr/files/sbin/dectreg

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# This script is likely not used. Just exit with
+# an error and see if someone screems... If not,
+# we can delete this file.
+exit 1
+
+
+[ -f /var/dectisregistering ] || {
+	touch /var/dectisregistering 2>/dev/null
+	/usr/bin/dectmngr -r
+	ubus call led.dect  set '{"state" : "notice"}'
+	sleep 20
+	rm /var/dectisregistering 2>/dev/null
+	/usr/bin/dectmngr -s
+	ubus call led.dect  set '{"state" : "ok"}'
+}

dectmngr2/Makefile

@@ -1,27 +1,30 @@
 #
-# Copyright (C) 2019 iopsys Software Solutions AB
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
+
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.3.0
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
+PKG_VERSION:=1.1.0
+PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2c8990fd5275d469e8ab6c7a99e17fe0a56052ea
+PKG_SOURCE_VERSION:=a51f8ed1b9178262777f73f7c275d3962f829c8a
 PKG_NAME:=dectmngr2
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
 
+LDFLAGS+= \
+        -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+		-Wl,-rpath-link=$(STAGING_DIR)/lib
+
+RSTRIP:=true
 export BUILD_DIR
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -29,7 +32,7 @@ define Package/dectmngr2
   CATEGORY:=Utilities
   TITLE:=Dectmngr2
   URL:=
-  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus +libpicoevent endptmngr
+  DEPENDS:= +natalie-dect-h bcmkernel +libubox +ubus
 endef
 
 define Package/dectmngr2/description
@@ -38,19 +41,11 @@ endef
 
 
 define Package/dectmngr2/install
-	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/bin
 	$(INSTALL_DIR) $(1)/etc/dect/
-	$(INSTALL_DIR) $(1)/etc/config/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
 
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/sbin/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/nvs_default $(1)/etc/dect/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dect $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/dectmngr-wrapper.sh $(1)/usr/sbin/
-	$(CP) ./files/dect.config $(1)/etc/config/dect
-	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
+	cp $(PKG_BUILD_DIR)/src/dectmngr2 $(1)/usr/bin/
+	cp $(PKG_BUILD_DIR)/files/target.bin $(1)/etc/dect/
 endef
 
 $(eval $(call BuildPackage,dectmngr2))

dectmngr2/files/dect.config

@@ -1,4 +0,0 @@
-
-config dect 'dect'
-	option radio 'auto'
-

dectmngr2/files/etc/uci-defaults/22-dect-defaults

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-
-# Workaround for product DG400 which has an
-# incorrect value in nvram from factory.
-
-if [ -e "/proc/nvram/BoardId" ]; then
-	boardid=$(cat /proc/nvram/BoardId)
-	ulBoardStuffOption=$(cat /proc/nvram/ulBoardStuffOption)
-
-	if [ "$boardid" = "DG400R0" -a "$ulBoardStuffOption" = "0xffffffff" ]; then
-		echo "0xfffffff2" >/proc/nvram/ulBoardStuffOption
-
-		db -q batch <<-EOT
-			set hw.board.has_dect=1
-			commit hw.board
-		EOT
-	fi
-fi
-
-
-exit 0
-

dslmngr/Makefile

@@ -1,82 +0,0 @@
-#
-# Copyright (C) 2018 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dslmngr
-PKG_VERSION:=1.0.1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=63525fe43aa57a710bb097e4c0ed496c4032db6d
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-
-include $(INCLUDE_DIR)/package.mk
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-define Package/dslmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl
-endef
-
-define Package/dslmngr/description
- This package can be used to configure and provide status about
- the XDSL subsystem through UBUS.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-I$(STAGING_DIR)/usr/include/xdsl \
-	-D_GNU_SOURCE
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/dslmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/Compile
-	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
-endef
-
-define Package/dslmngr/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,dslmngr))

easy-qos/Makefile

@@ -1,51 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# 
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-qos
-PKG_VERSION:=1.1
-PKG_RELEASE:=0
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-qos
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_brcm63xx_mips)
-endef
-
-define Package/easy-qos/description
-	This package contains Easy QoS utility
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/easy-qos/install
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
-ifeq ($(CONFIG_TARGET_intel_mips),y)
-	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
-else
-	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
-endif
-	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
-	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
-endef
-
-$(eval $(call BuildPackage,easy-qos))

easy-qos/files/etc/firewall.easyqos

@@ -1 +0,0 @@
-/etc/init.d/easy_qos reload

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -1,301 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-RULE_LIST="/tmp/easy_qos_rule.list"
-CLIENT_LIST="/tmp/easy_qos_class_client.list"
-BRIDGE_INTF=""
-
-[ -f /etc/profile.d/intel.sh ] && {
-	. /etc/profile.d/intel.sh
-	sh /etc/profile.d/intel.sh
-}
-
-log() {
-	echo "${@}"|logger -t easy_qos_class -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-exec_class_log() {
-	${@} |grep -i successful
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-		return 1
-	fi
-	return 0
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 8;;
-		"low")
-			echo 7;;
-		"besteffort")
-			echo 6;;
-		"normal")
-			echo 5;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 3;;
-		"high")
-			echo 2;;
-		"highest")
-			echo 1;;
-	esac
-}
-
-get_mark() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo "0x41/0x3df";;
-		"low")
-			echo "0x82/0x3df";;
-		"besteffort")
-			echo "0xc3/0x3df";;
-		"normal")
-			echo "0x104/0x3df";;
-		"video")
-			echo "0x145/0x3df";;
-		"medium")
-			echo "0x186/0x3df";;
-		"high")
-			echo "0x1c7/0x3df";;
-		"highest")
-			echo "0x208/0x3df";;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-
-	IFS=";"
-	for client in ${clients};
-	do
-		macaddr=$(echo ${client} | cut -d" " -f1)
-		json_add_object "${macaddr//:/_}"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	# jshn seems a bit iffy on having : in key, replace by _
-	json_select "${1//:/_}" 2 > /dev/null
-	json_get_var ip ip
-
-	echo "$ip"
-}
-
-check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_ip_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j EXTMARK --set-mark ${mark}";
-	if [ "${proto}" != "icmp" ]; then
-		if [ -n "${ports}" ]; then
-			cmd="--match multiport --dports ${ports} ${cmd}";
-		fi
-	fi
-
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-
-	check_and_create ${cmd}
-}
-
-is_lan_bridge() {
-	local _section=$1
-	local _type
-	local _is_lan
-
-	config_get _type "$section" "type"
-	config_get _is_lan "$section" "is_lan"
-
-	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
-		BRIDGE_INTF="br-${_section}"
-	fi
-}
-
-get_bridge_interface() {
-	config_load network
-	config_foreach is_lan_bridge interface
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	# execute the delete rules written onto a file then delete the file
-	[ -f ${RULE_LIST} ] || return 0
-
-	while read line
-	do
-		log "Deleting old classification rules"
-		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
-	done <${RULE_LIST}
-
-	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
-	done
-	sync
-
-	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
-}
-
-# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
-create_rule() {
-	local proto=$1; shift
-	local mac_addr=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-	# Rule name is uniqe, so we take hash of all the input as rule_name
-	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
-
-	cmd="-j mark --mark ${mark}";
-
-	if [ "${mac_addr}" != "none" ]; then
-		cmd="--smac ${mac_addr} ${cmd}";
-	fi
-
-	if [ "${proto}" != "icmp" ]; then
-		if [ "${ports}" != "none" ]; then
-			IFS=","
-			for port in ${ports};
-			do
-				cmd="--dport ${port}:${port} ${cmd}";
-			done
-			IFS=' '
-		fi
-	fi
-	if [ "${proto}" != "none" ]; then
-		cmd="-p ${proto} $cmd"
-	fi
-	cmd="-i ${BRIDGE_INTF} $cmd"
-	cmd="-A ${rule_name} $cmd"
-
-	# Store the rule_names for cleanup on reload
-	exec_class_log classcfg ${cmd}
-	[ $? -eq 0 ] && \
-		echo ${rule_name}  >> ${RULE_LIST}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num port_list ip ipmark
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-	ipmark=$(get_mark ${priority})
-	ip=$(get_ipaddress ${macaddr})
-
-	if [ -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${macaddr} ${prio_num} ${port_list}
-			create_rule udp ${macaddr} ${prio_num} ${port_list}
-			if [ -n "${ip}" ]; then
-				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
-				create_ip_rule udp ${ip} ${ipmark} ${port_list}
-			fi
-		else
-			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
-			if [ -n "${ip}" ]; then
-				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	get_bridge_interface
-	map_client_entries
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
-	reload_service
-	log "Easy QoS class installed"
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos" "network"
-}
-

easy-qos/files/etc/init.d/easy_qos.ebtables

@@ -1,140 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t easy_qos.ebtable -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	while [ -n "${rule}" ]; do
-		exec_log ebtables -t broute -D BROUTING ${rule}
-		rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
-	done
-}
-
-create_rule() {
-	local protocol=$1; shift
-	local mac=$1; shift
-	local mark="0x$1"; shift
-	local forward_port=$1;
-	local cmd="";
-	local protocol_number
-
-	cmd="-j mark --mark-or ${mark}";
-	if [ -n "${forward_port}" ]; then
-		cmd="--ip-destination-port ${forward_port} ${cmd}";
-	fi
-	
-	case "${protocol}" in
-		"tcp")
-			protocol_number=6;;
-		"udp")
-			protocol_number=17;;
-		"dccp")
-			protocol_number=33;;
-		"sctp")
-			protocol_number=132;;
-		*)
-			log "Protocol ${protocol} not supported in ebtables"
-			return;;
-	esac
-			
-	cmd="--ip-proto ${protocol_number} $cmd"
-	cmd="-p ip $cmd"
-
-	cmd="-s ${mac} $cmd"
-	exec_log ebtables -t broute -A BROUTING ${cmd}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num protocol
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	protocol=$(echo ${proto}|tr [A-Z] [a-z])
-	prio_num=$(get_priority ${priority})
-	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
-		for p in ${port}; do
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num} ${p}
-				create_rule udp ${macaddr} ${prio_num} ${p}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num} ${p}
-			fi
-		done
-		# Create rule for all ports if port is not mentioned in uci
-		if [ -z "${port}" ]; then
-			if [ "${protocol}" == "none" -o "${protocol}" == "tcpudp" ]; then
-				create_rule tcp ${macaddr} ${prio_num}
-				create_rule udp ${macaddr} ${prio_num}
-			else
-				create_rule ${protocol} ${macaddr} ${prio_num}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	# Do not apply rules if ebtables is not present in system
-	[ -x /usr/sbin/ebtables ] || return;
-
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-}
-
-start_service() {
-	reload_service
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-

easy-qos/files/etc/init.d/easy_qos.iptables

@@ -1,186 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /usr/share/libubox/jshn.sh
-
-START=99
-USE_PROCD=1
-
-CLIENT_LIST="/tmp/easy_qos_client.list"
-
-log() {
-	echo "${@}"|logger -t easy_qos -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
-	case "${prio}" in
-		"lowest")
-			echo 0;;
-		"low")
-			echo 1;;
-		"besteffort")
-			echo 2;;
-		"normal")
-			echo 3;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 5;;
-		"high")
-			echo 6;;
-		"highest")
-			echo 7;;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-
-#	json_add_array "clients"
-	IFS=";"
-	for client in ${clients};
-	do
-		macaddr=$(echo ${client} | cut -d" " -f1)
-		json_add_object "${macaddr//:/_}"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	# jshn seems a bit iffy on having : in key, replace by _
-	json_select "${1//:/_}" 2 > /dev/null
-	json_get_var ip ip
-
-	echo "$ip"
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	local rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING | grep -m 1 MARK |sed 's/-A/-D/1')
-	done
-}
-
-check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark="0x$1/0x$1"; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j MARK --set-xmark ${mark}";
-	if [ -n "${ports}" ]; then
-		cmd="--match multiport --dports ${ports} ${cmd}";
-	fi
-
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-
-	check_and_create ${cmd} 
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num ip port_list
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	ip=$(get_ipaddress ${macaddr})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-
-	if [ -n "${ip}" -a -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${ip} ${prio_num} ${port_list}
-			create_rule udp ${ip} ${prio_num} ${port_list}
-		else
-			create_rule ${proto} ${ip} ${prio_num} ${port_list}
-		fi
-	fi
-}
-
-reload_service() {
-	clear_existing_rules
-	map_client_entries
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	reload_service
-	echo "Easy QoS installed">/dev/console;
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos"
-}
-

easy-qos/files/etc/uci-defaults/60-easyqos-reqs

@@ -1,8 +0,0 @@
-# Add firewall include
-uci -q batch <<-EOT
-        delete firewall.easyqos
-        set firewall.easyqos=include
-        set firewall.easyqos.path=/etc/firewall.easyqos
-        set firewall.easyqos.reload=1
-        commit firewall
-EOT

easy-soc-events/Makefile

@@ -1,109 +0,0 @@
-# All rights reserved.
-# See LICENSE for more information.
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=easy-soc-events
-PKG_VERSION:=1.1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/easy-soc-events.git
-PKG_SOURCE_VERSION:=5c582b0165b574dc94e4865f82e0bb91fa561754
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/easy-soc-events-$(PKG_VERSION)
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-
-include $(INCLUDE_DIR)/package.mk
-
--include $(TOPDIR)/.config
-
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-  LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1
-  LINUX_VERSION := 4.1.52
-  LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
-  BCM_BS_PROFILE := $(patsubst "%",%,$(CONFIG_BCM_KERNEL_PROFILE))
-  FS_DIR := $(BUILD_DIR)/bcmkernel/bcm963xx/targets/$(BCM_BS_PROFILE)/fs
-  MODULES_SUBDIR:=lib/modules/$(LINUX_VERSION)/extra
-  TARGET_MODULES_DIR:=/$(MODULES_SUBDIR)
-endif
-
-
-define KernelPackage/easy-soc-events/default
-  SUBMENU:=Other modules
-endef
-
-define KernelPackage/easy-soc-events
-  $(KernelPackage/easy-soc-events/default)
-  TITLE:=Helper module for netlink event notification
-  FILES:=$(PKG_BUILD_DIR)/easyevent.ko
-  AUTOLOAD:=$(call AutoLoad,11,easyevent)
-endef
-
-define KernelPackage/easy-soc-events-test
-  $(KernelPackage/easy-soc-events/default)
-  TITLE:=Test module for event notification through easyevent
-  DEPENDS+=+kmod-easy-soc-events
-  FILES+=$(PKG_BUILD_DIR)/test/testevent.ko
-endef
-
-
-define KernelPackage/easy-soc-events/description
-  This is a helper module to generate and pass netlink events from
-  kernel to user applications.
-endef
-
-#NOSTDINC_FLAGS :=
-
-ifdef CONFIG_PACKAGE_kmod-easy-soc-events
-  PKG_MAKE_FLAGS += CONFIG_EASYEVENT=y
-endif
-
-LINUXINCLUDE += \
-		-I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
-		-Iarch/$(LINUX_KARCH)/include \
-		-Iarch/$(LINUX_KARCH)/include/generated \
-		-Iarch/$(LINUX_KARCH)/include/generated/$(LINUX_UAPI_DIR) \
-		-I$(LINUX_DIR)/include/generated/uapi \
-		-Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
-		-include ./include/linux/kconfig.h
-
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-endef
-
-define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) V=1 \
-		$(PKG_MAKE_FLAGS) \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-		LINUXINCLUDE="$(LINUXINCLUDE)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		modules
-endef
-
-
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-define KernelPackage/easy-soc-events/install-extra
-	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
-endef
-endif
-
-define KernelPackage/easy-soc-events/install
-	$(call KernelPackage/easy-soc-events/install-extra)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
-	#$(INSTALL_DIR) $(STAGING_DIR)/usr/include/linux
-	#$(CP) $(PKG_BUILD_DIR)/easysoc-event.h $(STAGING_DIR)/usr/include/linux/
-	#$(CP) $(PKG_BUILD_DIR)/easysoc-event.h $(LINUX_DIR)/include/linux/
-	$(CP) $(PKG_BUILD_DIR)/easyevent.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/wifievent.h $(STAGING_DIR)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/easyevent.h $(LINUX_DIR)/include/generated/uapi
-	$(CP) $(PKG_BUILD_DIR)/wifievent.h $(LINUX_DIR)/include/generated/uapi
-endef
-
-$(eval $(call KernelPackage,easy-soc-events-test))
-$(eval $(call KernelPackage,easy-soc-events))

easy-soc-libs/Config.in

@@ -1,23 +0,0 @@
-if (PACKAGE_libwifi || PACKAGE_libdsl || PACKAGE_libethernet)
-menu "configurations"
-
-config IOP_LLA_LIBS_DEBUG
-	bool "Enable debugging support"
-	default n
-
-config LIBWIFI_DEBUG
-	depends on PACKAGE_libwifi
-	bool "Enable wifi debugging"
-	default n
-
-config LIBDSL_DEBUG
-	depends on PACKAGE_libdsl
-	bool "Enable xdsl debugging"
-	default n
-
-config LIBDSL_TEST
-	depends on PACKAGE_libdsl
-	bool "Libdsl test program"
-	default n
-endmenu
-endif

easy-soc-libs/Makefile

@@ -1,208 +0,0 @@
-#
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-soc-libs
-PKG_VERSION:=5.3.15
-PKG_RELEASE:=1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a2289131c5d1f602568a2e8cac1295442504827f
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-soc-libs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=IOPSYS easy SoC libraries
-  SUBMENU:=IOPSYS easy SoC libraries
-  DEPENDS:=+libopenssl
-  MENU:=1
-endef
-
-define Package/libwifi/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Common helper functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-define Package/libwifi
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Package/libethernet
-  $(call Package/easy-soc-libs)
-  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
-endef
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138 \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
-  ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_panther),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM96846
-  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_tiger),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM96858
-  else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm_eagle),y)
-    TARGET_CFLAGS +=-DCONFIG_BCM963178
-  else
-    TARGET_CFLAGS +=-DCONFIG_BCM963138
-  endif
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-  TARGET_CFLAGS +=-DIOPSYS_MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
-  TARGET_CFLAGS +=-DIOPSYS_INTEL
-else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
-  TARGET_PLATFORM=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
-  TARGET_PLATFORM=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-else
-  $(info Unexpected CONFIG_TARGET)
-endif
-
-export TARGET_PLATFORM
-
-ifdef CONFIG_IOP_LLA_LIBS_DEBUG
-  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
-endif
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= XDSL library (libdsl)
-  DEPENDS+=+TARGET_intel_mips:dsl-cpe-api-vrx +TARGET_intel_mips:dsl-cpe-fapi +TARGET_intel_mips:kmod-ppa-drv
-endef
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet)
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
-	-I$(STAGING_DIR)/usr/include/libnl3
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	subdirs="$(subdirs)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Build/InstallDev/libeasy
-	$(INSTALL_DIR) $(1)/usr/include/easy
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/event.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev/libwifi
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include/xdsl
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xtm.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/common.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-define Build/InstallDev/libethernet
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default)
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endif
-endef
-
-define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
-endef
-
-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef
-
-define Package/easy-soc-libs/install
-	:
-endef
-
-$(eval $(call BuildPackage,libeasy))
-$(eval $(call BuildPackage,libwifi))
-$(eval $(call BuildPackage,libdsl))
-$(eval $(call BuildPackage,libethernet))

endptcfg/Makefile

@@ -0,0 +1,90 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=endptcfg
+PKG_VERSION:=0.2
+
+PKG_SOURCE_VERSION:=1194b05278bd0945ca5c76436e56617b86871a65
+ifeq ($(CONFIG_BCM_OPEN),y)
+BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_NAME:=endptcfg-open
+else
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=git@private.inteno.se:endptcfg
+PKG_SOURCE_PROTO:=git
+endif
+
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+
+LDFLAGS+= \
+		-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+		-Wl,-rpath-link=$(STAGING_DIR)/lib
+
+BCMKERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+export BCMKERNEL_DIR
+
+TARGET_LDFLAGS += $(BCMKERNEL_DIR)/userspace/private/apps/vodsl/telephonyProfiles/telephonyProfiles.o \
+			$(BCMKERNEL_DIR)/userspace/private/apps/vodsl/voip/util/log/vodslLog.o \
+			$(BCMKERNEL_DIR)/userspace/private/apps/vodsl/endpoint/endpoint_user.o \
+			$(BCMKERNEL_DIR)/userspace/private/apps/vodsl/bos/bos.o \
+			-lpthread
+
+ifeq ($(CONFIG_BRCM_SDK_VER_416040),y)
+TARGET_CFLAGS += -DFAKE_SSP
+endif
+
+RSTRIP:=true
+export BUILD_DIR
+
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/endptcfg
+  CATEGORY:=Utilities
+  TITLE:=Broadcom endpoint driver configuration application
+  URL:=
+  DEPENDS:=+libpthread bcmkernel
+endef
+
+define Package/endptcfg/description
+	Broadcom endpoint driver configuration application
+endef
+
+ifneq ($(CONFIG_BCM_OPEN),y)
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(TARGET_CONFIGURE_OPTS) LINUX_DIR=$(LINUX_DIR) LDFLAGS="$(TARGET_LDFLAGS)" CFLAGS="$(TARGET_CFLAGS) \
+			-I$(LINUX_DIR)/include \
+			-I$(STAGING_DIR)/usr/include \
+			-DRS_ENDIAN_TYPE=RS_BIG_ENDIAN \
+			-DBOS_OS_LINUXUSER -DBOS_CFG_TIME \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/broadcom/include/bcm963xx \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/endpt/inc \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/inc \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/codec \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_common/bos/publicInc \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/voice_res_gw/casCtl/inc \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_drivers/inc \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/private/apps/vodsl/voip/inc \
+			-I$(STAGING_DIR)/usr/include/bcm963xx/xChange/dslx_common/xchg_common/bos/LinuxUser"
+endef
+else
+define Build/Compile
+endef
+endif
+
+define Package/endptcfg/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	cp $(PKG_BUILD_DIR)/endptcfg $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,endptcfg))

endptmngr/Config.in

@@ -1,4 +0,0 @@
-
-config ENDPT_OPEN
-       bool "Use pre-compiled version for Open SDK"
-       default n

endptmngr/Makefile

@@ -1,68 +0,0 @@
-#
-# Copyright (C) 2018 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_RELEASE:=1
-PKG_VERSION:=0.3
-PKG_SOURCE_VERSION:=34ae1996beda98691d779e49f231bd662fc87cda
-PKG_LICENSE:=MIT
-PKG_LICENSE_FILES:=LICENSE
-
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
-PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
-PKG_NAME:=endptmngr-open
-PATCH_DIR:=
-PKG_HASH:=skip
-else
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_PROTO:=git
-PKG_NAME:=endptmngr
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-endif
-
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/endptmngr/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/endptmngr
-  CATEGORY:=Utilities
-  TITLE:=Brcmslic
-  URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE @!TARGET_NO_VOICE
-endef
-
-define Package/endptmngr/description
-	endptmngr
-endef
-
-ifeq ($(CONFIG_ENDPT_OPEN),y)
-
-define Build/Compile
-endef
-
-endif
-
-
-define Package/endptmngr/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	cp $(PKG_BUILD_DIR)/files/etc/init.d/* $(1)/etc/init.d/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,endptmngr))

ethmngr/Makefile

@@ -1,45 +0,0 @@
-#
-# Copyright (C) 2020 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=ethmngr
-PKG_VERSION:=1.0.4
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b7135381aedf1bde6f7ab10b41be372a9bd7d155
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=GPL-2.0-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ethmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Ethernet status and configration utility
-  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
-endef
-
-define Package/ethmngr/description
- This package can be used to configure and provide status about
- the ethernet interfaces and ports through UBUS.
- It uses APIs from the libethernet.so library.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-define Package/ethmngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,ethmngr))

ethmngr/files/ethmngr.init

@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=95
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/ethmngr
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-        stop
-        start
-}

fatrace/Makefile

@@ -1,61 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v3.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=fatrace
-PKG_VERSION:=0.12
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=98af6019a4a1b478a6fa35f74528cb3cd404ae40
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://git.launchpad.net/fatrace
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-3.0
-PKG_LICENSE_FILES:=LICENSE
-
-# support parallel build
-#PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-#PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-PKG_CONFIG_DEPENDS := CONFIG_KERNEL_FANOTIFY
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/fatrace
-	CATEGORY:=Utilities
-	TITLE:=Report system wide file access events
-	URL:=
-	DEPENDS	:= +@KERNEL_FANOTIFY
-endef
-
-define Package/fatrace/description
-	Report system wide file access events.
-endef
-
-MAKE_INSTALL_FLAGS += PREFIX="/" 
-
-define Package/fatrace/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/fatrace $(1)/sbin/
-#	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,fatrace))
-
-

fatrace/patches/001-fix-O_LARGEFILE.patch

@@ -1,14 +0,0 @@
-diff --git a/fatrace.c b/fatrace.c
-index 1c0899a..b7d1560 100644
---- a/fatrace.c
-+++ b/fatrace.c
-@@ -44,7 +44,8 @@
-  * http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=1e2ee49f7
-  * O_LARGEFILE is usually 0, so hardcode it here
-  */
--#define KERNEL_O_LARGEFILE 00100000
-+//#define KERNEL_O_LARGEFILE 00100000
-+#define KERNEL_O_LARGEFILE O_LARGEFILE
- 
- /* command line options */
- static char* option_output = NULL;

fatrace/patches/002-fflush.patch

@@ -1,12 +0,0 @@
-diff --git a/fatrace.c b/fatrace.c
-index b7d1560..6179272 100644
---- a/fatrace.c
-+++ b/fatrace.c
-@@ -149,6 +149,7 @@ print_event(const struct fanotify_event_metadata *data,
-         printf ("%li.%06li ", event_time->tv_sec, event_time->tv_usec);
-     }
-     printf ("%s(%i): %s %s\n", procname, data->pid, mask2str (data->mask), pathname);
-+    fflush(stdout);
- }
- 
- /**

gryphon-led-module/Makefile

@@ -1,62 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=gryphon-led-kernel-module
-PKG_RELEASE:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/$(PKG_NAME)
-  SUBMENU:=LED modules
-  TITLE:=LED driver for Gryphon
-  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
-  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  PKG_LICENSE:=GPLv2
-  PKG_LICENSE_URL:=
-endef
-
-define KernelPackage/$(PKG_NAME)/description
-  This package contains the LED driver for Gryphon devices.
-endef
-
-EXTRA_KCONFIG:= CONFIG_RGB_LED=m
-
-MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
-	$(CP) src/* $(PKG_BUILD_DIR)
-endef
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		SUBDIRS="$(PKG_BUILD_DIR)" \
-		EXTRA_CFLAGS="-DKERNEL_MODULE $(BUILDFLAGS) -I$(LINUX_DIR)/include -include generated/autoconf.h $(MODULE_INCLUDE)" \
-		modules
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-endef
-
-$(eval $(call KernelPackage,$(PKG_NAME)))

gryphon-led-module/src/Makefile

@@ -1,26 +0,0 @@
-# Copyright (c) 2017 Genexis B.V.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-# 02110-1301 USA
-
-MODULE_NAME  = gryphon-led-kernel-module
-
-obj-m  := $(MODULE_NAME).o
-
-GENEXIS_FILES= \
-	main.o \
-	sk9822.o \
-	sk9822_bitbang.o
-
-$(MODULE_NAME)-objs := $(GENEXIS_FILES)

gryphon-led-module/src/main.c

@@ -1,267 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#define DEBUG 1
-
-#include <linux/delay.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/printk.h>
-#include <linux/init.h>
-#include <linux/err.h>
-#include <linux/platform_device.h>
-#include <linux/gpio/consumer.h>
-#include <linux/of.h>
-#include <linux/version.h>
-
-#include "sk9822.h"
-
-#define DRIVER_NAME			"canyon_led"
-#define DRIVER_AUTHOR		"Genexis B.V."
-#define DRIVER_DESC			"Canyon LED driver for SK9822"
-#define DRIVER_VERSION	"1"
-
-/**
- * sysfs interfaces
- */
-
-static ssize_t get_led_color(struct device *dev,
-		struct device_attribute *attr, char *buf)
-{
-	/* [ln] todo: dummy implementation */
-	int len;
-
-	len = sprintf(buf, "%d\n", 123);
-	if (len <= 0) {
-		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
-	}
-
-	return len;
-}
-
-/**
- * @brief Set complete LED strip to a specific color
- * @retval count number of bytes written
- * @retval -EMSGSIZE if the message is too big
- * @retval -EIO for all other errors (e.g. leds cannot be configured)
- */
-static ssize_t set_led_color(struct device *dev,
-		struct device_attribute *attr, const char *buf, size_t count)
-{
-	int ret = 0;
-	size_t buflen = count;
-	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
-
-	if (IS_ERR(sk9822)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -EIO;
-	}
-
-	/* strip newline */
-	if ((count > 0) && (buf[count-1] == '\n')) {
-		buflen--;
-	}
-
-	if (buflen != 6) { // RRGGBB\0
-		return -EMSGSIZE;
-	}
-
-	// Update the LED array here
-	ret = sk9822_set_color_str(sk9822, buf);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to set led color\n");
-		return -EIO;
-	}
-
-	// Now push to the HW
-	ret = sk9822_update(sk9822);
-	if (ret != 0) {
-		printk(KERN_ERR "Failed to update led\n");
-		return -EIO;
-	}
-
-	return count;
-}
-static DEVICE_ATTR(led_color, S_IRUGO | S_IWUSR, get_led_color, set_led_color);
-
-static struct attribute *sk9822_dev_attrs[] = {
-	 &dev_attr_led_color.attr,
-	 NULL
-};
-
-static struct attribute_group sk9822_dev_attr_group = {
-	.name = "sk9822",
-	.attrs = sk9822_dev_attrs,
-};
-
-/**
- * device prope and removal
- */
-
-static int canyon_led_probe(struct platform_device *pdev)
-{
-	int ret;
-	struct sk9822_leds *leds;
-
-	leds = devm_kzalloc(&pdev->dev, sizeof(*leds), GFP_KERNEL);
-	if (!leds) {
-		return -ENOMEM;
-	}
-	leds->dev = &pdev->dev;
-	leds->led_brightness = SK9822_DEFAULT_BRIGHTNESS;
-
-	ret = of_property_read_u16(pdev->dev.of_node, "led-count", &leds->led_count);
-	if (ret < 0) {
-		dev_warn(&pdev->dev, "Could not read led-count property\n");
-		leds->led_count = SK9822_DEFAULT_NUM_LEDS;
-	} else {
-		printk(KERN_INFO "Got led count: %u\n", leds->led_count);
-	}
-
-	leds->led_colors = devm_kzalloc(&pdev->dev,
-			(sizeof(cRGB) * leds->led_count), GFP_KERNEL);
-	if (!leds->led_colors) {
-		return -ENOMEM;
-	}
-
-
-	platform_set_drvdata(pdev, leds);
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
-	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-	leds->clock_gpio = gpiod_get_index(&pdev->dev, "led", 0, GPIOD_OUT_HIGH);
-#else
-	dev_warn(&pdev->dev, "Kernel version Not supported\n");
-	exit(1);
-#endif
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	}
-
-	gpiod_direction_output(leds->clock_gpio, 1);
-	if (IS_ERR(leds->clock_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
-				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
-		return PTR_ERR(leds->clock_gpio);
-	} else {
-		printk(KERN_INFO "Got clock gpio\n");
-		gpiod_set_value(leds->clock_gpio, 0);
-	}
-
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 3, 0)
-	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1);
-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 3, 0)
-	leds->data_gpio = gpiod_get_index(&pdev->dev, "led", 1, GPIOD_OUT_HIGH);
-#else
-	dev_warn(&pdev->dev, "Kernel version Not supported\n");
-	exit(1);
-#endif
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	}
-
-	gpiod_direction_output(leds->data_gpio, 1);
-	if (IS_ERR(leds->data_gpio)) {
-		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
-				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
-		return PTR_ERR(leds->data_gpio);
-	} else {
-		printk(KERN_INFO "Got data gpio\n");
-		gpiod_set_value(leds->data_gpio, 0);
-	}
-
-	printk(KERN_INFO "Attempt to set filefs stuff\n");
-	ret = sysfs_create_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-	if (ret) {
-		dev_err(&pdev->dev, "sysfs creation failed\n");
-		return ret;
-	}
-
-#if 0
-	printk(KERN_INFO "Flash LEDs to verify they work\n");
-	sk9822_set_color_str(leds, "00FF00");
-	sk9822_update(leds);
-	msleep(200);
-	sk9822_set_color_str(leds, "000000");
-	sk9822_update(leds);
-#endif
-
-	printk(KERN_INFO "canyon led successfully probed\n");
-
-	return 0;
-}
-
-static int canyon_led_remove(struct platform_device *pdev)
-{
-	struct sk9822_leds *leds;
-
-	sysfs_remove_group(&pdev->dev.kobj, &sk9822_dev_attr_group);
-
-	leds = platform_get_drvdata(pdev);
-	if (IS_ERR(leds)) {
-		printk(KERN_ERR "Platform get drvdata returned NULL\n");
-		return -1;
-	}
-
-	if (leds->clock_gpio) {
-		gpiod_put(leds->clock_gpio);
-	}
-
-	if (leds->data_gpio) {
-		gpiod_put(leds->data_gpio);
-	}
-
-	printk(KERN_NOTICE "Bye, bye\n");
-
-	return 0;
-}
-
-/**
- * platform driver metadata
- */
-
-static const struct of_device_id canyon_led_of_ids[] = {
-	{ .compatible = "canyon,led" },
-	{ }
-};
-
-static struct platform_driver canyon_led = {
-	.probe = &canyon_led_probe,
-	.remove = &canyon_led_remove,
-	.driver = {
-		.name = DRIVER_NAME,
-		.owner = THIS_MODULE,
-		.of_match_table = canyon_led_of_ids,
-	},
-};
-
-MODULE_DEVICE_TABLE(of, canyon_led_of_ids);
-module_platform_driver(canyon_led);
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");

gryphon-led-module/src/sk9822.c

@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/kernel.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-#include "sk9822_bitbang.h"
-
-cRGB __hexs_to_rgb(const char *hex)
-{
-	cRGB rgb;
-	int r, g, b;
-
-	sscanf(hex, "%02x%02x%02x", &r, &g, &b);
-	// This needs sanity checking
-	rgb.r = r;
-	rgb.g = g;
-	rgb.b = b;
-	return rgb;
-}
-
-/**
- * @brief update the color over the given device struct to the provided HEX color
- */
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex)
-{
-	int i;
-	cRGB color = __hexs_to_rgb(hex);
-
-	for (i = 0; i < sk9822->led_count; i++) {
-		sk9822->led_colors[i] = color;
-	}
-
-	return 0;
-}
-
-/**
- * @brief write device struct to the device
- */
-int sk9822_update(struct sk9822_leds *sk9822)
-{
-	uint16_t i;
-	uint16_t led_count = sk9822->led_count;
-
-	// Start Frame
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-	sk9822_bb_write(sk9822, 0x00);
-
-	for (i = 0; i < led_count; i++) {
-		cRGB *p = &sk9822->led_colors[i];
-		sk9822_bb_write(sk9822, 0xe0+sk9822->led_brightness);  // Maximum global brightness
-		sk9822_bb_write(sk9822, p->b);
-		sk9822_bb_write(sk9822, p->g);
-		sk9822_bb_write(sk9822, p->r);
-	}
-
-	// End frame
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-	sk9822_bb_write(sk9822, 0xff);
-
-	return 0;
-}

gryphon-led-module/src/sk9822.h

@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef SK9822_H_
-#define SK9822_H_
-
-#include <linux/types.h>
-
-#define SK9822_DEFAULT_NUM_LEDS 32 // U16, used if DT param fails
-#define SK9822_DEFAULT_BRIGHTNESS 15  // 5-bit brightness, 0-31
-
-typedef struct {
-	uint8_t b;
-	uint8_t g;
-	uint8_t r;
-} cRGB;   // BGR (SK9822 Standard)
-
-struct sk9822_leds {
-	struct device *dev;
-	struct gpio_desc *clock_gpio;
-	struct gpio_desc *data_gpio;
-
-	cRGB *led_colors;
-	uint8_t led_brightness;
-	uint16_t led_count;
-};
-
-int sk9822_set_color_str(struct sk9822_leds *sk9822, const char *hex);
-int sk9822_update(struct sk9822_leds *sk9822);
-
-#endif /* SK9822_H_ */

gryphon-led-module/src/sk9822_bitbang.c

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#include <linux/gpio/consumer.h>
-#include <linux/delay.h>
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-/**
- * @brief Bitbang write operation CLOCK+DATA
- *
- * Assumed state before call: CLOCK- Low, DATA- High
- */
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c)
-{
-	uint8_t i;
-
-	for (i = 0; i < 8 ; i++) {
-		if (!(c&0x80)) {
-			gpiod_set_value(sk9822->data_gpio, 0); // set data low
-		} else {
-			gpiod_set_value(sk9822->data_gpio, 1); // set data high
-		}
-
-		gpiod_set_value(sk9822->clock_gpio, 1); // set clock high, data sampled here
-		c <<= 1;
-		udelay(1); // stretch clock
-		gpiod_set_value(sk9822->clock_gpio, 0); // set clock low
-	}
-
-	// State after call: SCK Low, Data high
-}

gryphon-led-module/src/sk9822_bitbang.h

@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2017 Genexis B.V.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
- */
-
-#ifndef _SK9822_BB_H_
-#define _SK9822_BB_H_
-
-#include <linux/types.h>
-
-#include "sk9822.h"
-
-void sk9822_bb_write(struct sk9822_leds *sk9822, uint8_t c);
-
-#endif /* _SK9822_BB_H_ */

ice-client/Makefile

@@ -0,0 +1,926 @@
+include $(TOPDIR)/rules.mk
+
+# We use the foldername as main package name
+PKG_NAME:=ice-client
+
+CFMODULES:=$(filter CONFIG_PACKAGE_$(PKG_NAME)-%,$(.VARIABLES))
+CFMODULES:=$(subst CONFIG_PACKAGE_$(PKG_NAME)-,,$(CFMODULES))
+$(info Building package: $(PKG_NAME))
+$(info Building with additional modules: $(CFMODULES))
+export CFMODULES
+
+export HOME_DIR:=$(TOPDIR)
+
+export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
+
+export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
+export LOGIN:=$(shell whoami)
+BASE_PKG_VERSION:=3.4.1
+PKG_RELEASE:=RC8
+PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+export PKG_VERSION
+
+###########################--RELEASE--################################
+
+PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
+PKG_SOURCE_VERSION:=ecad8b60183b43ecf86543c0c29db46cda8aae29
+ifeq ($(CONFIG_BCM_OPEN),y)
+BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
+PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(BASE_PKG_VERSION)$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+#PKG_NAME:=ice-client-open
+else
+PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
+endif
+
+
+###########################--RELEASE--################################
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ice-client/Default
+	CATEGORY:=Utilities
+	URL:=http://inteno.se/
+	DEPENDS:= ice-client
+endef
+
+define Package/ice-client
+$(call Package/ice-client/Default)
+	TITLE:=ice-client
+	MENU:=1
+	DEPENDS:=+libopenssl +libstdcpp +libubus +ubus +ubusd +jshn +libubox
+	DEFAULT:=y
+endef
+
+###########################--DEVELOPMENT--################################
+# Development settings
+# Uncomment stuff  Build/Prepare
+#
+# Plus make sure to comment and provide the following lines above
+# #PKG_SOURCE_URL:=ssh://git@private.inteno.se/ice-client.git
+# #PKG_SOURCE_VERSION:=a11bf64e6b1054803b52750aabd71bf440ff6e16
+# #PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(BASE_PKG_VERSION)
+# #PKG_SOURCE:=$(PKG_NAME)-$(BASE_PKG_VERSION)-$(PKG_RELEASE).tar.gz
+# 
+# PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(BASE_PKG_VERSION)
+# 
+#
+# These settings allow you to specify a soruce folder where your source code is located
+# This avoids having to tar-zip or fetch from git each time
+# Changes can be done in your sources while the build is performed somewhere else
+# If you forget some settings, your source folder will be deleted!!! So be carefull and 
+# check in or backup your sources first before doing this.
+#
+#define Build/Prepare
+#	rm -rf $(PKG_BUILD_DIR)
+#	ln -s /home/erik/Desktop/ice-client $(PKG_BUILD_DIR)
+##	ln -s /home/erik/Desktop/checkCompilation/iopsys-client $(PKG_BUILD_DIR)
+#endef
+
+###########################--DEVELOPMENT--################################
+
+
+#
+# Specify where and how to install the program. Since we only have one file,
+# the helloworld executable, install it by copying it to the /bin directory on
+# the router. The $(1) variable represents the root directory on the router running
+# OpenWrt. The $(INSTALL_DIR) variable contains a command to prepare the install
+# directory if it does not already exist.  Likewise $(INSTALL_BIN) contains the
+# command to copy the binary file from its current location (in our case the build
+# directory) to the install directory.
+
+ifeq ($(CONFIG_BCM_OPEN),y)
+define Build/Compile
+endef
+else
+define Build/Configure
+	echo $(BASE_PKG_VERSION)-$(PKG_RELEASE) > $(PKG_BUILD_DIR)/core/version.txt
+	echo $(DATE) > $(PKG_BUILD_DIR)/core/date.txt
+	echo $(LOGIN) > $(PKG_BUILD_DIR)/core/login.txt
+	$(MAKE) -C $(PKG_BUILD_DIR) config
+endef
+
+define Build/Clean
+	$(MAKE) -C $(PKG_BUILD_DIR) clean
+endef
+endif
+
+define Package/ice-client/preinst
+#!/bin/sh
+echo "backup current config"
+if [ -f "/etc/iopsys/server.ini" ]; then
+	cp /etc/iopsys/server.ini /tmp/iopsysserver.ini
+fi
+if [ -f "/etc/config/ice" ]; then
+	cp /etc/config/ice /tmp/ice.back
+fi
+exit 0
+endef
+
+ifeq ($(CONFIG_BCM_OPEN),y)
+define Package/ice-client/install
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/usr
+	$(CP) $(PKG_BUILD_DIR)/bin/* $(1)/bin/
+	$(CP) $(PKG_BUILD_DIR)/etc/* $(1)/etc/
+	$(CP) $(PKG_BUILD_DIR)/usr/* $(1)/usr/
+endef
+else
+define Package/ice-client/install
+	$(INSTALL_DIR) $(1)/bin
+	$(CP) $(PKG_BUILD_DIR)/core/ice $(1)/bin
+	$(CP) $(PKG_BUILD_DIR)/modules/system/ubusevent/obj/iopsys/ubusevent $(1)/bin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/{systemService.so.1.0.1,libconfStore.so.1,networkService.so.1.0.1,packageService.so.1.0.1,monitorService.so.1.0.1,iperfService.so.1.0.1,logService.so.1.0.1} $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/wsice/obj/iopsys/libwsice.so $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/bin/ifs/iperf/execute
+	$(INSTALL_DIR) $(1)/bin/ifs/iperf/progress
+	$(INSTALL_DIR) $(1)/bin/ifs/iperf/result
+	$(CP) $(PKG_BUILD_DIR)/scripts/scheduleiperf.sh $(1)/bin/ifs/iperf/execute
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) $(PKG_BUILD_DIR)/scripts/etc/config/ice $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/iopsys
+	$(CP) $(PKG_BUILD_DIR)/scripts/server.ini $(1)/etc/iopsys	
+	$(CP) $(PKG_BUILD_DIR)/scripts/modify.ini $(1)/etc/iopsys
+	$(INSTALL_DIR) $(1)/etc/iopsys/certificates
+	$(CP) $(PKG_BUILD_DIR)/scripts/cert_server_ca.pem $(1)/etc/iopsys/certificates
+	$(CP) $(PKG_BUILD_DIR)/scripts/inteno_root_ca.pem $(1)/etc/iopsys/certificates
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) $(PKG_BUILD_DIR)/scripts/ice-client $(1)/etc/init.d/ice-client
+endef
+endif
+
+define Package/ice-client/postinst
+#!/bin/sh
+echo "Enabling rc.d symlink for iopsys"
+cp /tmp/iopsysserver.ini /etc/iopsys/server.ini 
+rm -f /tmp/iopsysserver.ini 
+cp /tmp/ice.back /etc/config/ice 
+rm -f /tmp/ice.back
+if [ -f "/etc/rc.d/S99ice-client" ]; then
+	/etc/init.d/ice-client start
+fi
+exit 0
+endef
+
+# Additional modules
+ifneq ($(CONFIG_BCM_OPEN),y)
+# Camerawatch
+define Package/ice-client-camerawatch
+$(call Package/ice-client/Default)
+TITLE:=Camerawatch
+DEPENDS+= +libjpeg 
+endef
+
+define Package/ice-client-camerawatch/description
+Camerawatch module for ice-client
+endef
+
+define Package/ice-client-camerawatch/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=cameramanager" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-camerawatch/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=cameramanager" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-camerawatch/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/etc/iopsys
+	$(CP) $(PKG_BUILD_DIR)/core/lib/camerawatch.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-camerawatch/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	/bin/echo "system moduleAdd file=camerawatch.so.1.0.1" package="ice-client-camerawatch" > /tmp/cfin
+fi
+exit 0
+endef
+
+# Guest
+define Package/ice-client-guest
+  $(call Package/ice-client/Default)
+  TITLE:=Guest
+  DEPENDS+= 
+endef
+
+define Package/ice-client-guest/description
+Guest module for ice-client
+endef
+
+define Package/ice-client-guest/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=guestMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-guest/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=guestMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-guest/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/guestService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-guest/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	/bin/echo "system moduleAdd file=guestService.so.1.0.1" package="ice-client-guest" > /tmp/cfin
+fi
+exit 0
+endef
+
+# OpenVPN
+define Package/ice-client-openvpn
+  $(call Package/ice-client/Default)
+  TITLE:=OpenVPN
+  DEPENDS+= +openvpn
+endef
+
+define Package/ice-client-openvpn/description
+OpenVPN module for ice-client
+endef
+
+define Package/ice-client-openvpn/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=ovpnMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-openvpn/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=ovpnMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-openvpn/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/ovpnService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-openvpn/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	/bin/echo "system moduleAdd file=ovpnService.so.1.0.1" package="ice-client-openvpn" > /tmp/cfin
+fi
+exit 0
+endef
+
+# Anyfi
+define Package/ice-client-anyfi
+  $(call Package/ice-client/Default)
+  TITLE:=AnyFi
+  DEPENDS+= 
+endef
+
+define Package/ice-client-anyfi/description
+AnyFi module for ice-client
+endef
+
+define Package/ice-client-anyfi/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=anyfiMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-anyfi/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=anyfiMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-anyfi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/anyfiService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-anyfi/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	/bin/echo "system moduleAdd file=anyfiService.so.1.0.1" package="ice-client-anyfi" > /tmp/cfin
+fi
+exit 0
+endef
+
+# Netrounds
+define Package/ice-client-netrounds
+  $(call Package/ice-client/Default)
+  TITLE:=Netrounds
+  DEPENDS+= 
+endef
+
+define Package/ice-client-netrounds/description
+Netrounds module for ice-client
+endef
+
+define Package/ice-client-netrounds/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=netroundsMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-netrounds/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=netroundsMgr" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-netrounds/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/netroundsService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-netrounds/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	/bin/echo "system moduleAdd file=netroundsService.so.1.0.1" package="ice-client-netrounds" > /tmp/cfin
+fi
+exit 0
+endef
+
+# Logreader
+define Package/ice-client-logreader
+  $(call Package/ice-client/Default)
+  TITLE:=LogReader
+  DEPENDS+= 
+endef
+
+define Package/ice-client-logreader/description
+Logread module for ice-client
+endef
+
+define Package/ice-client-logreader/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=log" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-logreader/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  /bin/echo "system moduleRemove topic=log" > /tmp/cfin
+  /bin/sleep 3
+fi
+exit 0
+endef
+
+define Package/ice-client-logreader/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/logService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-logreader/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=logService.so.1.0.1" package="ice-client-logreader" > /tmp/cfin
+fi
+exit 0
+endef
+
+
+# fileme
+define Package/ice-client-fileme
+  $(call Package/ice-client/Default)
+  TITLE:=FileMe
+  DEPENDS+= +lighttpd +samba2-client
+endef
+
+define Package/ice-client-fileme/description
+FileMe module for ice-client
+endef
+
+define Package/ice-client-fileme/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=fileMeMgr" > /tmp/cfin
+  /bin/sleep 2
+fi
+exit 0
+endef
+
+define Package/ice-client-fileme/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=fileMeMgr" > /tmp/cfin
+  /bin/sleep 2
+fi
+exit 0
+endef
+
+define Package/ice-client-fileme/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/filemeService.so.1.0.1 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/etc/iopsys/fileme/lighttpd/conf.d
+	$(CP) $(PKG_BUILD_DIR)/scripts/fileme/mime.conf $(1)/etc/iopsys/fileme/lighttpd
+	$(CP) $(PKG_BUILD_DIR)/scripts/fileme/conf.d/10-webdav.conf $(1)/etc/iopsys/fileme/lighttpd/conf.d
+	$(INSTALL_DIR) $(1)/etc/iopsys/fileme/docroot/dav
+	$(INSTALL_DIR) $(1)/etc/iopsys/fileme/docroot/shares
+endef
+
+define Package/ice-client-fileme/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=filemeService.so.1.0.1" package="ice-client-fileme" > /tmp/cfin
+fi
+exit 0
+endef
+
+# example
+define Package/ice-client-example
+  $(call Package/ice-client/Default)
+  TITLE:=example
+  DEPENDS+= 
+endef
+
+define Package/ice-client-example/description
+example module for ice-client
+endef
+
+define Package/ice-client-example/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=example" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-example/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=example" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-example/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/exampleService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-example/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=exampleService.so.1.0.1" package="ice-client-example" > /tmp/cfin
+fi
+exit 0
+endef
+
+# iperf
+define Package/ice-client-iperf
+  $(call Package/ice-client/Default)
+  TITLE:=iperf
+  DEPENDS+= 
+endef
+
+define Package/ice-client-iperf/description
+iperf module for ice-client
+endef
+
+define Package/ice-client-iperf/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=iperfMgr" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-iperf/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=iperfMgr" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-iperf/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/iperfService.so.1.0.1 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/bin/ifs/iperf/execute
+	$(INSTALL_DIR) $(1)/bin/ifs/iperf/progress
+	$(INSTALL_DIR) $(1)/bin/ifs/iperf/result
+	$(CP) $(PKG_BUILD_DIR)/scripts/scheduleiperf.sh $(1)/bin/ifs/iperf/execute
+endef
+
+define Package/ice-client-iperf/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=iperfService.so.1.0.1" package="ice-client-iperf" > /tmp/cfin
+fi
+exit 0
+endef
+
+# rshell
+define Package/ice-client-rshell
+  $(call Package/ice-client/Default)
+  TITLE:=rshell
+  DEPENDS+= 
+endef
+
+define Package/ice-client-rshell/description
+rshell module for ice-client
+endef
+
+define Package/ice-client-rshell/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=rshellMgr" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-rshell/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=rshellMgr" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-rshell/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/rshellService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-rshell/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=rshellService.so.1.0.1" package="ice-client-rshell" > /tmp/cfin
+fi
+exit 0
+endef
+
+# rework
+define Package/ice-client-rework
+  $(call Package/ice-client/Default)
+  TITLE:=rework
+  DEPENDS+= 
+endef
+
+define Package/ice-client-rework/description
+rework module for ice-client
+endef
+
+define Package/ice-client-rework/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=rework" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-rework/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=rework" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-rework/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/reworkService.so.1.0.1 $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/bin
+	$(CP) $(PKG_BUILD_DIR)/modules/rework/sshpass-1.05/obj/iopsys/sshpass $(1)/bin
+endef
+
+define Package/ice-client-rework/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=reworkService.so.1.0.1" package="ice-client-rework" > /tmp/cfin
+fi
+exit 0
+endef
+
+# sip
+define Package/ice-client-sip
+  $(call Package/ice-client/Default)
+  TITLE:=sip
+  DEPENDS+= 
+endef
+
+define Package/ice-client-sip/description
+sip module for ice-client
+endef
+
+define Package/ice-client-sip/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=sip" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-sip/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=sip" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-sip/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/sipService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-sip/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=sipService.so.1.0.1" package="ice-client-sip" > /tmp/cfin
+fi
+exit 0
+endef
+
+# monitor
+define Package/ice-client-monitor
+  $(call Package/ice-client/Default)
+  TITLE:=monitor
+  DEPENDS+= 
+endef
+
+define Package/ice-client-monitor/description
+monitor module for ice-client
+endef
+
+define Package/ice-client-monitor/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=monitor" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-monitor/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=monitor" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-monitor/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/monitorService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-monitor/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=monitorService.so.1.0.1" package="ice-client-monitor" > /tmp/cfin
+fi
+exit 0
+endef
+
+# gigaset
+define Package/ice-client-gigaset
+  $(call Package/ice-client/Default)
+  TITLE:=gigaset
+  DEPENDS+= 
+endef
+
+define Package/ice-client-gigaset/description
+gigaset module for ice-client
+endef
+
+define Package/ice-client-gigaset/prerm
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=gigaset" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-gigaset/preinst
+#!/bin/sh
+if [ ! -f "/tmp/ice.pid" ] ; then exit 0 ; fi
+PROC_ID=$$(cat /tmp/ice.pid)
+PROC_EXISTS=$$(/usr/bin/pgrep -P $${PROC_ID})
+if [ -n "$$PROC_EXISTS" ]; then
+  read -t 1 <>/tmp/cfout
+  echo "system moduleRemove topic=gigaset" > /tmp/cfin
+fi
+exit 0
+endef
+
+define Package/ice-client-gigaset/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/core/lib/gigasetService.so.1.0.1 $(1)/usr/lib
+endef
+
+define Package/ice-client-gigaset/postinst
+#!/bin/sh
+read -t 1 <>/tmp/cfout
+if [ -f /tmp/ice.pid  ]; then
+	echo "system moduleAdd file=gigasetService.so.1.0.1" package="ice-client-gigaset" > /tmp/cfin
+fi
+exit 0
+endef
+
+# bmspeedtest
+define Package/ice-client-bcmspeedmgr
+  $(call Package/ice-client/Default)
+  TITLE:=bcmspeedmgr
+  DEPENDS+= 
+endef
+
+define Package/ice-client-bcmspeedmgr/description
+bcmspeedmgr module for ice-client
+endef
+
+define Package/ice-client-bcmspeedmgr/install
+	$(INSTALL_DIR) $(1)/bin
+	$(CP) $(PKG_BUILD_DIR)/daemons/bcmspeedmgr/obj/iopsys/bcmspeedmgr $(1)/bin
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(CP) $(PKG_BUILD_DIR)/platforms/iopsys/bcmspeedtestservice $(1)/etc/init.d/bcmspeedtestservice
+endef
+endif
+# This line executes the necessary commands to compile our program.
+# The above define directives specify all the information needed, but this
+# line calls BuildPackage which in turn actually uses this information to
+# build a package.
+$(eval $(call BuildPackage,ice-client))
+ifneq ($(CONFIG_BCM_OPEN),y)
+$(eval $(call BuildPackage,ice-client-guest))
+$(eval $(call BuildPackage,ice-client-camerawatch))
+$(eval $(call BuildPackage,ice-client-openvpn))
+$(eval $(call BuildPackage,ice-client-anyfi))
+$(eval $(call BuildPackage,ice-client-netrounds))
+$(eval $(call BuildPackage,ice-client-logreader))
+$(eval $(call BuildPackage,ice-client-fileme))
+$(eval $(call BuildPackage,ice-client-example))
+$(eval $(call BuildPackage,ice-client-iperf))
+$(eval $(call BuildPackage,ice-client-rshell))
+$(eval $(call BuildPackage,ice-client-rework))
+$(eval $(call BuildPackage,ice-client-sip))
+$(eval $(call BuildPackage,ice-client-monitor))
+$(eval $(call BuildPackage,ice-client-gigaset))
+$(eval $(call BuildPackage,ice-client-bcmspeedmgr))
+endif

icwmp/Config.in

@@ -1,4 +1,4 @@
-if PACKAGE_icwmp
+if PACKAGE_icwmp-curl || PACKAGE_icwmp-zstream
 
 config CWMP_SCRIPTS_FULL
 	bool "Install all icwmp scripts"
@@ -24,4 +24,3 @@ config CWMP_DEVEL_DEBUG
 	default n
 
 endif
-

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,17 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=5.0-2020-10-13
+PKG_VERSION:=3.0-2016-02-24
 PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=85ffabf799f769f9100068e887ed4f5ca8286620
+PKG_SOURCE_VERSION:=476392f44397a10769efdd96005378732b9e915a
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
@@ -26,34 +24,39 @@ PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/icwmp-tr098
+define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=CWMP client for TR-098 Data Model
-  DEPENDS:=+PACKAGE_icwmp-tr098:libuci +PACKAGE_icwmp-tr098:libmicroxml +PACKAGE_icwmp-tr098:libubox +PACKAGE_icwmp-tr098:jshn +PACKAGE_icwmp-tr098:libubus +PACKAGE_icwmp-tr098:libblobmsg-json +PACKAGE_icwmp-tr098:libpthread +PACKAGE_icwmp-tr098:ubusd +PACKAGE_icwmp-tr098:shflags +PACKAGE_icwmp-tr098:getopt +PACKAGE_icwmp-tr098:zlib +PACKAGE_icwmp-tr098:libjson-c +PACKAGE_icwmp-tr098:libopenssl +PACKAGE_icwmp-tr098:curl +PACKAGE_icwmp-tr098:libcurl +PACKAGE_icwmp-tr098:libtr098
-endef
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl +libbbfdm  +libbbf_api
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt
 endef
 
-define Package/$(PKG_NAME)/description
+define Package/icwmp/description
  A free client implementation of CWMP (TR-069) protocol
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config_cwmp.in"
+define Package/icwmp-curl
+  $(call Package/icwmp/Default)
+  TITLE+= (using libcurl)
+  DEPENDS+= +libcurl
+  VARIANT:=curl
+endef
+
+define Package/icwmp-zstream
+  $(call Package/icwmp/Default)
+  TITLE+= (using libzstream)
+  DEPENDS+= +libzstream
+  VARIANT:=zstream
+endef
+
+define Package/icwmp-zstream/config
+	source "$(SOURCE)/Config.in"
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -65,12 +68,7 @@ endif
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
-
-ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
-CONFIGURE_ARGS += \
-	--enable-icwmp_tr098
-endif
-
+	
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -88,6 +86,17 @@ CONFIGURE_ARGS += \
 	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
 	--with-libubus-include-path=$(STAGING_DIR)/usr/include
 
+ifeq ($(BUILD_VARIANT),zstream)
+CONFIGURE_ARGS += \
+	--enable-http=zstream \
+	--with-zstream-include-path=$(STAGING_DIR)/usr/include
+endif
+
+ifeq ($(BUILD_VARIANT),curl)
+CONFIGURE_ARGS += \
+	--enable-http=curl
+endif
+
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
 	--enable-acs=multi
@@ -108,27 +117,31 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-define Package/$(PKG_NAME)/install
+define Package/icwmp-$(BUILD_VARIANT)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/cwmp $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/dmmap $(1)/etc/config
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/config/firewall.cwmp $(1)/etc/firewall.cwmp
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
 ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
 	$(INSTALL_DIR) $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
 	$(CP) $(PKG_BUILD_DIR)/scripts/functions $(1)/usr/share/icwmp
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/iwepkeygen $(1)/usr/sbin/iwepkeygen
 endif
-	$(CP) ./files/* $(1)/
 endef
 
-define Package/icwmp-tr098/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
-endef
-
-define Package/$(PKG_NAME)/postinst
+define Package/icwmp-$(BUILD_VARIANT)/postinst
 	#!/bin/sh
+	echo "$(CWMP_BKP_FILE)" >> $${IPKG_INSTROOT}/etc/sysupgrade.conf
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Enabling rc.d symlink for icwmpd"
 		/etc/init.d/icwmpd enable
@@ -136,7 +149,7 @@ define Package/$(PKG_NAME)/postinst
 	exit 0
 endef
 
-define Package/$(PKG_NAME)/prerm
+define Package/icwmp-$(BUILD_VARIANT)/prerm
 	#!/bin/sh
 	if [ -z "$${IPKG_INSTROOT}" ]; then
 		echo "Disabling rc.d symlink for icwmpd"
@@ -145,5 +158,6 @@ define Package/$(PKG_NAME)/prerm
 	exit 0
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,icwmp-tr098))
+
+$(eval $(call BuildPackage,icwmp-curl))
+$(eval $(call BuildPackage,icwmp-zstream))

icwmp/README

@@ -0,0 +1,136 @@
+1)Build
+    Requirements<74>:
+	librairies:
+	- libuci.so
+	- libexpat.so
+	- libcurl.so
+	- libpthread.so
+	- libopenssl.so
+	- libz.so
+	- libcrypto.so
+	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
+	
+	header files and folders:
+	- expat.h
+	- expat_external.h
+	- uci.h
+	- uci_config.h
+	- zlib.h
+	- curl folder
+	- openssl folder
+	the header files and folders should be present in the staging_dir/target-i386_uClibc-0.9.30.1/usr/include/ or staging_dir/toolchain-i386_gcc-4.1.2_uClibc-0.9.30.1/usr/include/
+
+
+if a librairie doesn't exist:
+ 	a- run make menuconfig and select the librarie
+	b- build the librarie package
+
+2) Build
+
+this software is composed of 3 packages:
+- icwmp package:  contains icwmpd daemon
+- cwmp lib package: contains cwmplib and contains cwmp_value_change binary. They could be used by other user space applications in order to notify the icwmp daemon when paramter changes
+- cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes
+
+The three packages should be selected in the make menu config in order to get the three packages compiled.
+To compile the three packages: $ make package/cwmpd/compile 
+
+3) OpenWRT settings
+in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
+ uci_set_state provisioning iup tr069url "$url"
+ uci_set_state provisioning iup provisioningcode "$provisioningcode"
+
+4) Run
+    Requirements:
+	- libuci package should be installed
+	- libexpat package should be installed
+	- libcurl package should be installed
+	- libpthread package should be installed
+	- libopenssl package should be installed
+	- libz package should be installed
+	- libcrypto package should be installed
+    
+    Configure the acs url in the /etc/config/icwmp
+    and then start the cwmpd service: /etc/init.d/icwmpd start
+    for the help: /etc/init.d/icwmpd
+
+5) Value Change
+
+5.1) value change for user space applications (using the libcwmp)
+
+Before using the libcwmp, we should check that the libcwmp package is selected in "make menu config". and we should check that the package is compiled.
+The libcwmp should be installed uin the OpenWRT firmware
+
+example of using libcwmp
+in myapplication.c
+
+#...
+#include <cwmp_lib.h>
+#...
+
+int anyfunction ()
+{
+   .....
+   /* parameter change here  */
+   /* so we inform the icwmp: */
+   lib_api_cwmp_value_change_call (3, "InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress","lan2","3");
+   .....
+/*
+Description of lib_api_cwmp_value_change_call input parameters
+ parameter 1 : is the number of input string in the function lib_api_cwmp_value_change_call
+ parameter 2 : is the parameter path
+ parameter 3 : is the first correspondence related to the first indice
+ parameter 4 : is the second correspondence related to the second indice
+   .
+   .
+   .
+ parameter n : is the (n-2) correspondence related to the (n-2) indice
+*/
+
+}
+
+5.2) value change for user space applications (using the cwmp_value_change CLI)
+
+Before using the libcwmp, we should check that the libcwmp package is selected in "make menu config". and we should check that the package is compiled.
+The libcwmp should be installed uin the OpenWRT firmware
+
+in OpenWRT:
+
+root@OpenWrt:~# cwmp_value_change InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress "lan2" "3"
+
+in this case the command will force cwmp client to send a notification to the ACS (if and only if the parameter path as configured as active or as passive parameter using the setAttributeParameter method)
+
+5.3) value change for kernel space modules
+Before using the cwmp kernel module for value change, we should check that the kernel module package is selected in "make menu config". and we should check that the package is compiled.
+The kernel module should be installed uin the OpenWRT firmware and should be insert before all other kernel modules
+
+example of using cwmp kernel module
+in mykernelmodule.c
+
+#...
+#include <linux/cwmp_kernel.h>
+#...
+
+int anykernelfunction ()
+{
+   .....
+   /* parameter change here  */
+   /* so we inform the cwmp: */
+   kernel_api_cwmp_value_change_call (3, "InternetGatewayDevice.LANDevice.{i}.LANHostConfigManagement.IPInterface.{i}.IPInterfaceIPAddress","lan2","3");
+   .....
+/*
+Description of lib_api_cwmp_value_change_call input parameters
+ parameter 1 : is the number of input string in the function lib_api_cwmp_value_change_call
+ parameter 2 : is the parameter path
+ parameter 3 : is the first correspondence related to the first indice
+ parameter 4 : is the second correspondence related to the second indice
+   .
+   .
+   .
+ parameter n : is the (n-2) correspondence related to the (n-2) indice
+*/
+
+}
+
+
+

icwmp/files/etc/config/cwmp

@@ -1,47 +0,0 @@
-config acs 'acs'
-	option url ''
-	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
-	option periodic_inform_enable 'true'
-	option periodic_inform_interval '1800'
-	option periodic_inform_time '0'
-	option ParameterKey ''
-	option dhcp_discovery 'enable'
-	# compression possible configs: GZIP, Deflate, Disabled
-	option compression 'Disabled'
-	#­ possible configs interval :[1:65535]
-	option retry_min_wait_interval '5'
-	#­ possible configs interval :[1000:65535]
-	option retry_interval_multiplier '2000'
-	option https_ssl_capath ''
-	option ipv6_enable '0'
-
-config cpe 'cpe'
-	option interface 'eth0.1'
-	option default_wan_interface 'wan'
-	option log_to_console 'disable'
-	option log_to_file 'enable'
-	# log_severity: INFO (Default)	
-	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'INFO'
-	option log_file_name '/var/log/icwmpd.log'
-	option log_max_size '102400'
-	option userid '' #$OUI-$SER
-	option passwd 'iopsys'
-	option port '7547'
-	option ubus_socket '/var/run/ubus.sock'
-	option provisioning_code ''
-	option amd_version '5'
-	# compression possible configs: InstanceNumber, InstanceAlias
-	option instance_mode 'InstanceNumber'
-	option session_timeout '60'
-	option notification '1'
-	option datamodel 'tr181'
-	option exec_download '0'
-	option periodic_notify_enable '1'
-	option periodic_notify_interval '10'
-	
-config lwn 'lwn'
-	option enable '1'
-	option hostname ''
-	option port '0'

icwmp/files/etc/firewall.cwmp

@@ -1,21 +0,0 @@
-#created by the icwmp package 
-zone_name=""
-port=""
-if [ "$zone_name" = "" ]; then
-	exit 0
-elif [ "$zone_name" = "icwmp" ]; then
-	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ $? != 0 ]; then
-		iptables -N zone_icwmp_input
-		iptables -t filter -A INPUT -j zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	else			
-		iptables -F zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
-	fi			
-else
-	iptables -F zone_icwmp_input 2> /dev/null
-	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -X zone_icwmp_input 2> /dev/null
-fi
-#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"