add a package for rtl_433 application

-------------------------------------------------------------------------------
* 372743e Revert "use mac as ubusx event prefix refs #15472"
-------------------------------------------------------------------------------
commit 372743e4c905c9d51988742442b375f0b2bab8db
Author: Ionuț-Alex Oprea <ionutalexoprea@gmail.com>
Date: 2018-07-25 16:51:46 +0200

    Revert "use mac as ubusx event prefix refs #15472"

    This reverts commit ddaaafa5cd5a6b4fbeb554afd03e982559ceab88.

Base directory -> /
 src/local_stub.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------

dectmngr2/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.2.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ace6a3dcb6aa463cf5a34ad39ac37a5bc7d4ce5e
+PKG_SOURCE_VERSION:=dafaf749e89d1efaa7eb02709a3c0ef3e813c052
 PKG_NAME:=dectmngr2
 
 

endptmngr/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.1
-PKG_SOURCE_VERSION:=fa9ba5d7c942571ae6e44eb7bb5dae2c9b9e8ca4
+PKG_VERSION:=0.2
+PKG_SOURCE_VERSION:=0cb8accbac3355b97a17064ec7da010a2c42db7b
 
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)

ice-client/Makefile

@@ -19,14 +19,14 @@ export PLATFORM_INCLUDE:=platforms/iopsys/build.mk
 
 export DATE:=$(shell date +%Y-%m-%d-%H-%M-%S)
 export LOGIN:=$(shell whoami)
-BASE_PKG_VERSION:=5.0.3
-PKG_RELEASE:=RC5
-PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
+BASE_PKG_VERSION:=5.1.1
+PKG_RELEASE:=
+PKG_VERSION:=$(BASE_PKG_VERSION)$(PKG_RELEASE)_$(DATE)_$(LOGIN)
 export PKG_VERSION
 
 ###########################--RELEASE--################################
 
-PKG_SOURCE_VERSION:=a7f40bfd47d0ce3f3c002460e3c83ffc821ac1e4
+PKG_SOURCE_VERSION:=e8bf50630e6ba12dc2d223112643077c4db49189
 ifeq ($(CONFIG_ICE_OPEN),y)
 TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
 PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

icwmp/Config_cwmp.in

@@ -27,5 +27,9 @@ config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
 
+config LIBDATAMODEL_VENDOR_PREFIX
+    string "Vendor Prefix"
+    default "X_Inteno_SE_"
+    
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2018-04-09
+PKG_VERSION:=4.0-2018-07-16
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cfbec44903f66dc53e2d560d1a4cde42dca923f4
+PKG_SOURCE_VERSION:=d22821b251277584cfbcce98a98a4261813418ce
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -82,6 +82,8 @@ ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
 TARGET_CFLAGS += -DEX400
 endif
 
+TARGET_CFLAGS += -DCUSTOM_PREFIX=\\\"$(CONFIG_LIBDATAMODEL_VENDOR_PREFIX)\\\"
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 

icwmp/files/etc/hotplug.d/iface/90-icwmp

@@ -6,7 +6,15 @@
 
 [ -f /etc/config/cwmp ] || exit 0
 
-handle_icwmp_reload() {
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
+
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
 	local islan="$(uci -q get network.$INTERFACE.is_lan)"
 	[ "$islan" == "1" ] && exit 0
 
@@ -48,10 +56,22 @@ handle_icwmp_reload() {
 	network_get_dnsserver curdnsservers $INTERFACE
 	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
 
-	[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" -a "$prevdnsservers" = "$curdnsservers" ] && exit 0
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	network_get_device curdev $INTERFACE
+	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
+
+	[ \
+		"$prevdev" == "$curdev" -a \
+		"$previpaddr" = "$curipaddr" -a \
+		"$prevgateway" = "$curgateway" -a \
+		"$prevsubnets" = "$cursubnets" -a \
+		"$prevdnsservers" = "$curdnsservers" \
+	] && exit 0
 
 	/etc/init.d/icwmpd reload &
 }
 
-handle_icwmp_reload
-
+handle_icwmp_restart

imonitor/Makefile

@@ -12,7 +12,7 @@ PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=http://public.inteno.se/imonitor.git
-PKG_SOURCE_VERSION:=defec6849fb987619fc7fd9295895f4f0b9db5a9
+PKG_SOURCE_VERSION:=532f4900862bcb45d8cd4bf37555fabda81750b6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>

imonitor/files/etc/config/imonitor

@@ -1,8 +1,9 @@
 config monitor
-   option app 'test'
-   option test 'echo test'
-   option stream 'stdout'
-   option string_match 'test'
-   option execute 'echo executing'
-   option interval '10'
-   option nr_tests '2'
+	option app 'test'
+	option test 'echo test'
+	option stream 'stdout'
+	option string_match 'TEST'
+	option execute 'echo executing test'
+	option interval '10'
+	option nr_tests '2'
+

inteno-netmodes/Makefile

@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=inteno-netmodes
 PKG_VERSION:=0.2.0
 
-PKG_SOURCE_VERSION:=b898924491c378ca09ab124991b27f54a336e4e9
+PKG_SOURCE_VERSION:=fbd7dcfab03df19b3c32675940e0aee708c7cf75
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/netmoded
 

inteno-netmodes/files/etc/hotplug.d/iface/01-netmode-handler

@@ -17,11 +17,13 @@ if [ "$(netmode_get_ip_type $ipaddr)" == "private" ]; then
 	if [ "$repeaterready" == "1" -o "${curmode:0:8}" == "repeater" ]; then
 		# flush the ip on br-lan; br-lan will anyhow be deleted.
 		# this is needed if the ip received on the wan is also from the same net
+		logger -s -p user.info -t $0: [netmode] ip addr flush dev br-lan >/dev/console
 		ip addr flush dev br-lan 2>/dev/null
 
 		# flush iptables in case the MASTER
 		# tries to configure us before
 		# firewall is disabled the proper way
+		logger -s -p user.info -t $0: [netmode] iptables -F >/dev/console
 		iptables -F
 
 		disable_firewall 1

inteno-netmodes/files/etc/hotplug.d/net/80-repeater

@@ -13,7 +13,10 @@ case "$(uci get netmode.setup.curmode)" in
 		repeater*)
 		;;
 		*)
-			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
+			ping -c 1 -w 5 $defroute >/dev/null 2>&1 || {
+				logger -s -t "80-repeater" "ping to $defroute failed, sending USR1 to udhcpc" >/dev/console
+				killall -USR1 udhcpc
+			}
 			exit
 		;;
 esac

inteno-netmodes/files/etc/init.d/netmode

