uci-diff: update

-------------------------------------------------------------------------------
* 07c8a16 Before dectmngr2 does a fast exit (in case of an error), try to send a failure response to any ubus quierier (or might block in a timeout).
* c5619c2 - Only shuttdown ubus receiver if the radio is configured for auto off and is about to become off soon. - Comments
* a4898c8 - Extend timeout error message to ubus querier due to deleting a handset may be very slow sometimes. - When shutting down ubus receiver, also send an error to any active querier (to avoid blocking timeouts). - Only enable ubus receiver once if needed.
-------------------------------------------------------------------------------
commit 07c8a1665dc1f767c8ae2da92e41f482956f8959
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2016-06-28 15:43:12 +0200

    Before dectmngr2 does a fast exit (in case of an error), try to send a
    failure response to any ubus quierier (or might block in a timeout).

Base directory -> /
 src/error.c | 5 +++++
 src/ubus.c  | 1 +
 2 files changed, 6 insertions(+)
-------------------------------------------------------------------------------
commit c5619c257a199eb331f41798a01d5d608ce149b5
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2016-06-28 13:35:02 +0200

    - Only shuttdown ubus receiver if the radio is configured for auto off and
    is about to become off soon. - Comments

Base directory -> /
 src/handset.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit a4898c88a49b94bccb5c9a60cab3f6bdff94cffc
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2016-06-28 13:33:08 +0200

    - Extend timeout error message to ubus querier due to deleting a handset may
    be very slow sometimes. - When shutting down ubus receiver, also send an
    error to any active querier (to avoid blocking timeouts). - Only enable ubus
    receiver once if needed.

Base directory -> /
 src/ubus.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------

asterisk-1.8.x-mod/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=asterisk18-mod
 PKG_VERSION:=1.8.10.1
 
-PKG_SOURCE_VERSION:=1618b4881a44ea493c602da5c60723c45509719a
+PKG_SOURCE_VERSION:=015d279241d0ac5d8c1321aa6f78b9ae551575d1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/asterisk-1.8.x
 

dectmngr2/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=1.1.0
 PKG_SOURCE_URL:=http://public.inteno.se:/dectmngr2
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=46658e95b19c35ff6194a9566bb5439720ec251d
+PKG_SOURCE_VERSION:=07c8a1665dc1f767c8ae2da92e41f482956f8959
 PKG_NAME:=dectmngr2
 
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=3.0-2016-06-02
+PKG_VERSION:=3.0-2016-07-01
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3796902ebf44c3cd00b3829ef7aca911cdde2cc7
+PKG_SOURCE_VERSION:=85ecddf5a3993e60079c3a67bc74267480d0dc1a
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -34,7 +34,7 @@ define Package/icwmp/Default
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +bcmkernel +curl
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +libexpat +libstrophe +curl
 endef
 
 define Package/icwmp/description

inteno-netmodes/Makefile

@@ -0,0 +1,34 @@
+#
+# Copyright (C) 2016 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=inteno-netmodes
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/inteno-netmodes
+  CATEGORY:=Base system
+  TITLE:=Predefined Network Modes
+endef
+
+define Package/inteno-netmodes/description
+	Predefined Network Modes
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/inteno-netmodes/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,inteno-netmodes))

inteno-netmodes/files/etc/config/netmode

@@ -0,0 +1,5 @@
+config mode 'setup'
+        option dir '/etc/netmodes'
+        option detail ''
+        option curmode 'routed'
+

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

@@ -0,0 +1,154 @@
+#!/bin/sh /etc/rc.common
+
+START=10
+USE_PROCD=1
+
+. /usr/share/libubox/jshn.sh
+. /lib/network/config.sh
+
+local modedir=$(uci -q get netmode.setup.dir)
+[ -n "$modedir" ] || modedir="/etc/netmodes"
+
+get_device() {
+	local PORT_NAMES=$(db get hw.board.ethernetPortNames)
+	local PORT_ORDER=$(db get hw.board.ethernetPortOrder)
+        local cnt=1
+        local idx=0
+
+	local pnum=$(echo $PORT_NAMES | wc -w)
+
+	if [ $pnum -le 2 ]; then
+		PORT_NAMES=$(echo $PORT_NAMES | sed 's/LAN/LAN1/g')
+	fi
+
+	# get index of interface name
+	for i in $PORT_NAMES; do
+		if [ "$i" == "$1" ]; then
+			idx=$cnt
+		fi
+		cnt=$((cnt+1))
+	done
+
+        # get port name from index
+	cnt=1
+	for i in $PORT_ORDER; do
+		if [ "$cnt" == "$idx" ]; then
+			echo $i
+		fi
+		cnt=$((cnt+1))
+	done
+}
+
+populate_netmodes() {
+	[ -f /etc/config/netmode -a -d $modedir ] || return
+
+	delete_netmode() {
+		uci delete netmode.$1
+	}
+
+	config_load netmode
+
+	config_foreach delete_netmode netmode
+	uci commit netmode
+
+	wan=$(get_device WAN)
+	lan1=$(get_device LAN1)
+	lan2=$(get_device LAN2)
+	lan3=$(get_device LAN3)
+	lan4=$(get_device LAN4)
+	lan5=$(get_device LAN5)
+
+	for file in $(find $modedir -type f); do
+		grep -q "\$WAN" $file && sed -i "s/\$WAN/$wan/g" $file
+		grep -q "\$LAN1" $file && sed -i "s/\$LAN1/$lan1/g" $file
+		grep -q "\$LAN2" $file && sed -i "s/\$LAN2/$lan2/g" $file
+		grep -q "\$LAN3" $file && sed -i "s/\$LAN3/$lan3/g" $file
+		grep -q "\$LAN4" $file && sed -i "s/\$LAN4/$lan4/g" $file
+	done
+
+	local hardware=$(db get hw.board.hardware)
+	local keys lang desc exp exclude
+	for mode in $(ls $modedir); do
+			lang=""
+			desc=""
+			exp=""
+			uci -q set netmode.$mode=netmode
+			uci -q set netmode.$mode.conf=$mode
+			json_load "$(cat $modedir/$mode/DETAILS)"
+
+			exclude=0
+			json_get_var excluded_boards excluded_boards
+			for board in $excluded_boards; do
+				if [ "$board" == "$hardware" ]; then
+					uci -q delete netmode.$mode
+					exclude=1
+					break
+				fi
+			done
+			[ $exclude -eq 1 ] && continue
+
+			json_select description
+			json_get_keys keys
+			for k in $keys; do
+				json_get_keys lang $k
+				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
+				json_select $k
+				json_get_var desc $lang
+				uci -q set netmode.$mode."desc_$lang"="$desc"
+				[ "$lang" == "en" ] && uci -q set netmode.$mode."desc"="$desc"
+				json_select ..
+			done
+			json_select ..
+
+			json_select explanation
+			json_get_keys keys
+			for k in $keys; do
+				json_get_keys lang $k
+				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
+				json_select $k
+				json_get_var exp $lang
+				uci -q set netmode.$mode."exp_$lang"="$exp"
+				[ "$lang" == "en" ] && uci -q set netmode.$mode."exp"="$exp"
+				json_select ..
+			done
+			json_select ..
+
+			json_get_var cred credentials
+			uci -q set netmode.$mode.askcred="$cred"
+			json_get_var reboot reboot
+			uci -q set netmode.$mode.reboot="$reboot"
+	done
+	uci commit netmode
+}
+
+switch_netmode() {
+	[ -f /etc/config/netmode -a -d $modedir ] || return
+
+	config_load netmode
+
+	config_get curmode setup curmode
+	config_get conf $curmode conf
+	cp /etc/netmodes/$conf/* /etc/config/
+	rm -f /etc/config/DETAILS
+	sync
+	local reboot=$(uci -q get netmode.$curmode.reboot)
+	if [ "$reboot" == "0" ]; then
+		/etc/init.d/enviroment reload
+	else
+		reboot &
+	fi
+}
+
+start_service() {
+	populate_netmodes
+}
+
+reload_service() {
+        switch_netmode
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger netmode
+}
+

inteno-netmodes/files/etc/netmodes/bridged/DETAILS

@@ -0,0 +1,13 @@
+{
+	"description": [
+		{ "en" : "Bridged IPTV" },
+		{ "sv" : "Brygg IPTV" }
+	],
+	"explanation": [
+		{ "en" : "LAN4 port is bridged with IPTV VLAN" },
+		{ "sv" : "LAN4 port överbryggas med IPTV VLAN" }
+	],
+	"credentials" : 0,
+	"excluded_boards" : "CG300 CG301"
+}
+

inteno-netmodes/files/etc/netmodes/bridged/dhcp

@@ -0,0 +1,22 @@
+config dnsmasq
+	option domainneeded	1
+	option boguspriv	1
+	option filterwin2k	0
+	option localise_queries	1
+	option rebind_protection 0
+	option rebind_localhost 1
+	option local	'/lan/'
+	option domain	'lan'
+	option expandhosts	1
+	option nonegcache	0
+	option authoritative	1
+	option readethers	1
+	option leasefile	'/tmp/dhcp.leases'
+	option resolvfile	'/tmp/resolv.conf.auto'
+
+config dhcp lan
+	option interface	lan
+	option start 	100
+	option limit	150
+	option leasetime	12h
+

inteno-netmodes/files/etc/netmodes/bridged/firewall

@@ -0,0 +1,114 @@
+config defaults
+	option syn_flood	1
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		REJECT
+# Uncomment this line to disable ipv6 rules
+#	option disable_ipv6	1
+
+config zone
+	option name		lan
+	list   network		'lan'
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		ACCEPT
+
+config zone
+	option name		wan
+	list   network		'wan'
+	list   network		'wan6'
+	list   network		'iptv'
+	option input		REJECT
+	option output		ACCEPT
+	option forward		REJECT
+	option masq		1
+	option mtu_fix		1
+
+config forwarding
+	option src		lan
+	option dest		wan
+
+# We need to accept udp packets on port 68,
+# see https://dev.openwrt.org/ticket/4108
+config rule
+	option name		Allow-DHCP-Renew
+	option src		wan
+	option proto		udp
+	option dest_port	68
+	option target		ACCEPT
+	option family		ipv4
+	option hidden		1
+
+# Allow IPv4 ping
+config rule
+	option name		Allow-Ping
+	option src		wan
+	option proto		icmp
+	option icmp_type	echo-request
+	option family		ipv4
+	option target		ACCEPT
+	option hidden		1
+
+# Allow DHCPv6 replies
+# see https://dev.openwrt.org/ticket/10381
+config rule
+	option name		Allow-DHCPv6
+	option src		wan
+	option proto		udp
+	option src_ip		fe80::/10
+	option src_port		547
+	option dest_ip		fe80::/10
+	option dest_port	546
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Input
+	option src		wan
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	list icmp_type		router-solicitation
+	list icmp_type		neighbour-solicitation
+	list icmp_type		router-advertisement
+	list icmp_type		neighbour-advertisement
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# Allow essential forwarded IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Forward
+	option src		wan
+	option dest		*
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# include a file with users custom iptables rules
+config include
+	option path /etc/firewall.user
+	option reload 1
+
+# include a file with rules for SIP and RTP traffic
+config include
+	option path /etc/firewall.sip
+	option reload 1
+

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_adsl

@@ -0,0 +1,23 @@
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '0'
+        option ifname 'atm0.1'
+        option baseifname 'atm0'
+        option atmtype 'ubr'
+        option name 'atm_inet'
+        option vpi '8'
+        option vci '35'
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '1'
+        option ifname 'atm1.1'
+        option baseifname 'atm1'
+        option atmtype 'ubr'
+        option name 'atm_tv'
+        option vpi '8'
+        option vci '45'
+

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_ethernet

@@ -0,0 +1,5 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_vdsl

@@ -0,0 +1,9 @@
+config vdsl_interface
+	option unit '0'
+	option ifname 'ptm0.1'
+	option baseifname 'ptm0'
+	option name 'VDSL2'
+	option dslat '1'
+	option ptmprio '1'
+	option ipqos '1'
+

inteno-netmodes/files/etc/netmodes/bridged/layer2_interface_vlan

@@ -0,0 +1,18 @@
+
+
+config 'vlan_interface'
+	option name 'eth_tv'
+	option ifname '$WAN.100'
+	option baseifname '$WAN'
+	option vlan8021q '100'
+	option vlan8021p '0'
+	option bridge '1'
+
+config 'vlan_interface'
+	option name 'vdsl_tv'
+	option ifname 'ptm0.100'
+	option baseifname 'ptm0'
+	option vlan8021q '100'
+	option vlan8021p '0'
+	option bridge '1'
+

inteno-netmodes/files/etc/netmodes/bridged/mcpd

@@ -0,0 +1,18 @@
+
+config mcpd 'mcpd'
+	option igmp_query_response_interval '10'
+	option igmp_last_member_query_interval '10'
+	option igmp_robustness_value '2'
+	option igmp_lan_to_lan_multicast '0'
+	option igmp_max_groups '25'
+	option igmp_max_sources '10'
+	option igmp_max_members '25'
+	option igmp_fast_leave '1'
+	option igmp_join_immediate '0'
+	option igmp_proxy_enable '0'
+	option igmp_snooping_enable '2'
+	option igmp_snooping_interfaces 'br-iptv'
+	option igmp_default_version '2'
+	option igmp_query_interval '120'
+	option igmp_proxy_interfaces 'iptv'
+

inteno-netmodes/files/etc/netmodes/bridged/network

@@ -0,0 +1,37 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'lan'
+	option is_lan '1'
+	option type 'bridge'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ifname '$LAN1 $LAN2 $LAN3'
+	option ip6assign '60'
+	
+config interface 'wan'
+	option type 'anywan'
+	option proto 'dhcp'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
+	option ifname 'ptm0.1 atm0.1 $WAN.1'
+	option ipv6 '1'
+
+config interface 'iptv'
+	option type 'bridge'
+	option proto 'dhcp'
+	option gateway '0.0.0.0'
+	option reqopts 'staticroutes'
+	option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
+	option defaultroute '0'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/DETAILS

@@ -0,0 +1,13 @@
+{
+	"description": [
+		{ "en" : "VoIP + Bridged IPTV" },
+		{ "sv" : "VoIP + Brygg IPTV" }
+	],
+	"explanation": [
+		{ "en" : "VoIP on dedicated VLAN + LAN4 port is bridged with IPTV VLAN" },
+		{ "sv" : "VoIP on dedicated VLAN + LAN4 port överbryggas med IPTV VLAN" }
+	],
+	"credentials" : 0,
+	"excluded_boards" : "CG300 CG301"
+}
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/dhcp

@@ -0,0 +1,22 @@
+config dnsmasq
+	option domainneeded	1
+	option boguspriv	1
+	option filterwin2k	0
+	option localise_queries	1
+	option rebind_protection 0
+	option rebind_localhost 1
+	option local	'/lan/'
+	option domain	'lan'
+	option expandhosts	1
+	option nonegcache	0
+	option authoritative	1
+	option readethers	1
+	option leasefile	'/tmp/dhcp.leases'
+	option resolvfile	'/tmp/resolv.conf.auto'
+
+config dhcp lan
+	option interface	lan
+	option start 	100
+	option limit	150
+	option leasetime	12h
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/firewall

@@ -0,0 +1,114 @@
+config defaults
+	option syn_flood	1
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		REJECT
+# Uncomment this line to disable ipv6 rules
+#	option disable_ipv6	1
+
+config zone
+	option name		lan
+	list   network		'lan'
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		ACCEPT
+
+config zone
+	option name		wan
+	list   network		'wan'
+	list   network		'wan6'
+	list   network		'iptv'
+	option input		REJECT
+	option output		ACCEPT
+	option forward		REJECT
+	option masq		1
+	option mtu_fix		1
+
+config forwarding
+	option src		lan
+	option dest		wan
+
+# We need to accept udp packets on port 68,
+# see https://dev.openwrt.org/ticket/4108
+config rule
+	option name		Allow-DHCP-Renew
+	option src		wan
+	option proto		udp
+	option dest_port	68
+	option target		ACCEPT
+	option family		ipv4
+	option hidden		1
+
+# Allow IPv4 ping
+config rule
+	option name		Allow-Ping
+	option src		wan
+	option proto		icmp
+	option icmp_type	echo-request
+	option family		ipv4
+	option target		ACCEPT
+	option hidden		1
+
+# Allow DHCPv6 replies
+# see https://dev.openwrt.org/ticket/10381
+config rule
+	option name		Allow-DHCPv6
+	option src		wan
+	option proto		udp
+	option src_ip		fe80::/10
+	option src_port		547
+	option dest_ip		fe80::/10
+	option dest_port	546
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Input
+	option src		wan
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	list icmp_type		router-solicitation
+	list icmp_type		neighbour-solicitation
+	list icmp_type		router-advertisement
+	list icmp_type		neighbour-advertisement
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# Allow essential forwarded IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Forward
+	option src		wan
+	option dest		*
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# include a file with users custom iptables rules
+config include
+	option path /etc/firewall.user
+	option reload 1
+
+# include a file with rules for SIP and RTP traffic
+config include
+	option path /etc/firewall.sip
+	option reload 1
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_adsl

@@ -0,0 +1,34 @@
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '0'
+        option ifname 'atm0.1'
+        option baseifname 'atm0'
+        option atmtype 'ubr'
+        option name 'atm_inet'
+        option vpi '8'
+        option vci '35'
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '1'
+        option ifname 'atm1.1'
+        option baseifname 'atm1'
+        option atmtype 'ubr'
+        option name 'atm_tv'
+        option vpi '8'
+        option vci '45'
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '1'
+        option ifname 'atm2.1'
+        option baseifname 'atm2'
+        option atmtype 'ubr'
+        option name 'atm_voip'
+        option vpi '8'
+        option vci '55'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_ethernet

@@ -0,0 +1,5 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_vdsl

@@ -0,0 +1,9 @@
+config vdsl_interface
+	option unit '0'
+	option ifname 'ptm0.1'
+	option baseifname 'ptm0'
+	option name 'VDSL2'
+	option dslat '1'
+	option ptmprio '1'
+	option ipqos '1'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/layer2_interface_vlan

@@ -0,0 +1,32 @@
+
+
+config 'vlan_interface'
+	option name 'eth_tv'
+	option ifname '$WAN.100'
+	option baseifname '$WAN'
+	option vlan8021q '100'
+	option vlan8021p '0'
+	option bridge '1'
+
+config 'vlan_interface'
+	option name 'eth_voip'
+	option ifname '$WAN.200'
+	option baseifname '$WAN'
+	option vlan8021q '200'
+	option vlan8021p '0'
+
+config 'vlan_interface'
+	option name 'vdsl_tv'
+	option ifname 'ptm0.100'
+	option baseifname 'ptm0'
+	option vlan8021q '100'
+	option vlan8021p '0'
+	option bridge '1'
+
+config 'vlan_interface'
+	option name 'vdsl_voip'
+	option ifname 'ptm0.200'
+	option baseifname 'ptm0'
+	option vlan8021q '200'
+	option vlan8021p '0'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/mcpd

@@ -0,0 +1,18 @@
+
+config mcpd 'mcpd'
+	option igmp_query_response_interval '10'
+	option igmp_last_member_query_interval '10'
+	option igmp_robustness_value '2'
+	option igmp_lan_to_lan_multicast '0'
+	option igmp_max_groups '25'
+	option igmp_max_sources '10'
+	option igmp_max_members '25'
+	option igmp_fast_leave '1'
+	option igmp_join_immediate '0'
+	option igmp_proxy_enable '0'
+	option igmp_snooping_enable '2'
+	option igmp_snooping_interfaces 'br-iptv'
+	option igmp_default_version '2'
+	option igmp_query_interval '120'
+	option igmp_proxy_interfaces 'iptv'
+

inteno-netmodes/files/etc/netmodes/internet_iptv_voip/network

@@ -0,0 +1,45 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'lan'
+	option is_lan '1'
+	option type 'bridge'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ifname '$LAN1 $LAN2 $LAN3'
+	option ip6assign '60'
+	
+config interface 'wan'
+	option type 'anywan'
+	option proto 'dhcp'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
+	option ifname 'ptm0.1 atm0.1 $WAN.1'
+	option ipv6 '1'
+
+config interface 'iptv'
+	option type 'bridge'
+	option proto 'dhcp'
+	option gateway '0.0.0.0'
+	option reqopts 'staticroutes'
+	option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
+	option defaultroute '0'
+
+config interface 'voip'
+	option type 'anywan'
+	option proto 'dhcp'
+	option gateway '0.0.0.0'
+	option reqopts 'staticroutes'
+	option ifname 'ptm0.200 atm2.1 $WAN.200'
+	option defaultroute '0'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+

inteno-netmodes/files/etc/netmodes/repeater/DETAILS

@@ -0,0 +1,13 @@
+{
+	"description": [
+		{ "en" : "Wireless Repeater" },
+		{ "sv" : "Trådlös Repeater" }
+	],
+	"explanation": [
+		{ "en" : "Your router is going to act as a wired extender or wireless repeater to the selected Wireless Access Point." },
+		{ "sv" : "Routern kommer att fungera som en trådbunden extender eller trådlös repeater till den valda trådlösa åtkomstpunkten." }
+	],
+	"credentials" : 1,
+	"reboot" : 0
+}
+

inteno-netmodes/files/etc/netmodes/repeater/firewall

@@ -0,0 +1,121 @@
+config defaults
+	option syn_flood	1
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		REJECT
+# Uncomment this line to disable ipv6 rules
+#	option disable_ipv6	1
+
+config zone
+	option name		lan
+	list   network		'lan'
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		ACCEPT
+
+config zone
+	option name		wan
+	list   network		'wan'
+	option input		REJECT
+	option output		ACCEPT
+	option forward		REJECT
+	option masq		1
+	option mtu_fix		1
+
+config forwarding
+	option src		lan
+	option dest		wan
+
+# We need to accept udp packets on port 68,
+# see https://dev.openwrt.org/ticket/4108
+config rule
+	option name		Allow-DHCP-Renew
+	option src		wan
+	option proto		udp
+	option dest_port	68
+	option target		ACCEPT
+	option family		ipv4
+	option hidden		1
+
+config rule
+	option name		Repeater-Management
+	option src		wan
+	option proto		tcp
+	option dest_port	'22 80 8080 8181 9876'
+	option target		ACCEPT
+	option family		ipv4
+	option hidden		1
+
+# Allow IPv4 ping
+config rule
+	option name		Allow-Ping
+	option src		wan
+	option proto		icmp
+	option icmp_type	echo-request
+	option family		ipv4
+	option target		ACCEPT
+	option hidden		1
+
+# Allow DHCPv6 replies
+# see https://dev.openwrt.org/ticket/10381
+config rule
+	option name		Allow-DHCPv6
+	option src		wan
+	option proto		udp
+	option src_ip		fe80::/10
+	option src_port		547
+	option dest_ip		fe80::/10
+	option dest_port	546
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Input
+	option src		wan
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	list icmp_type		router-solicitation
+	list icmp_type		neighbour-solicitation
+	list icmp_type		router-advertisement
+	list icmp_type		neighbour-advertisement
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# Allow essential forwarded IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Forward
+	option src		wan
+	option dest		*
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+	option hidden		1
+
+# include a file with users custom iptables rules
+config include
+	option path /etc/firewall.user
+	option reload 1
+
+# include a file with rules for SIP and RTP traffic
+config include
+	option path /etc/firewall.sip
+	option reload 1
+

inteno-netmodes/files/etc/netmodes/repeater/layer2_interface_ethernet

@@ -0,0 +1,6 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+	option bridge '1'
+

inteno-netmodes/files/etc/netmodes/repeater/network

@@ -0,0 +1,24 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'wan'
+	option type 'bridge'
+	option proto 'dhcp'
+	option vendorid 'Inteno_Repeater_$MAC4'
+	option hostname 'Inteno_Repeater_$MAC4'
+	option ifname '$WAN.1'
+	option reqopts '43'
+
+config interface 'lan'
+	option is_lan '1'
+	option type 'bridge'
+	option proto 'static'
+	option ifname '$LAN1 $LAN2 $LAN3 $LAN4'
+	option ipaddr '192.168.11.1'
+	option netmask '255.255.255.0'
+

inteno-netmodes/files/etc/netmodes/repeater/uhttpd

@@ -0,0 +1,33 @@
+config uhttpd 'main'
+	list listen_http '0.0.0.0:80'
+	list listen_http '[::]:80'
+	list listen_http '0.0.0.0:8080'
+	list listen_http '[::]:8080'
+	list listen_http '0.0.0.0:8181'
+	list listen_http '[::]:8181'
+	list listen_https '0.0.0.0:443'
+	list listen_https '[::]:443'
+	option redirect_https '1'
+	option home '/www'
+	option rfc1918_filter '1'
+	option max_requests '3'
+	option max_connections '100'
+	option cert '/etc/uhttpd.crt'
+	option key '/etc/uhttpd.key'
+	option cgi_prefix '/cgi-bin'
+	option script_timeout '60'
+	option network_timeout '30'
+	option http_keepalive '20'
+	option tcp_keepalive '1'
+	option ubus_prefix '/ubus'
+
+config cert 'px5g'
+	option days '730'
+	option bits '1024'
+	option country 'ZZ'
+	option state 'Somewhere'
+	option location 'Uknown'
+	option commonname 'OpenWrt'
+
+config logopts 'logopts'
+

inteno-netmodes/files/etc/netmodes/repeater/wireless

@@ -0,0 +1,101 @@
+config wifi-status 'status'
+	option wlan '1'
+	option wps '1'
+	option sched_status '0'
+	option schedule '0'
+
+config wifi-device 'wl0'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'a'
+	option bandwidth '20'
+	option hwmode '11ac'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '0'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option beamforming '0'
+	option doth '1'
+	option dfsc '1'
+
+config wifi-iface
+	option device 'wl0'
+	option network 'wan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+	option autoconf '1'
+
+config wifi-device 'wl1'
+	option type 'broadcom'
+	option country 'EU/13'
+	option band 'b'
+	option bandwidth '20'
+	option hwmode 'auto'
+	option channel 'auto'
+	option scantimer '15'
+	option wmm '1'
+	option wmm_noack '0'
+	option wmm_apsd '0'
+	option txpower '100'
+	option rateset 'default'
+	option frag '2346'
+	option rts '2347'
+	option dtim_period '1'
+	option beacon_int '100'
+	option rxchainps '0'
+	option rxchainps_qt '10'
+	option rxchainps_pps '10'
+	option rifs '0'
+	option rifs_advert '0'
+	option maxassoc '32'
+	option doth '0'
+	option apsta '1'
+
+config wifi-iface
+	option device 'wl1'
+	option ifname 'wl1'
+	option network 'wan'
+	option mode 'wet'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option wps_pbc '0'
+	option wmf_bss_enable '1'
+	option autoconf '1'
+
+config wifi-iface
+	option device 'wl1'
+	option network 'wan'
+	option mode 'ap'
+	option ssid 'Inteno-$BSSID4'
+	option encryption 'psk2'
+	option cipher 'auto'
+	option key '$WPAKEY'
+	option gtk_rekey '3600'
+	option macfilter '0'
+	option wps_pbc '1'
+	option wmf_bss_enable '1'
+	option bss_max '32'
+	option autoconf '1'
+

inteno-netmodes/files/etc/netmodes/routed/DETAILS

@@ -0,0 +1,12 @@
+{
+	"description": [
+		{ "en" : "Fully Routed (NAT)" },
+		{ "sv" : "Fullt Omdirigerad (NAT)" }
+	],
+	"explanation": [
+		{ "en" : "" },
+		{ "sv" : "" }
+	],
+	"credentials" : 0
+}
+

inteno-netmodes/files/etc/netmodes/routed/dhcp

@@ -0,0 +1,22 @@
+config dnsmasq
+	option domainneeded	1
+	option boguspriv	1
+	option filterwin2k	0
+	option localise_queries	1
+	option rebind_protection 0
+	option rebind_localhost 1
+	option local	'/lan/'
+	option domain	'lan'
+	option expandhosts	1
+	option nonegcache	0
+	option authoritative	1
+	option readethers	1
+	option leasefile	'/tmp/dhcp.leases'
+	option resolvfile	'/tmp/resolv.conf.auto'
+
+config dhcp lan
+	option interface	lan
+	option start 	100
+	option limit	150
+	option leasetime	12h
+

inteno-netmodes/files/etc/netmodes/routed/firewall

@@ -0,0 +1,153 @@
+config settings settings
+        option disabled 0
+
+config defaults
+	option syn_flood	1
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		REJECT
+# Uncomment this line to disable ipv6 rules
+#	option disable_ipv6	1
+
+config zone
+	option name		lan
+	list   network		'lan'
+	option input		ACCEPT
+	option output		ACCEPT
+	option forward		ACCEPT
+
+config zone
+	option name		wan
+	list   network		'wan'
+	list   network		'wan6'
+	option input		REJECT
+	option output		ACCEPT
+	option forward		REJECT
+	option masq		1
+	option mtu_fix		1
+
+config forwarding
+	option src		lan
+	option dest		wan
+
+# We need to accept udp packets on port 68,
+# see https://dev.openwrt.org/ticket/4108
+config rule
+	option name		Allow-DHCP-Renew
+	option src		wan
+	option proto		udp
+	option dest_port	68
+	option target		ACCEPT
+	option family		ipv4
+
+# Allow IPv4 ping
+config rule
+	option name		Allow-Ping
+	option src		wan
+	option proto		icmp
+	option icmp_type	echo-request
+	option family		ipv4
+	option target		ACCEPT
+
+config rule
+	option name		Allow-IGMP
+	option src		wan
+	option proto		igmp
+	option family		ipv4
+	option target		ACCEPT
+
+# Allow DHCPv6 replies
+# see https://dev.openwrt.org/ticket/10381
+config rule
+	option name		Allow-DHCPv6
+	option src		wan
+	option proto		udp
+	option src_ip		fe80::/10
+	option src_port		547
+	option dest_ip		fe80::/10
+	option dest_port	546
+	option family		ipv6
+	option target		ACCEPT
+
+config rule
+	option name		Allow-MLD
+	option src		wan
+	option proto		icmp
+	option src_ip		fe80::/10
+	list icmp_type		'130/0'
+	list icmp_type		'131/0'
+	list icmp_type		'132/0'
+	list icmp_type		'143/0'
+	option family		ipv6
+	option target		ACCEPT
+
+# Allow essential incoming IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Input
+	option src		wan
+	option proto	icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	list icmp_type		router-solicitation
+	list icmp_type		neighbour-solicitation
+	list icmp_type		router-advertisement
+	list icmp_type		neighbour-advertisement
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+
+# Allow essential forwarded IPv6 ICMP traffic
+config rule
+	option name		Allow-ICMPv6-Forward
+	option src		wan
+	option dest		*
+	option proto		icmp
+	list icmp_type		echo-request
+	list icmp_type		echo-reply
+	list icmp_type		destination-unreachable
+	list icmp_type		packet-too-big
+	list icmp_type		time-exceeded
+	list icmp_type		bad-header
+	list icmp_type		unknown-header-type
+	option limit		1000/sec
+	option family		ipv6
+	option target		ACCEPT
+
+# allow IPsec/ESP and ISAKMP passthrough
+config rule
+	option src		wan
+	option dest		lan
+	option proto		esp
+	option target		ACCEPT
+
+config rule
+	option src		wan
+	option dest		lan
+	option dest_port	500
+	option proto		udp
+	option target		ACCEPT
+
+config dmz dmz
+	option enabled '0'
+	option exclude_ports '5060 7547'
+
+# include a file with users custom iptables rules
+config include
+	option path /etc/firewall.user
+	option reload 1
+
+# include a file with rules for prioritizing some specific packets
+config include
+	option path /etc/firewall.qos
+	option reload 1
+
+# include a file with rules for DMZ Host
+config include dmzhost
+	option path /etc/firewall.dmz
+	option reload 1
+

inteno-netmodes/files/etc/netmodes/routed/layer2_interface_adsl

@@ -0,0 +1,13 @@
+
+config atm_bridge
+        option link_type 'EoA'
+        option encapseoa 'llcsnap_eth'
+        option unit '0'
+        option ifname 'atm0.1'
+        option baseifname 'atm0'
+        option atmtype 'ubr'
+        option name 'atm_inet'
+        option vpi '8'
+        option vci '35'
+
+

inteno-netmodes/files/etc/netmodes/routed/layer2_interface_ethernet

@@ -0,0 +1,5 @@
+config ethernet_interface 'Wan'
+        option baseifname '$WAN'
+        option ifname '$WAN.1'
+        option name 'WAN'
+

inteno-netmodes/files/etc/netmodes/routed/layer2_interface_vdsl

@@ -0,0 +1,9 @@
+config vdsl_interface
+	option unit '0'
+	option ifname 'ptm0.1'
+	option baseifname 'ptm0'
+	option name 'VDSL2'
+	option dslat '1'
+	option ptmprio '1'
+	option ipqos '1'
+

inteno-netmodes/files/etc/netmodes/routed/mcpd

@@ -0,0 +1,14 @@
+config mcpd 'mcpd'
+	option igmp_proxy_interfaces 'wan'
+	option igmp_default_version '2'
+	option igmp_query_interval '125'
+	option igmp_query_response_interval '100'
+	option igmp_last_member_query_interval '10'
+	option igmp_robustness_value '2'
+	option igmp_max_groups '25'
+	option igmp_max_sources '10'
+	option igmp_max_members '25'
+	option igmp_fast_leave '1'
+	option igmp_proxy_enable '1'
+	option igmp_snooping_enable '2'
+	option igmp_snooping_interfaces 'br-lan'

inteno-netmodes/files/etc/netmodes/routed/network

@@ -0,0 +1,29 @@
+
+config interface 'loopback'
+	option is_lan '1'
+	option ifname 'lo'
+	option proto 'static'
+	option ipaddr '127.0.0.1'
+	option netmask '255.0.0.0'
+
+config interface 'lan'
+	option is_lan '1'
+	option type 'bridge'
+	option proto 'static'
+	option ipaddr '192.168.1.1'
+	option netmask '255.255.255.0'
+	option ifname '$LAN1 $LAN2 $LAN3 $LAN4'
+	option ip6assign '60'
+	
+config interface 'wan'
+	option type 'anywan'
+	option proto 'dhcp'
+	option vendorid '$HARDWAREID-INTENO'
+	option hostname 'Inteno_$MAC4'
+	option ifname 'ptm0.1 atm0.1 $WAN.1'
+	option ipv6 '1'
+
+config interface 'wan6'
+	option proto 'dhcpv6'
+	option ifname '@wan'
+

iop/configs/config

@@ -12,6 +12,7 @@ CONFIG_PACKAGE_alsa-lib=y
 CONFIG_PACKAGE_bind-host=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
+CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_crashlog=y
 CONFIG_PACKAGE_ddns-scripts=y
@@ -32,6 +33,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_inteno-netmodes=y
 CONFIG_PACKAGE_iperf-mt=y
 CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_iptables=y

layer2interface/broadcom/etc/init.d/layer2_interface_adsl

@@ -101,7 +101,8 @@ atm_inf_conf() {
 		ret="$?"
 		xtmctl operate conn --add 1.$vpi.$vci aal5 $encaps 0 1 $ret
 		xtmctl operate conn --addq 1.$vpi.$vci 0 wrr 1 # low  priority queue
-		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue
+		xtmctl operate conn --addq 1.$vpi.$vci 1 wrr 1 # mid  priority queue upstream ACK's and ping from LAN will use this queue
+		xtmctl operate conn --addq 1.$vpi.$vci 7 wrr 1 # high priority queue, internal traffic dhcp igmp dns and icmp
 		xtmctl operate conn --createnetdev 1.$vpi.$vci ${ifname%%.*}
 		xtmctl operate intf --state 1 enable
 		

libstrophe/Config.in

@@ -0,0 +1,14 @@
+choice
+	depends on PACKAGE_libstrophe
+	prompt "Select XML library"
+	default libstrophe-expat
+
+config libstrophe-expat
+	bool "expat"
+	select PACKAGE_libexpat
+
+config libstrophe-libxml2
+	bool "libxml2"
+	select PACKAGE_libxml2
+
+endchoice

libstrophe/Makefile

@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2015 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:=libstrophe
+PKG_VERSION:=0.8.8
+PKG_RELEASE=1
+
+PKG_SOURCE_URL:=https://github.com/strophe/libstrophe/archive/
+PKG_SOURCE:=$(PKG_VERSION).tar.gz
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_libstrophe-libxml2 \
+	CONFIG_libstrophe-expat
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_libstrophe-libxml2),y)
+CONFIGURE_ARGS += \
+	--with-libxml2
+endif
+
+define Package/libstrophe
+	SECTION:=libs
+	CATEGORY:=Libraries
+	TITLE:=XMPP client library
+	URL:=http://strophe.im/libstrophe
+	DEPENDS:= +libopenssl +libstrophe-libxml2:libxml2 +libstrophe-expat:libexpat
+	MENU:=1
+endef
+
+define Package/libstrophe/description
+	A simple, lightweight C library for writing XMPP clients
+endef
+
+define Package/libstrophe/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/
+
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libstrophe.{la,a,so*} $(1)/usr/lib/
+endef
+
+define Package/libstrophe/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libstrophe.so.* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libstrophe))

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.0
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=2a16b98543580d376d5862a34415f24d8be15b27
+PKG_SOURCE_VERSION:=71c89213516c735b6c12d0e8c17a5bd75333421c
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se/peripheral_manager
 

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=3.1.7
+PKG_VERSION:=3.1.8
 
-PKG_SOURCE_VERSION:=6ad4d1ec64e17889ef5be674329234f948137837
+PKG_SOURCE_VERSION:=4466c00f581968c4b2299d2464ffe283d906b758
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=http://public.inteno.se:/questd
 

uci-diff/Makefile

@@ -0,0 +1,37 @@
+#
+# Copyright (C) 2016 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=uci-diff
+PKG_VERSION:=1.0
+
+PKG_SOURCE_VERSION:=2fbd9ca65e0f670dcf34a5dd17a0fd1fde6bf54c
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@private.inteno.se:/uci-diff
+
+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/uci-diff
+	CATEGORY:=Utilities
+	DEPENDS:=+libc +libuci +libubox +ubus +libjson-c +libblobmsg-json
+	TITLE:=uci-diff
+endef
+
+define Package/uci-diff/description
+	uci-diff
+endef
+
+define Package/uci-diff/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-diff $(1)/bin/
+endef
+
+$(eval $(call BuildPackage,uci-diff))

uci-diff/files/etc/uci-diff/default/wireless

@@ -0,0 +1,43 @@
+{"wireless": {
+    "wifi-device": {
+        "type": "broadcom",
+        "country": "EU/13",
+        "band": "a",
+        "bandwidth": "80",
+        "hwmode": "11ac",
+        "channel": "auto",
+        "scantimer": "0",
+        "wmm": "1",
+        "wmm_noack": "0",
+        "wmm_apsd": "1",
+        "txpower": "100",
+        "rateset": "default",
+        "frag": "2346",
+        "rts": "2347",
+        "dtim_period": "1",
+        "beacon_int": "100",
+        "rxchainps": "0",
+        "rxchainps_qt": "10",
+        "rxchainps_pps": "10",
+        "rifs": "0",
+        "rifs_advert": "0",
+        "maxassoc": "32",
+        "doth": "1",
+        "dfsc": "1",
+        "disabled": "1"
+    },
+    "wifi-iface": {
+        "device": "wl0",
+        "network": "lan",
+        "mode": "ap",
+        "ssid": "Inteno-4BC8",
+        "encryption": "mixed-psk",
+        "cipher": "auto",
+        "key": "1234567890",
+        "gtk_rekey": "3600",
+        "macfilter": "0",
+        "wps_pbc": "1",
+        "wmf_bss_enable": "1",
+        "bss_max": "16"
+    }
+}}

uci-diff/files/etc/uci-diff/inteno/wireless

@@ -0,0 +1,22 @@
+{"wireless": {
+    "wl0": {
+        ".name": "wl0",
+        ".type": "wifi-device",
+        "channel": 100
+    },
+    "wl1": {
+        ".name": "wl1",
+        ".type": "wifi-device",
+        "wmm": 0
+    },
+    "wi0-0": {
+        ".type": "wifi-iface",
+        "device": "wi0-0",
+        "ssid": "Fredrik"
+    },
+    "wi1-0": {
+        ".type": "wifi-iface",
+        "device": "wi1-0",
+        "ssid": "blah"
+    }
+}}

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

@@ -2213,6 +2213,11 @@ start_service() {
 
 reload_service() {
 	start
+
+	# turn off voice led; asterisk will turn it on
+	# if there is a registered account
+	ubus call led.voice1 set '{"state":"off"}'
+
 	asterisk -rx "core reload"
 	asterisk -rx "dialplan reload"
 	asterisk -rx "brcm reload"