@@ -12,7 +12,7 @@ start_netmoded() {
 	procd_open_instance
 	procd_set_param command $NETMODED
 
-	procd_append_param command --verbose debug
+	procd_append_param command --verbose warning
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 

inteno-netmodes/files/lib/functions/netmode.sh

@@ -155,6 +155,7 @@ switch_netmode() {
         echo $curmode >$OLD_MODE_FILE
 
 	[ -d "/etc/netmodes/$curmode" ] || return
+	logger -s -p user.info -t $0 "[netmode] Copying /etc/netmodes/$curmode in /etc/config" >/dev/console
 	cp /etc/netmodes/$curmode/* /etc/config/
 	rm -f /etc/config/DETAILS
 	sync
@@ -170,7 +171,7 @@ switch_netmode() {
 	case "$curmode" in
 		repeater*)
 			touch $SWITCHMODELOCK
-			echo "Switching to $curmode mode" > /dev/console
+			logger -s -p user.info -t $0 "Switching to $curmode mode" > /dev/console
 			ubus call leds set  '{"state" : "allflash"}'
 			[ -f /etc/init.d/omcproxy ] && /etc/init.d/omcproxy stop
 			[ -f /etc/init.d/layer2 ] && /etc/init.d/layer2 reload
@@ -222,7 +223,13 @@ wait_for_netmode_handler() {
 }
 
 netmode_get_ip_type() {
-	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && echo "private" || echo "public"
+	[ -n "$(echo $1 | grep -E '^(192\.168|10\.|172\.1[6789]\.|172\.2[0-9]\.|172\.3[01]\.)')" ] && {
+		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is private"
+		echo "private"
+	} || {
+		logger -t "[netmode]" "netmode_get_ip_type: ip $1 is public"
+		echo "public"
+	}
 }
 
 get_device_of() {

inteno-netmodes/files/sbin/netmode-client-detect

@@ -51,7 +51,7 @@ while true ; do
 		json_get_var network network "lan"
 
 		if is_inteno_macaddr $macaddr; then
-			echo "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
+			logger -s -p user.info -t $0 "netmode-client-detect: a new Inteno device detected on '$network' network (MACAddr:$macaddr IPAddr:$ipaddr)" >/dev/console
 			ubus call repeater get_creds '{"network":"'$network'","file":"/tmp/wificontrol.txt"}'
 			/sbin/wificontrol --router --destination $ipaddr
 		fi

inteno-netmodes/files/sbin/netmode-conf

@@ -8,6 +8,18 @@ state="exit"
 TMPPATH="/tmp/netmode_config_backup"
 CURMODE=""
 SLEEPTIME=300
+pid_file=/tmp/netmode-conf.pid
+
+echo "$$" >$pid_file
+
+cleanup(){
+	rm -rf $pid_file
+	# we need to trigger a reload of icwmp but ONLY if ip or device has changed
+	[ -f "/etc/hotplug.d/iface/90-icwmp" ] && INTERFACE=wan ACTION=ifup sh /etc/hotplug.d/iface/90-icwmp
+	exit
+}
+
+trap cleanup SIGHUP SIGINT SIGTERM SIGSTOP
 
 set_wireless_values() {
 	local iface_num="$1"
@@ -110,7 +122,7 @@ backup() {
 file="$1"
 from_gui="$2"
 
-[ -f "$file" ] || exit
+[ -f "$file" ] || cleanup
 
 # let netmode-handler up to 20 seconds to finish switching mode
 wait_for_netmode_handler
@@ -161,14 +173,14 @@ done
 
 [ "$apcliband" == "$band" -o "$band" == "" ] || {
 	[ "$from_gui" == "true" ] && restore "back"
-	exit
+	cleanup
 }
 
 repeater_iface_num=$(uci -q show wireless | grep -e ".mode='wet'" -e ".mode='sta'"  | sed 's/.*\[\([0-9]\)\].*/\1/')
 
 [ -z "$repeater_iface_num" ] && {
 	[ "$from_gui" == "true" ] && restore "back"
-	exit
+	cleanup
 }
 
 json_get_var ssid ssid
@@ -197,7 +209,7 @@ while json_get_var dummy $i; do
 		a_num=$((a_num+1))
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			exit
+			cleanup
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 		get_device "b" device
@@ -205,7 +217,7 @@ while json_get_var dummy $i; do
                 b_num=$((b_num+1))
                 [ -z $iface_num ] && {
                         [ "$from_gui" == "true" ] && restore "back"
-                        exit
+                        cleanup
                 }
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	else
@@ -222,7 +234,7 @@ while json_get_var dummy $i; do
 		esac
 		[ -z $iface_num ] && {
 			[ "$from_gui" == "true" ] && restore "back"
-			exit
+			cleanup
 		}
 		set_wireless_values "$iface_num" "$ssid" "$key" "$encryption" "$device"
 	fi
@@ -269,7 +281,7 @@ if [ "$from_gui" == "true" ]; then
 		ping -w1 $ip
 		if [ $? -eq 0 ]; then
 			restore
-			exit
+			cleanup
 		else
 			i=$((i-10))
 			sleep 9
@@ -278,7 +290,7 @@ if [ "$from_gui" == "true" ]; then
 	restore "back"
 else
 	if [ "$state" == "exit" ]; then
-		return
+		cleanup
 	fi
 	ubus call leds set '{"state":"allflash"}'
 	if [ "$state" == "apply" ]; then
@@ -292,3 +304,5 @@ else
 	correct_uplink
 	ubus call leds set '{"state":"normal"}'
 fi
+
+cleanup

inteno-netmodes/files/sbin/start-netmode-conf

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+netmode-conf "$1" "$2" &

inteno-netmodes/files/sbin/testnet

@@ -49,7 +49,7 @@ ping_uplink()
 	if [ "$hasmode" == "1" ] && [ "$hasip" == "0" -o "$hasdev" == "0" ]; then
 		rv=0
 	elif [ "$hasmode" == "1" ]; then
-		ping $ipaddr -I $device -W 3 -c 1 -q >/dev/null 2>&1
+		arping -f -q -c1 -w3 -I $device $ipaddr
 		[ $? -eq 1 ] && rv=0 || rv=1
 	else
 		SLEEP_TIME=5
@@ -58,7 +58,6 @@ ping_uplink()
 	fi
 
 	if [ $rv -eq 0 ]; then
-
 		echo "{ \"online\" : false }" > /tmp/internet_connection_status
 
 		SLEEP_TIME=10
@@ -66,11 +65,14 @@ ping_uplink()
 		wetif="$(uci -q get wireless.$(uci show wireless | grep 'mode=.*wet.*' | cut -d'.' -f2 | head -1).ifname)"
 		# If there is an uplink IP address but no connection for 5 minutes, reboot
 		if [ $enableCounter -gt 32 ]; then
+			logger -s -p user.info -t "testnet" "No uplink connection; reboot" >/dev/console
 			ubus call led.internet  set '{"state" : "error"}'
 			reboot &
 		elif [ $((enableCounter % 8)) -eq 0 -a $enableCounter -ge 8 -o $enableCounter -eq 0 ]; then
 			ps | grep -v grep | grep -q 'wifi reload\|wifi import\|wifi.credentials\|iwpriv' && return
 
+			logger -s -p user.info -t "testnet" "No uplink connection; try to re-connect" >/dev/console
+
 			if [ -f /usr/sbin/wlctl ]; then
 				assoclist="$(wlctl -i $wetif assoclist | head -1 | awk '{print$2}')"
 				wlctl -i $wetif reassoc $assoclsit
@@ -112,6 +114,7 @@ ping_uplink()
 		AccessPolicy=1
 		if [ -f /usr/sbin/iwpriv ]; then
 			grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
+				logger -s -p user.info -t "testnet" "Disconnect all stations and disable WiFi access on downlink wireless interfaces" >/dev/console
 				# Do not allow clients to connect on 2.4GHz radio
 				iwpriv ra0 set AccessPolicy=$AccessPolicy
 				# Do not allow clients to connect on 5GHz radio
@@ -122,7 +125,8 @@ ping_uplink()
 				iwpriv rai0 set DisConnectAllSta=2
 			}
 		fi
-	else 
+	else
+		grep -q "true" /tmp/internet_connection_status 2>/dev/null || logger -s -p user.info -t "testnet" "Uplink connection is gained" >/dev/console
 		echo "{ \"online\" : true }" > /tmp/internet_connection_status
 		ubus call led.internet  set '{"state" : "eok"}'
 
@@ -136,10 +140,10 @@ ping_uplink()
 		AccessPolicy=0
 
 		if [ -f /usr/sbin/iwpriv ]; then
+			logger -s -p user.info -t "testnet" "Enable WiFi access on downlink wireless interfaces" >/dev/console
 			iwpriv ra0 set AccessPolicy=$AccessPolicy
 			iwpriv rai0 set AccessPolicy=$AccessPolicy
 		fi
-
 	fi
 }
 

inteno-netmodes/files/usr/libexec/rpcd/repeater

@@ -129,12 +129,12 @@ case "$1" in
 				json_load "`cat $file`" || write_error "invalid file content"
 				json_select "wifi_ifaces" || write_error "invalid file content"
 
+				start-netmode-conf "$file" "$from_gui" >/dev/null 2>/dev/null
 
 				json_init
 				json_add_string "status" success
 				json_dump
 
-				netmode-conf "$file" "$from_gui" >/dev/null 2>&1 &
 			;;
 		esac
 	;;

iop-lla-libs/Config.in

@@ -0,0 +1,7 @@
+menu "Library options"
+
+config IOP_LLA_LIBS_DEBUG
+	bool "Enable debug support"
+	default n
+
+endmenu

iop-lla-libs/Makefile

@@ -0,0 +1,131 @@
+#
+# Copyright (C) 2018 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iop-lla-libs
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=cf38a6165251709c0d60b33eafd7f32dcc0675d7
+PKG_SOURCE_URL:=http://public.inteno.se:/iop-lla-libs
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iop-lla-libs
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=IOPSYS low level libraries
+  DEPENDS:=+libopenssl
+endef
+
+define Package/libwifi
+  $(call Package/iop-lla-libs)
+  TITLE:= WiFi library (libwifi)
+endef
+
+define Package/libdsl
+  $(call Package/iop-lla-libs)
+  TITLE:= XDSL library (libdsl)
+endef
+
+define Package/libethernet
+  $(call Package/iop-lla-libs)
+  TITLE:= Ethernet library (libethernet)
+DEPENDS:=+TARGET_iopsys_ramips:swconfig
+endef
+
+define Package/iop-lla-libs/config
+  source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_mips),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
+  KERNEL_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx
+else ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+  TARGET_PLATFORM=BROADCOM
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCONFIG_BCM963138
+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_lantiq_xrx500),y)
+  TARGET_PLATFORM=LANTIQ
+  TARGET_CFLAGS +=-DIOPSYS_LANTIQ
+else
+  $(info (UNEXPECTED CONFIG TARGET))
+endif
+
+ifdef CONFIG_IOP_LLA_LIBS_DEBUG
+  TARGET_CFLAGS += -DIOP_LLA_LIBS_DEBUG
+endif
+
+subdirs := \
+	$(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/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Build/InstallDev/libwifi
+	echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX $(1)"
+	$(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
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/
+	$(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/InstallDev
+	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+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
+	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwifi))
+$(eval $(call BuildPackage,libdsl))
+$(eval $(call BuildPackage,libethernet))

iop/configs/config

@@ -32,6 +32,7 @@ CONFIG_PACKAGE_ice-client-netrounds=m
 CONFIG_PACKAGE_ice-client-rshell=m
 CONFIG_PACKAGE_ice-client-texec=m
 CONFIG_PACKAGE_icwmp-curl=y
+CONFIG_PACKAGE_imonitor=y
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
@@ -113,7 +114,7 @@ CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_p910nd=y
+# CONFIG_PACKAGE_p910nd is not set
 CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_power-management=y
@@ -130,6 +131,7 @@ CONFIG_PACKAGE_rdnssd=y
 CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rulengd=y
 CONFIG_PACKAGE_samba3=y
 CONFIG_PACKAGE_samba3-nmbd=y
 CONFIG_PACKAGE_snmpd=y
@@ -155,6 +157,7 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_USE_STRIP=y
 CONFIG_BUILD_LOG=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
+CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
 CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
 CONFIG_BUSYBOX_CONFIG_DELUSER=y
@@ -210,6 +213,8 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
 # CONFIG_BUSYBOX_CONFIG_NTPD is not set
 # CONFIG_BUSYBOX_CONFIG_FEATURE_NTPD_SERVER is not set
 CONFIG_LIBCURL_CRYPTO_AUTH=y
+# CONFIG_LIBCURL_MBEDTLS is not set
+CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SAMBA3_CONFIG_NO_PRINTING is not set
 # CONFIG_SIGNED_PACKAGES is not set

iop/configs/target/iopsys_brcm63xx_arm/dg400/config

@@ -1,3 +1,4 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
 

iop/configs/target/iopsys_brcm63xx_arm/dg400prime/config

@@ -1,3 +1,4 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
 

iop/configs/target/iopsys_brcm63xx_arm/eg400/config

@@ -1,5 +1,7 @@
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_TARGET_NO_DSL=y
 

iop/configs/target/iopsys_brcm63xx_arm/f104/config

@@ -1,4 +1,6 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_USE_DSL=y
 CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/f104w/config

@@ -1,4 +1,6 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
+
 CONFIG_USE_DSL=y
 CONFIG_TARGET_DSL_GFAST=y

iop/configs/target/iopsys_brcm63xx_arm/sdx810_rg/config

@@ -1,3 +1,5 @@
-CONFIG_BCM_ENDPOINT_MODULE=y
+
+# Disable kernel internal Dect. External Dect can still operate.
 CONFIG_TARGET_NO_DECT=y
 
+CONFIG_TARGET_NO_DSL=y

iop/configs/target/iopsys_brcm63xx_mips/cg300/config

@@ -1,4 +1,3 @@
 CONFIG_TARGET_NO_DSL=y
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/dg200/config

@@ -1,4 +1,3 @@
 CONFIG_BCM_I2C=y
 CONFIG_TARGET_NO_DECT=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/dg301/config

@@ -1,3 +1,2 @@
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/eg200/config

@@ -0,0 +1,5 @@
+CONFIG_BCM_I2C=y
+CONFIG_TARGET_NO_DECT=y
+CONFIG_TARGET_NO_DSL=y
+CONFIG_BCM_ENDPOINT_MODULE=y
+

iop/configs/target/iopsys_brcm63xx_mips/eg300/config

@@ -1,4 +1,3 @@
 CONFIG_TARGET_NO_DSL=y
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/configs/target/iopsys_brcm63xx_mips/vg50/config

@@ -1,5 +1,4 @@
 CONFIG_TARGET_NO_DHD=y
 CONFIG_TARGET_NO_VOICE=y
 CONFIG_BCM_I2C=y
-CONFIG_BCM_ENDPOINT_MODULE=y
 

iop/scripts/annexconfig.sh

@@ -0,0 +1,72 @@
+#!/bin/bash
+
+function disable_add_config () {
+	local COPTION="$1"
+
+	HAVE_OPTION=`grep $COPTION .config | wc -l`
+	HAVE_OPTION_DISABLED=`grep "# $COPTION" .config | wc -l`
+	if [ "$HAVE_OPTION" = "1" ]
+	then
+		if [ "$HAVE_OPTION_DISABLED" = "0" ]
+		then
+			sed -i -e "s,$COPTION=y,# $COPTION is not set,g" .config
+		fi
+	else
+		echo "# $COPTION is not set" >> .config
+	fi
+}
+
+function enable_option () {
+	local COPTION="$1"
+#	cat .config| grep DSL
+	sed -i -e "s,# $COPTION is not set,$COPTION=y,g" .config
+#	cat .config| grep DSL
+}
+
+function annexconfig {
+
+	v() {
+		[ "$VERBOSE" -ge 1 ] && echo "$@"
+	}
+
+	local ANNEX="$1"
+
+	disable_add_config CONFIG_TARGET_NO_DSL
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_A
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_B
+	disable_add_config CONFIG_TARGET_DSL_ANNEX_C
+	disable_add_config CONFIG_TARGET_DSL_SADSL
+	disable_add_config CONFIG_TARGET_DSL_GFAST
+
+
+	if [ "$ANNEX" = "no" ]
+	then
+		echo "No DSL"
+		enable_option CONFIG_TARGET_NO_DSL
+	elif [ "$ANNEX" = "a" ]
+	then
+		echo "Annex A"
+		enable_option CONFIG_TARGET_DSL_ANNEX_A
+	elif [ "$ANNEX" = "b" ]
+	then
+		echo "Annex B"
+		enable_option CONFIG_TARGET_DSL_ANNEX_B
+	elif [ "$ANNEX" = "c" ]
+	then
+		echo "Annex C"
+		enable_option CONFIG_TARGET_DSL_ANNEX_C
+	elif [ "$ANNEX" = "sadsl" ]
+	then
+		echo "sadsl"
+		enable_option CONFIG_TARGET_DSL_SADSL
+	elif [ "$ANNEX" = "gfast" ]
+	then
+		echo "G.fast"
+		enable_option CONFIG_TARGET_DSL_GFAST
+	else
+		echo "Only option no,a,b,c,sadsl,gfast supported"
+	fi
+
+}
+
+register_command "annexconfig" "Select configuration annex"

iop/scripts/build_branch.sh

@@ -6,6 +6,7 @@ function build_branch_usage {
 	echo "usage: $0 build_branch <branch> <board> [<customer>]"
 	echo "example: $0 build_branch devel-new ex400 DEV"
 	echo "example: $0 build_branch_sysupgrade devel-new ex400 DEV 192.168.1.1 -n"
+	set +x
 	exit 1
 }
 
@@ -17,6 +18,7 @@ function branch_exists {
 }
 
 function build_branch {
+	set -x
 	local branch=$1
 	local board=$2
 	local customer=$3
@@ -35,6 +37,7 @@ time {
 	./iop feeds_update || build_branch_usage
 	./iop genconfig -c $board $customer || build_branch_usage
 	make -j 8 || build_branch_usage
+	set +x
 }
 }
 

iop/scripts/genconfig.sh

@@ -14,7 +14,7 @@ function genconfig {
 	export DEVELOPER=0
 	LOCAL_MIRROR="http://mirror.inteno.se/mirror"
 
-	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02"
+	iopsys_brcm63xx_mips="cg300 cg301 dg150 dg150v2 dg150alv2 dg200 dg200al dg301 dg301al eg300 vg50 vox25 hpc_hu02 eg200"
 	iopsys_brcm63xx_arm="dg400 eg400 sdx810_rg f104w f104 dg400prime dg400primeb 963138REF_P502"
 	iopsys_ramips="ex400 sdx810_ap"
 	ramips="mt7621"

iop/scripts/generate_tarballs.sh

@@ -14,6 +14,7 @@ build_bcmkernel_consumer() {
 	tarfile='out/bcm963xx_*_consumer.tar.gz'
 	[ $(ls -1 $tarfile |wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
 	scp $tarfile $SERVER:$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz
+	ssh $SERVER "ln -s $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz $FPATH/bcmopen-$board-$majver.$minver.tar.gz"
 	rm -f $tarfile
 	cd $curdir
 }
@@ -119,6 +120,8 @@ function generate_tarballs {
     target=$(grep CONFIG_TARGET_BOARD .config | cut -d'=' -f2 | tr -d '"')
     board=$(grep CONFIG_TARGET_IBOARDID .config | cut -d'=' -f2 | tr -d '"')
     profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
+    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
+    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
     curdir=$(pwd)
 
 

iop/scripts/update_package.sh

@@ -41,7 +41,7 @@ update_this_pkg()
 	echo "	to get an up to date version in ${PKG_BUILD_DIR}/.git_update"
 	echo ""
 
-	echo -n "	Shold we continue with the update anyway? [y/N]:"
+	echo -n "	Should we continue with the update anyway? [y/N]:"
 	read answer
 	echo ""
 
@@ -184,7 +184,7 @@ branch_uptodate()
      else
 	 echo "Diverged. not sure what you did but there is no tracking branch. "
 	 echo "repo at [ $1 ]. fix it so that there is a tracking branch remote."
-	 echo "Often this is related to sombody having commited to the same branch"
+	 echo "Often this is related to somebody having commited to the same branch"
 	 echo "on the server so a simple push wont work, try a 'git rebase'."
 	 exit 99
      fi

iup/files/lib/functions/dhcp_option_relay.sh

@@ -0,0 +1,219 @@
+#!/bin/sh
+
+# functions that take dhcp options received on the wan interface
+# and relay/repeat them for specific clients
+
+#config dhcp_option_relay
+#	option enable 1
+#	list dhcp_option 43
+#	list from_interface wan
+#	option vendorclass '*SDX*'
+
+# where:
+# dhcp_option_relay is the name of the section parsed by this script
+# enable/enabled - option, enable the uci section [default on]
+# dhcp_option/dhcp_options - list of dhcp options (0-255) to be relayed/repeated
+# overwrite - if same dhcp_option already exists in /etc/config/dhcp, overwrite it with this option [default off]
+# from_interface - list of interfaces (e.g. wan) to get the dhcp options from
+
+
+. /lib/functions.sh
+
+interface=""
+opt224=""
+opt225=""
+opt226=""
+opt43=""
+opt128=""
+opt66=""
+opt67=""
+opt132=""
+opt133=""
+newsectionid="0"
+
+function parse_the_json()
+{
+	local the_json="$@"
+
+	json_load "$the_json"
+	json_get_var interface interface
+	json_get_var opt224 privopt224
+	json_get_var opt225 privopt225
+	json_get_var opt226 privopt226
+	json_get_var opt43 vendorspecinf # option 43
+	json_get_var opt128 httpurl128
+	json_get_var opt66 tftp # option 66
+	json_get_var opt67 bootfile #option 67
+	json_get_var opt132 vlanid # option 132
+	json_get_var opt133 vlanpriority # option 133
+}
+
+function add_section_dhcp_vendorclass()
+{
+	local dhcp_option=$1
+	local dhcp_option_value=$2
+	local vendorclass=$3
+	local new=
+	newsectionid=$((newsectionid+1))
+
+	#echo "add_section_dchp_vendorclass $dhcp_option ${dhcp_option_value} $vendorclass"
+	new=$(uci add dhcp vendorclass)
+	uci set dhcp.$new.vendorclass="$vendorclass"
+	uci set dhcp.$new.networkid="dhcp_option_relay_$newsectionid"
+	uci add_list dhcp.$new.dhcp_option=$dhcp_option,\"${dhcp_option_value}\"
+
+	uci commit dhcp
+}
+
+function dhcp_option_relay()
+{
+	local section="$1"
+	local enable="" enabled=""
+	local dhcp_option="" dhcp_option_value=""
+	local vendorclass=""
+	#local overwrite=""
+	local from_interface
+
+	#echo "section: $section"
+
+	# parse only enabled sections
+	config_get_bool enabled $section enabled 1
+	config_get_bool enable  $section enable  1
+	#echo "enabled: $enabled"
+	#echo "enable : $enable"
+	if [ "$enable" == "0" -o "$enabled" == "0" ] ; then
+		#echo "section $section is not enabled"
+		return
+	fi
+	# todo: for disabled sections: run only the removal of the dhcp options
+
+	# option overwrite 1
+	#config_get_bool overwrite $section overwrite 0
+	config_get vendorclass $section vendorclass
+	if [ ${#vendorclass} -le 1 ]; then
+		#echo "vendorclass must not be empty"
+		return
+	fi
+
+	# list to_interface lan
+	# to_interface - list of interfaces (e.g. lan, guest) to advertise the dhcp options to
+	#foreach_to_interface() {
+	#	local to_interface=$1
+	#	echo ""
+	#	echo "  from_interface $from_interface"
+	#	echo "  dhcp_option $dhcp_option"
+	#	echo "  dhcp_option_value $dhcp_option_value"
+	#	echo "  overwrite $overwrite"
+	#	echo "  to_interface $to_interface"
+	#
+	#	if [ ! $(uci -q get dhcp.$to_interface) ] ; then
+	#		echo "to_interface $to_interface does not exist in dhcp uci config"
+	#		return
+	#	fi
+	#
+	#}
+
+
+	foreach_dhcp_option() {
+		dhcp_option=$1
+
+		echo "dhcp_option: $dhcp_option"
+		case $dhcp_option in
+		43) dhcp_option_value=$opt43 ;;
+		66) dhcp_option_value=$opt66 ;;
+		67) dhcp_option_value=$opt67 ;;
+		128) dhcp_option_value=$opt128 ;;
+		132) dhcp_option_value=$opt132 ;;
+		133) dhcp_option_value=$opt133 ;;
+		224) dhcp_option_value=$opt224 ;;
+		225) dhcp_option_value=$opt225 ;;
+		226) dhcp_option_value=$opt226 ;;
+		*) dhcp_option_value="unsupported" ;;
+		esac
+
+		if [ "${dhcp_option_value}" == "unsupported" ] ; then
+			echo "dhcp_option $dhcp_option is unsupported"
+			return
+		fi
+		if [ "${dhcp_option_value}" == "" ] ; then
+			echo "dhcp_option $dhcp_option is empty"
+			return
+		fi
+
+		#echo "dhcp_option: $dhcp_option dhcp_option_value: ${dhcp_option_value}"
+
+		#config_list_foreach $section to_interface foreach_to_interface
+
+		add_section_dhcp_vendorclass $dhcp_option ${dhcp_option_value} $vendorclass
+	}
+
+	foreach_from_interface() {
+		from_interface="$1"
+		#echo "from_interface: $from_interface"
+		if [ "$from_interface" != "$interface" ]; then
+			return
+		fi
+
+		dhcp_option=""
+		config_list_foreach $section dhcp_option foreach_dhcp_option
+		#config_list_foreach $section dhcp_options foreach_dhcp_option
+	}
+
+	from_interface=""
+	config_list_foreach $section from_interface foreach_from_interface
+}
+
+
+# in uci dhcp config:
+# remove all the vendorclass sections
+# that have previosly been configured by this script.
+# all are identified by "option networkid dhcp_option_relay_*"
+function dhcp_option_relay_clear_prev()
+{
+	local to_remove=""
+
+	foreach_vendorclass() {
+		local section="$1"
+		local networkid
+		config_get networkid $section networkid
+
+		case "$networkid"
+		in dhcp_option_relay*)
+			to_remove="$to_remove $section"
+			;;
+		esac
+	}
+
+	config_load dhcp
+	config_foreach foreach_vendorclass vendorclass
+
+	local sect
+	for sect in $to_remove ; do
+		uci_remove dhcp $sect
+	done
+	uci_commit dhcp
+}
+
+
+# the main function
+function dhcp_option_relay_parse()
+{
+	local the_json="$@"
+	parse_the_json "$the_json"
+
+	dhcp_option_relay_clear_prev
+
+	newsectionid="0"
+
+	config_load provisioning
+	config_foreach dhcp_option_relay dhcp_option_relay
+	#config_foreach dhcp_option_relay dhcp_options_relay
+	#config_foreach dhcp_option_relay dhcpoption_relay
+	#config_foreach dhcp_option_relay dhcpoptions_relay
+	#config_foreach dhcp_option_relay dhcp_optionrelay
+	#config_foreach dhcp_option_relay dhcp_optionsrelay
+	#config_foreach dhcp_option_relay dhcpoptionrelay
+	#config_foreach dhcp_option_relay dhcpoptionsrelay
+}
+
+#dhcp_option_relay_parse

iup/files/sbin/iup

@@ -5,6 +5,7 @@ echo $$ > /var/run/iup.pid
 . /lib/functions.sh
 . /lib/functions/network.sh
 . /lib/functions/savecfg.sh
+. /lib/functions/dhcp_option_relay.sh
 . /usr/share/libubox/jshn.sh
 
 include /lib/upgrade
@@ -268,19 +269,20 @@ change_to_vlan() {
 	base_dev=$(echo ${base_dev} | cut -d. -f1)
 
 	# add "VLAN interface" to the "end of the file".
-	uci add layer2_interface_vlan vlan_interface
-	uci set layer2_interface_vlan.@vlan_interface[-1].name=${name}
-	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021q=${1}
-	uci set layer2_interface_vlan.@vlan_interface[-1].vlan8021p=${2}
-	uci set layer2_interface_vlan.@vlan_interface[-1].ifname="${base_dev}.${1}"
-	uci set layer2_interface_vlan.@vlan_interface[-1].baseifname=${base_dev}
+	uci add network device
+	uci rename network.@device[-1]=${name}
+	uci set network.@device[-1].type=8021q
+	uci set network.@device[-1].ifname=${base_dev}
+	uci set network.@device[-1].name="${base_dev}.${1}"
+	uci set network.@device[-1].vid=${1}
+	uci set network.@device[-1].priority=${2}
 	# and commit the change.
-	uci commit layer2_interface_vlan
-	v "option 132: committed update to file layer2_interface_vlan"
+	uci commit network
+	v "option 132: committed update to file network"
 
 	# reload configuration files.
 	/etc/init.d/layer2_interface_vlan reload
-	v "option 132: reload layer2_interface_vlan config"
+	v "option 132: reload network config"
 
 	# replace old interface (like eth0.1 with new eth0.101).
 	wan_if=$(uci get network.$3.ifname)
@@ -383,6 +385,10 @@ handle_option224()
 parse_dhcp_options()
 {
 	local the_json="$@"
+
+	# process the dhcp_option_relay sections
+	dhcp_option_relay_parse "$the_json"
+
 	# Process IUP related DHCP options #
 	local privopt224 privopt225 privopt226 vendorspecinf httpurl128
 	local tftp bootfile vlanid vlanpriority interface
@@ -409,6 +415,7 @@ parse_dhcp_options()
 		v "dhcp option 43 tr69 url $vendorspecinf"
 		url=${vendorspecinf%%,*}; rest=${vendorspecinf#*,}
 		provisioningcode=${rest%%,*};
+		[ -f /etc/config/cwmp ] && uci_set_state cwmp acs dhcp_url "$url"
 		uci_set_state provisioning iup urlcwmp "$url"
 		uci_set_state provisioning iup url "$url"
 		uci_set_state provisioning iup provisioningcode "$provisioningcode"
@@ -562,7 +569,7 @@ main()
 	        if [ "$filesystem" == "JFFS2" ] ; then
 	                firmware=$firmware.w
 		else
-			firmware=$firmware.y
+			firmware=$firmware.y3
 		fi
 		if [ "$sofwareminuspath" == "${sofwareminuspath/$firmware/}" ] ; then
 			v "Software \"$software\""

iwatchdog/src/src/watchdog.c

@@ -5,15 +5,22 @@
 #include <unistd.h>
 
 const char *watchdog_file = "/proc/watchdog";
+const char *watchdog_file_nvram = "/proc/nvram/watchdog";
 const char *init_string   = "1 5000000 1 4";
 const char *kicker        = "OK";
 
 int main(int argc, char **argv)
 {
-        int fd = open(watchdog_file, O_WRONLY);
+	int ret = 0;
+	char *wdt_string_prt = watchdog_file;
+        int fd = open(wdt_string_prt, O_WRONLY);
         if (fd < 0) {
-                perror("Open watchdog file");
-                exit(1);
+		wdt_string_prt = watchdog_file_nvram;
+		fd = open(wdt_string_prt, O_WRONLY);
+		if (fd < 0) {
+			perror("Open watchdog file");
+			exit(1);
+		}
         }
 
         /* init */
@@ -23,14 +30,17 @@ int main(int argc, char **argv)
                 perror("Error init watchdog");
                 exit(1);
         }
+	close(fd);
 
         while (1) {
+		fd = open(wdt_string_prt, O_WRONLY);
                 sleep(1);
                 res = write (fd, kicker, strlen(init_string) + 1);
 
                 if (res < 0 ){
                         perror("Error kicking watchdog");
                 }
+		close(fd);
         }
         return 0;
 }

libpicoevent/Makefile

@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.1
+PKG_VERSION:=0.2
 PKG_SOURCE_URL:=http://public.inteno.se/libpicoevent
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c96770b32f66c6e799f8430d8e85d94780358135
+PKG_SOURCE_VERSION:=aaf2a9ce72fe4cb84af9ce185728d35dde33d54d
 PKG_NAME:=libpicoevent
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

mosquitto/Config.in

@@ -1,13 +0,0 @@
-config MOSQUITTO_LWS
-    bool "libwebsockets support"
-    depends on PACKAGE_mosquitto-ssl
-    default y
-    help
-        Includes websockets support in the broker, via libwebsockets
-
-config MOSQUITTO_PASSWD
-    bool "Include mosquitto_passwd utility"
-    depends on PACKAGE_mosquitto-ssl
-    default y
-    help
-mosquitto_passwd is a tool for managing password files for mosquitto.

mosquitto/Makefile

@@ -1,231 +0,0 @@
-#
-# Copyright (C) 2011-2013 OpenWrt.org
-# Copyright (C) 2010 Jo-Philipp Wich <xm@subsignal.org>
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mosquitto
-PKG_VERSION:=1.4.15
-PKG_RELEASE:=3
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE.txt
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://mosquitto.org/files/source/
-PKG_HASH:=7d3b3e245a3b4ec94b05678c8199c806359737949f4cfe0bf936184f6ca89a83
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mosquitto/default
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=mosquitto - an MQTT message broker
-  URL:=http://www.mosquitto.org/
-  MAINTAINER:=Karl Palsson <karlp@etactica.com>
-  DEPENDS:= +librt +libuuid
-  USERID:=mosquitto=200:mosquitto=200
-endef
-
-define Package/mosquitto-ssl
-    $(call Package/mosquitto/default)
-    TITLE+= (with SSL support)
-    DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl
-    VARIANT:=ssl
-    PROVIDES:=mosquitto
-endef
-
-define Package/mosquitto-nossl
-    $(call Package/mosquitto/default)
-    TITLE+= (without SSL support)
-    VARIANT:=nossl
-    PROVIDES:=mosquitto
-endef
-
-define Package/mosquitto-ssl/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/mosquitto/default/description
-Mosquitto is an open source (BSD licensed) message broker that implements
-the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight
-method of carrying out messaging using a publish/subscribe model.
-
-This package also includes some basic support for configuring via UCI
-endef
-
-define Package/mosquitto-ssl/description
-	$(call Package/mosquitto/default/description)
-This package is built with SSL support.  TLS-PSK will be included (in both
-the client and broker) if OpenSSL is built with TLS-PSK support.
-endef
-
-define Package/mosquitto-nossl/description
-        $(call Package/mosquitto/default/description)
-        This package is built WITHOUT SSL support.
-endef
-
-
-define Package/mosquitto-client/default
-    $(Package/mosquitto/default)
-    TITLE:= mosquitto - client tools
-    DEPENDS+=+libcares
-    PROVIDES:=mosquitto-client
-endef
-define Package/mosquitto-client-ssl
-    $(call Package/mosquitto-client/default)
-    TITLE+= (With SSL support)
-    DEPENDS+=+libmosquitto-ssl
-    VARIANT:=ssl
-endef
-define Package/mosquitto-client-nossl
-    $(call Package/mosquitto-client/default)
-    TITLE+= (Without SSL support)
-    DEPENDS+=+libmosquitto-nossl
-    VARIANT:=nossl
-endef
-
-define Package/mosquitto-client/default/description
- Command line client tools for publishing messages to MQTT servers
-and subscribing to topics.
-endef
-
-define Package/mosquitto-client-ssl/description
-$(call Package/mosquitto-client/default/description)
-        This package is built with SSL support
-endef
-define Package/mosquitto-client-nossl/description
-$(call Package/mosquitto-client/default/description)
-        This package is built without SSL support
-endef
-
-define Package/libmosquitto/default
-    $(Package/mosquitto/default)
-    SECTION:=libs
-    CATEGORY:=Libraries
-    DEPENDS:=+libpthread +librt +libcares
-    TITLE:= mosquitto - client library
-    PROVIDES:=libmosquitto
-endef
-
-define Package/libmosquitto-ssl
-    $(call Package/libmosquitto/default)
-    TITLE+= (With SSL Support)
-    DEPENDS+= +libopenssl
-    VARIANT=ssl
-endef
-define Package/libmosquitto-nossl
-    $(call Package/libmosquitto/default)
-    TITLE+= (Without SSL Support)
-    VARIANT=nossl
-endef
-
-define Package/libmosquitto/default/description
- Library required for mosquitto's command line client tools, also for
-use by any third party software that wants to communicate with a
-mosquitto server.
-
-Should be useable for communicating with any MQTT v3.1/3.1.1 compatible
-server, such as IBM's RSMB, in addition to Mosquitto
-endef
-
-define Package/libmosquitto-ssl/description
-    $(call Package/libmosquitto/default/description)
-    This package is built with SSL support
-endef
-define Package/libmosquitto-nossl/description
-    $(call Package/libmosquitto/default/description)
-    This package is built without SSL support
-endef
-
-define Package/libmosquittopp
-    SECTION:=libs
-    CATEGORY:=Libraries
-    DEPENDS:=libmosquitto +libstdcpp
-    TITLE:= mosquitto - client c++ library
-endef
-
-define Package/libmosquittopp/description
- C++ Library wrapper for libmosquitto.
-endef
-
-define Package/mosquitto-ssl/conffiles
-/etc/mosquitto/mosquitto.conf
-/etc/config/mosquitto
-endef
-
-Package/mosquitto-nossl/conffiles = $(Package/mosquitto-ssl/conffiles)
-
-define Package/mosquitto/install/default
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto
-	$(INSTALL_DIR) $(1)/etc/mosquitto
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/mosquitto-nossl/install
-	$(call Package/mosquitto/install/default,$(1))
-endef
-
-define Package/mosquitto-ssl/install
-	$(call Package/mosquitto/install/default,$(1))
-ifeq ($(CONFIG_MOSQUITTO_PASSWD),y)
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto_passwd $(1)/usr/bin
-endif
-endef
-
-define Package/mosquitto-client-ssl/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_pub $(1)/usr/bin/mosquitto_pub
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/client/mosquitto_sub $(1)/usr/bin/mosquitto_sub
-endef
-Package/mosquitto-client-nossl/install = $(Package/mosquitto-client-ssl/install)
-
-# This installs files into ./staging_dir/. so that you can cross compile from the host
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/mosquitto.h $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/lib/cpp/mosquittopp.h $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
-	$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
-	$(LN) libmosquittopp.so.1 $(1)/usr/lib/libmosquittopp.so
-endef
-
-# This installs files on the target.  Compare with Build/InstallDev
-define Package/libmosquitto-ssl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
-	$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
-endef
-Package/libmosquitto-nossl/install = $(Package/libmosquitto-ssl/install)
-
-define Package/libmosquittopp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
-	$(LN) libmosquittopp.so.1 $(1)/usr/lib/libmosquittopp.so
-endef
-
-# Applies to all...
-MAKE_FLAGS += WITH_DOCS=no UNAME=Linux
-ifeq ($(BUILD_VARIANT),nossl)
-	MAKE_FLAGS += WITH_TLS=no WITH_WEBSOCKETS=no
-else
-	MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
-	MAKE_FLAGS += WITH_TLS_PSK=$(if $(CONFIG_OPENSSL_WITH_PSK),"yes","no")
-endif
-
-$(eval $(call BuildPackage,mosquitto-ssl))
-$(eval $(call BuildPackage,mosquitto-nossl))
-$(eval $(call BuildPackage,libmosquitto-ssl))
-$(eval $(call BuildPackage,libmosquitto-nossl))
-$(eval $(call BuildPackage,libmosquittopp))
-$(eval $(call BuildPackage,mosquitto-client-ssl))
-$(eval $(call BuildPackage,mosquitto-client-nossl))

mosquitto/files/etc/config/mosquitto

@@ -1,4 +0,0 @@
-config owrt owrt
-    option use_uci 0
-
-config mosquitto mosquitto

mosquitto/files/etc/init.d/mosquitto

@@ -1,211 +0,0 @@
-#!/bin/sh /etc/rc.common
-# Basic init script for mosquitto
-# April 2012, OpenWrt.org
-# Provides support for the luci-app-mosquitto package, if installed
-
-START=80
-USE_PROCD=1
-TCONF=/tmp/mosquitto.generated.conf
-
-# Usage: append_if cfg uci_name output_name
-# add a config line of the form "output_name <value>"
-# if the "uci_name" was found.
-# output_name defaults to uci_name if not specified.
-append_if() {
-    local cfg="$1"
-    local uci_name="$2"
-    local out_name="$3"
-    if [ -z "$out_name" ]; then
-        out_name=$uci_name
-    fi
-    config_get val $cfg $uci_name
-    if [ -n "$val" ]; then
-        echo "$out_name $val" >> $TCONF
-    fi
-}
-
-# mosquitto uses true/false, uci uses 1/0
-# note that this is not shell truthy, but equality with 1!
-append_bool() {
-    if [ $2 -eq 1 ]; then
-        echo "$1 true" >> $TCONF
-    else
-        echo "$1 false" >> $TCONF
-    fi
-}
-
-# as per append_if, but gets the value as a uci bool, not raw
-append_optional_bool() {
-    local cfg="$1"
-    local uci_name="$2"
-    local out_name="$3"
-    config_get val $cfg $uci_name
-    if [ -n "$val" ]; then
-        config_get_bool real $cfg $uci_name
-        append_bool $out_name $real
-    fi
-}
-
-
-convert_mosq_general() {
-	local cfg="$1"
-	config_get destinations "$1" log_dest
-	for dest in $destinations; do
-		echo "log_dest $dest" >> $TCONF
-	done
-
-	config_get_bool no_remote "$1" no_remote_access 0
-	if [ "$no_remote" -eq 1 ]; then
-		echo "bind_address localhost" >> $TCONF
-	fi
-
-	config_get port "$1" port 1883
-	echo "port $port" >> $TCONF
-	append_if "$1" protocol
-	append_if "$1" max_inflight_messages
-	append_if "$1" max_queued_messages
-	append_if "$1" sys_interval
-}
-
-convert_persistence() {
-	local cfg="$1"
-
-	append_if "$cfg" client_expiration persistent_client_expiration
-	append_if "$cfg" autosave_interval
-	append_optional_bool "$cfg" autosave_on_changes autosave_on_changes
-	append_optional_bool "$cfg" persistence persistence
-	append_if "$cfg" file persistence_file
-	config_get loc "$cfg" location
-	if [ -n "$loc" ]; then
-		[ -d "$loc" ] || {
-			mkdir -p "$loc";
-			chown mosquitto "$loc";
-		}
-		echo "persistence_location $loc" >> $TCONF
-	fi
-}
-
-add_listener() {
-    echo "" >> $TCONF
-    config_get port "$1" port
-    if [ -z "$port" ]; then
-        echo "Ignoring listener section without port"
-        return
-    fi
-    config_get_bool no_remote "$1" no_remote_access 0
-    if [ "$no_remote" -eq 1 ]; then
-        echo "listener $port 127.0.0.1" >> $TCONF
-    else
-        echo "listener $port" >> $TCONF
-    fi
-
-    append_if "$1" protocol
-    append_if "$1" http_dir
-    append_optional_bool "$1" use_username_as_clientid use_username_as_clientid
-    append_if "$1" cafile
-    append_if "$1" capath
-    append_if "$1" certfile
-    append_if "$1" keyfile
-    append_if "$1" tls_version
-    append_optional_bool "$1" require_certificate require_certificate
-    append_optional_bool "$1" use_identity_as_username use_identity_as_username
-    append_if "$1" crlfile
-    append_if "$1" ciphers
-    append_if "$1" psk_hint
-}
-
-add_topic() {
-    echo "topic $1" >> $TCONF
-}
-
-add_bridge() {
-    config_get conn "$1" connection
-    config_get addr "$1" address
-    if [ -z "$conn" -o -z "$addr" ]; then
-        echo "Ignoring bridge section, misisng connection/address"
-        return
-    fi
-    echo "" >> $TCONF
-    echo "# Bridge connection from UCI section" >> $TCONF
-    append_if "$1" connection
-    append_if "$1" address
-
-    config_list_foreach "$1" topic add_topic
-    append_optional_bool "$1" cleansession cleansession
-    append_optional_bool "$1" try_private try_private
-    append_optional_bool "$1" notifications notifications
-    append_optional_bool "$1" round_robin round_robin
-
-    # Note, deprecated upstream, preserve old uci configs
-    append_if "$1" clientid remote_clientid
-    append_if "$1" remote_clientid
-    append_if "$1" local_clientid
-    append_if "$1" notification_topic
-    append_if "$1" keepalive_interval
-    append_if "$1" start_type
-    append_if "$1" restart_timeout
-    append_if "$1" idle_timeout
-    append_if "$1" threshold
-    append_if "$1" protocol_version bridge_protocol_version
-    append_optional_bool "$1" attempt_unsubscribe bridge_attempt_unsubscribe
-    append_if "$1" identity bridge_identity
-    append_if "$1" psk bridge_psk
-    append_if "$1" tls_version bridge_tls_version
-
-    append_if "$1" restart_timeout
-    append_if "$1" capath bridge_capath
-    append_if "$1" cafile bridge_cafile
-    append_if "$1" certfile bridge_certfile
-    append_if "$1" keyfile bridge_keyfile
-    # Note, deprecated upstream, preserve old uci configs
-    append_if "$1" username remote_username
-    # Note, deprecated upstream, preserve old uci configs
-    append_if "$1" password remote_password
-    append_if "$1" remote_username
-    append_if "$1" remote_password
-}
-
-
-convert_uci() {
-	rm -rf $TCONF
-	echo "Generating mosquitto config file in $TCONF"
-	echo "# mosquitto.conf file generated from UCI config." >>$TCONF
-	# Don't include a timestamp, it makes md5sum compares fail
-
-	config_load mosquitto
-	config_foreach convert_mosq_general "mosquitto"
-	config_foreach convert_persistence "persistence"
-	config_foreach add_listener "listener"
-	config_foreach add_bridge "bridge"
-}
-
-start_service_real() {
-	local cfg="$1"
-	local use_uci write_pid
-	config_get use_uci "$cfg" use_uci
-	if [ "$use_uci" -eq 1 ]; then
-		CONF=$TCONF
-		convert_uci
-	else
-		CONF=/etc/mosquitto/mosquitto.conf
-        fi
-	config_get write_pid "$cfg" write_pid 0
-
-	procd_open_instance
-	procd_set_param command mosquitto
-	procd_append_param command -c $CONF
-	# Makes /etc/init.d/mosquitto reload work if you edit the final file.
-	procd_set_param file $CONF
-	[ "$write_pid" -eq 1 ] && procd_set_param pidfile /var/run/mosquitto.pid
-	procd_close_instance
-}
-
-start_service() {
-	config_load mosquitto
-	config_foreach start_service_real owrt
-}
-
-service_triggers() {
-	# Makes "reload_config" work
-	procd_add_reload_trigger "mosquitto"
-}

onboardingd/Makefile

@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2013 Inteno
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=onboardingd
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=1b8501d5a24fcdf784678e8f864964fc0138254c
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@private.inteno.se:iopsys-onboarding.git
-
-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)
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/onboardingd
-	CATEGORY:=Utilities
-	DEPENDS:=+libuci +libubox +ubus +libpthread +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_ramips:libnl-tiny +libopenssl +libmosquitto +libcurl
-	TITLE:=package for onboarding project, as well as some dongle stuff
-endef
-
-define Package/onboardingd/description
-	questd collects system and network information and presents
-	this information via ubus
-endef
-
-define Package/onboardingd/install
-	$(CP) ./files/* $(1)/ # copy from files to final image
-	$(INSTALL_DIR) $(1)/sbin # make the dir
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/parser $(1)/sbin/ # copy binaries to new directory
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_apn $(1)/sbin/ # copy binaries to new directory
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_pin $(1)/sbin/ # copy binaries to new directory
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dongle_network $(1)/sbin/ # copy binaries to new directory
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/watcher $(1)/sbin/ # copy binaries to new directory
-	$(INSTALL_DIR) $(1)/root/json # create the directory JSON in root
-	$(CP) ./json/* $(1)/root/json # copy files from JSON folder to router JSON
-	$(CP) ./json/* $(1)/root/
-endef
-
-$(eval $(call BuildPackage,onboardingd))

onboardingd/files/etc/config/onboarding

@@ -1,3 +0,0 @@
-config onboarding onboarding
-	option loglevel 0
-	option file '/root/json/aps.json'

onboardingd/files/etc/init.d/onboarding

@@ -1,84 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=14
-STOP=96
-
-USE_PROCD=1
-NAME=onboardingd
-
-start_service() {
-	config_load onboarding
-	config_get loglevel onboarding loglevel "0"
-	config_get file onboarding file false
-	procd_open_instance
-	procd_set_param command "/sbin/watcher"
-
-	procd_append_param command --loglevel "$loglevel"
-
-	if [ "$file" ]
-	then
-		procd_append_param command --path "$file"
-	fi
-
-	procd_set_param respawn
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-	procd_open_instance
-	procd_set_param command "/sbin/parser"
-
-	procd_append_param command --loglevel "$loglevel"
-
-	if [ "$file" ]
-	then
-		procd_append_param command --path "$file"
-	fi
-
-	procd_set_param respawn
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-
-	procd_open_instance
-	procd_set_param command "/sbin/dongle_apn"
-	procd_set_param respawn
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-
-	procd_open_instance
-	procd_set_param command "/sbin/dongle_network"
-	procd_set_param respawn
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-	
-	procd_open_instance
-	procd_set_param command "/sbin/dongle_pin"
-	procd_set_param respawn
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-}
-
-#start() {
-#	service_start /sbin/watcher
-#	service_start /sbin/parser
-#}
-
-#stop() {
-	#stop_service() is called after procd killed the service
-#	service_stop /sbin/watcher
-#	service_stop /sbin/parser
-#}
-
-service_triggers()
-{
-	procd_add_reload_trigger onboarding
-	#echo "trigger"
-}
-
-reload_service() {
-	stop
-	start
-}

onboardingd/files/usr/libexec/rpcd/onboarding.uci

@@ -1,53 +0,0 @@
-#!/bin/ash
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-handle_interface() {
-	local config="$1"
-	local file, loglevel
-
-	config_get file $section "file"
-	config_get loglevel $section "loglevel"
-	json_init
-	json_add_string "file" "$file"
-	json_add_string "loglevel" "$loglevel"
-	json_dump
-}
-
-case "$1" in
-	list)
-		json_init
-		json_add_object "status"
-		json_close_object
-		json_add_object "set_configurations"
-		json_add_string "loglevel" "x"
-		json_add_string "file" "x"
-		json_close_object
-		json_dump
-		;;
-	call)
-		case "$2" in
-		status)
-			config_load onboarding
-			config_foreach handle_interface onboarding
-			;;
-		set_configurations)
-			local input, loglevel, file
-
-			read input
-			json_load $input
-			json_get_var loglevel loglevel
-			json_get_var file file
-
-			uci_set onboarding onboarding loglevel "$loglevel"
-			uci_set onboarding onboarding file "$file"
-			uci_commit onboarding
-			config_load onboarding
-			config_foreach handle_interface onboarding
-			/etc/init.d/onboarding restart
-			;;
-		esac
-		;;
-esac
-

onboardingd/json/aps.json

@@ -1,26 +0,0 @@
-{
-	"access_points": [
-		{
-			"ssid": "o",
-			"snr": 1,
-			"channel": 11,
-			"author": {
-				"first_name": "Jakob",
-				"last_name": "Olson"
-			},
-			"test_obj": {
-				"inner_test": 1
-			},
-			"array1" : [
-				{
-					"inner_array" : [
-					],
-					"field5": 0,"a3":2,"a4":5
-				},
-				{
-					"field1": 3, "b2":1, "v4": 5
-				}
-			]
-		}
-	]
-}

owsd/Makefile

@@ -1,8 +1,5 @@
 #
-# Copyright (C) 2016 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
+# Copyright (C) 2018 Inteno
 #
 
 include $(TOPDIR)/rules.mk
@@ -13,7 +10,7 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=http://public.inteno.se/owsd.git
-PKG_SOURCE_VERSION:=fa25ad0b5af3c9a5c16124a9f699dae3be7b68dd
+PKG_SOURCE_VERSION:=372743e4c905c9d51988742442b375f0b2bab8db
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_MAINTAINER:=Sartura Support for Inteno <support-inteno@sartura.hr>
@@ -61,8 +58,8 @@ define Package/owsd/install
 	$(INSTALL_CONF) ./files/owsd.config $(1)/etc/config/owsd
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) ./files/owsd.hotplug $(1)/etc/hotplug.d/iface/55-owsd
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/owsd.uci_default $(1)/etc/uci-defaults/55-owsd-interfaces
+#	$(INSTALL_DIR) $(1)/etc/uci-defaults
+#	$(INSTALL_BIN) ./files/owsd.uci_default $(1)/etc/uci-defaults/55-owsd-interfaces
 endef
 
 define Package/owsd-testdata

owsd/files/owsd.config

@@ -11,6 +11,7 @@ config ubusproxy 'ubusproxy'
 #	list peer 'wss://192.168.1.101/'
 #	list object 'router.*'
 #	list object 'system'
+#	option prefix 'ip' # 'ip' or 'mac'
 #	option peer_cert '/etc/ssl/certs/owsd-repeater-control-cert.pem'
 #	option peer_key '/etc/ssl/private/owsd-repeater-control-key.pem'
 #	option peer_ca '/etc/ssl/certs/owsd-server-ca.pem'
@@ -52,6 +53,8 @@ config owsd-listen 'lan_8080'
 #	option ca '/etc/ssl/certs/owsd-ca-for-clients.pem'
 #	option whitelist_interface_as_origin '1'
 #	list origin '*'
+#	list ubusx_acl 'netmode'
+#	list ubusx_acl 'router.*'
 
 config owsd-listen 'wan'
 	option port '80'

owsd/files/owsd.init

@@ -110,6 +110,7 @@ validate_owsd_ubusproxy() {
 		'enable:bool:1' \
 		'peer:list(string)' \
 		'object:list(string)' \
+		'prefix:string' \
 		'peer_key:file' \
 		'peer_cert:file' \
 		'peer_ca:file' \
@@ -156,6 +157,7 @@ validate_owsd_iface() {
 		'key:file' \
 		'ca:file' \
 		'restrict_to_user:list(string)' \
+		'ubusx_acl:list(string)' \
 		&&
 	[ -n "${port}" ]
 }
@@ -164,6 +166,7 @@ parse_owsd_iface() {
 	local port interface whitelist_interface_as_origin whitelist_dhcp_domains ipv6 ipv6only linklocal
 	local cert key ca
 	local restrict_to_user
+	local ubusx_acl
 
 	validate_owsd_iface "$1" || {
 		echo "Validation failed"
@@ -183,6 +186,9 @@ parse_owsd_iface() {
 		[ -n "${restrict_to_user}" ] && procd_append_param command -u"${restrict_to_user}"
 
 		[ -n "$2" ] && procd_append_param command -i"$2"
+
+		[ -n "${ubusx_acl}" ] && procd_append_param command -X"${ubusx_acl}"
+
 	}
 
 	append_whitelists () {
@@ -285,6 +291,8 @@ start_service() {
 
 		config_list_foreach "ubusproxy" "peer" append_peer
 		config_list_foreach "ubusproxy" "object" append_object
+
+		[ "${prefix}" == "mac" ] && procd_append_param command -F"mac"
 	fi
 
 	config_foreach parse_owsd_iface "owsd-listen"

peripheral_manager/files/sbin/ledctl

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+usage () {
+	echo "Usage: ledctl [normal|test|allon|alloff|production]"
+	exit 1
+}
+
+[ $# -ne 1 ] && usage
+ledstate=$(echo $1 | tr '[A-Z]' '[a-z]')
+
+case $ledstate in
+	normal|test|allon|alloff|production)
+		ubus call leds set  "{\"state\" : \"$ledstate\"}"
+	;;
+	*)
+		usage
+	;;
+esac
+

questd/Makefile

@@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk
 PKG_NAME:=questd
 PKG_VERSION:=3.1.40
 
-PKG_SOURCE_VERSION:=11dd6f37554f87c767560b3d1d4eba2e2a4ed0ef
+PKG_SOURCE_VERSION:=3f6f5e56ebd11862c0255a05e733f7fe08e1ceb0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

rtl_433/Makefile

@@ -0,0 +1,40 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rtl_433
+PKG_VERSION:=18.05
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/rtl_433-$(PKG_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/merbanan/rtl_433.git
+PKG_SOURCE_DATE:=2018-05-02
+PKG_SOURCE_VERSION:=5dce4f275b7e53e14043da685590514a992c38e4
+PKG_MIRROR_HASH:=7219b2d612959ef299bf692e3eef53735193f8c0817d229a8a40c732ab047ac5
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/rtl_433
+  SECTION:=base
+  CATEGORY:=Utilities
+  TITLE:=turns your Realtek RTL2832 based DVB dongle into a 433.92MHz generic data receiver
+  URL:=https://github.com/merbanan/rtl_433
+  DEPENDS:= +librtlsdr +libusb
+endef
+
+define Package/rtl_433/description
+ rtl_433 turns your Realtek RTL2832 based DVB dongle into a 433.92MHz generic data receiver
+endef
+
+define Build/Configure
+  $(call Build/Configure/Default,)
+endef
+
+define Package/rtl_433/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rtl_433 $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,rtl_433))

tptest/files/etc/config/speedtest

@@ -1,5 +1,5 @@
 
 config testserver '1'
 	option server 'referens.sth.ip-performance.se'
-	option port '1642'
+	option port '1641'
 

voice-client/files/etc/asterisk_templates/indications.conf.TEMPLATE

@@ -206,6 +206,19 @@ info = 450/100,0/100,450/100,0/100,450/100,0/100,450/400,0/400
 ; STUTTER - not specified
 stutter = 450+425
 
+[cr]
+description = Croatia / Europe
+ringcadence = 2000,4000
+dial = 425/200,0/300,425/700,0/800
+busy = 425/500,0/500
+ring = 425/1000,0/4000
+congestion = 425/250,0/250
+callwaiting = 425/300,0/8000
+dialrecall = 425/200,0/300,425/700,0/800
+record = 1400/500,0/15000
+info = 1400/330,!1800/330,0/1000
+stutter = 0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440
+
 [cz]
 description = Czech Republic
 ; Reference: http://www.itu.int/ITU-T/inr/forms/files/tones-0203.pdf

voice-client/files/etc/asterisk_templates/sip_registration_voicesec.TEMPLATE

@@ -1,2 +1,2 @@
-#exec echo "register => |TRANSPORT|://|USER|@|DOMAIN|:$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|"
+#exec echo 'register => |TRANSPORT|://|USER|@|DOMAIN|:'$(/usr/bin/voicesec -d /usr/lib/asterisk/voicesec_|PROVIDER|)'|AUTHUSER|@|PROVIDER||PORT|/|CONTACT_USER|'
 

voice-client/files/etc/idc_cc.cfg

@@ -3,6 +3,7 @@ BEL;00;32
 BRA;00;55
 CHL;1xx0;56
 CHN;00;86
+HRV;00;385
 CZE;00;420
 DNK;00;45
 ETS;00;372

voice-client/files/etc/init.d/voice_client

@@ -721,6 +721,10 @@ configure_sip_provider()
 	config_get transport $1 transport
 	config_get encryption $1 encryption
 
+	# This is a hack to fix security issue #14962
+	user=${user//"'"/}
+	authuser=${authuser//"'"/}
+
 	if [ -z "$transport" ] ; then 
 		transport="udp" 
 	fi

wifimngr/Makefile

@@ -1,45 +1,53 @@
 #
-# Copyright (C) 2015 Inteno
+# Copyright (C) 2018 Iopsys
 #
 
 include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=2016-03-29
+PKG_VERSION:=1.0.0
 
-PKG_SOURCE_VERSION:=9dae4438b781b0abb7ca9e16c37c0344b16ccf2a
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=29ac0e0361e20d21559e0f2f585e5220f048b9e0
 PKG_SOURCE_URL:=http://public.inteno.se:/wifimngr
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@inteno.se>
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-LDFLAGS+= \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-	-Wl,-rpath-link=$(STAGING_DIR)/lib
-
 define Package/wifimngr
-	CATEGORY:=Network
-	DEPENDS:=+libpthread +libstdcpp +librt +libjson +alljoyn +alljoyn-about +ubus +libuci
-	TITLE:=WiFi Manager
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi status and configration utility
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/wifimngr/description
-	wifimngr manages wireless driver
+ This package can be used to configure and provide status about
+ the WiFi modules through UBUS.
+ It does this in an implementation agnostic manner through APIs
+ exposed by the libwifi library.
 endef
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+#MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)"
+
+#define Build/Compile
+#	+$(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS)
+#endef
+
 define Package/wifimngr/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/sbin/
-endef
-
-define Package/wifimngr/postinst
-	/etc/init.d/alljoyn restart
-	pidof alljoyn-daemon >/dev/null && wifimngr &
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/usr/sbin/
 endef
 
 $(eval $(call BuildPackage,wifimngr))