Merge remote-tracking branch 'origin/release-4.2'

wifilife: update pkg hash to include arp flush and stale entry refactor
icwmp: Add Wifi Life parameters
2025-12-26 12:03:44 +08:00 · 2019-05-04 10:34:27 +02:00 · 2019-04-26 13:14:43 +02:00 · 2019-04-25 13:57:34 +01:00 · 2019-04-25 11:43:57 +02:00 · 2019-04-12 19:24:46 +02:00
8 changed files with 11 additions and 24 deletions
--- a/catv/files/etc/config/catv
+++ b/catv/files/etc/config/catv
@@ -1,4 +1,4 @@

 config service 'catv'
-        option enable 'no'
+        option enable '0'
        option filter '3'
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=4.0-2019-04-01
+PKG_VERSION:=4.0-2019-04-25
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7faa875dcb825869c6bd942e140d2200e5e0dc0e
+PKG_SOURCE_VERSION:=cd777bbd2dbe7477ec7665f12d3d20e6b2e9e052
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--- a/icwmp/README
+++ b/icwmp/README
@@ -9,7 +9,7 @@
 	- libz.so
 	- libcrypto.so
 	the librairies should be present in the "staging_dir/target-i386_uClibc-0.9.30.1/usr/lib/"  or "staging_dir/toolchain-mips_gcc-4.3.3+cs_uClibc-0.9.30.1/usr/lib"
-
+	
 	header files and folders:
 	- expat.h
 	- expat_external.h
@@ -33,7 +33,7 @@ this software is composed of 3 packages:
 - cwmp kernel package: contains cwmp kernel module. This module could be used by other kernel modules to notify the icwmpd daemon  when kernel parameter changes

 The three packages should be selected in the make menu config in order to get the three packages compiled.
-To compile the three packages: $ make package/cwmpd/compile
+To compile the three packages: $ make package/cwmpd/compile 

 3) OpenWRT settings
 in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script file:
@@ -49,7 +49,7 @@ in the  OpenWRT, Add the following lines in the /usr/share/udhcpc/default.script
 	- libopenssl package should be installed
 	- libz package should be installed
 	- libcrypto package should be installed
-
+    
    Configure the acs url in the /etc/config/icwmp
    and then start the cwmpd service: /etc/init.d/icwmpd start
    for the help: /etc/init.d/icwmpd
--- a/imonitor/Makefile
+++ b/imonitor/Makefile
@@ -12,7 +12,7 @@ PKG_INSTALL:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/imonitor.git
-PKG_SOURCE_VERSION:=cea60630cfac1d3c70f486acea6663d339b7d444
+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>
--- a/iop/config
+++ b/iop/config
@@ -155,7 +155,7 @@ CONFIG_PACKAGE_wifimngr=y
 CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_zoneinfo-core=y
 CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="INT"
+CONFIG_TARGET_CUSTOMER="IOPSYS"
 CONFIG_TARGET_ROOTFS_TARGZ=y
 # CONFIG_USE_SSTRIP is not set
 CONFIG_USE_STRIP=y
--- a/iop/scripts/auto_feeds_conf.sh
+++ b/iop/scripts/auto_feeds_conf.sh
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-declare -a feed_list
-function list_feeds {
-    jq '.feed[] | .name' feeds.conf
-}
-
-# Exported interface
-function auto_feeds_conf {
-    echo "Function auto feeds conf"
-    echo "feed list:"
-    list_feeds
-}
-
-register_command "auto_feeds_conf" "Automatically update feeds"
--- a/wifilife/Makefile
+++ b/wifilife/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=wifilife
 PKG_VERSION:=1.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9a75b717d3cd95d88e394f5bcd8b4006dfa450ba
+PKG_SOURCE_VERSION:=6971890314a06200f60d4c949d9b9654029b9fc3
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 ifeq ($(CONFIG_WIFILIFE_OPEN),y)
--- a/wifilife/files/wifilife.init
+++ b/wifilife/files/wifilife.init
@@ -9,6 +9,8 @@ EXTRA_COMMANDS="enable_check"


 start_service() {
+	[ "$(uci -q get wifilife.@wifilife[0].enabled)" == "0" ] && return
+
 	procd_open_instance
 	procd_set_param command ${PROG} -d -l -f -o /tmp/wifiagent.log
 	procd_set_param respawn
Author	SHA1	Message	Date
Sukru Senli	1b9f020d20	Merge remote-tracking branch 'origin/release-4.2'	2019-05-04 10:34:27 +02:00
Jakob Olsson	7a5da766a2	wifilife: update pkg hash to include arp flush and stale entry refactor	2019-04-26 13:14:43 +02:00
Amin Ben Ramdhane	ff98b7dc3a	icwmp: Add Wifi Life parameters	2019-04-25 13:57:34 +01:00
Sukru Senli	b52f24d6df	wifilife: do not start wifiagent if wifilife is disabled	2019-04-25 11:43:57 +02:00
Sukru Senli	582ec662bb	iop: default customer iopsys	2019-04-12 19:24:46 +02:00
Sukru Senli	ec37110043	Merge remote-tracking branch 'origin/release-4.2'	2019-04-03 09:04:25 +02:00
Sukru Senli	e8cf33b544	Merge remote-tracking branch 'origin/devel'	2017-12-27 12:07:48 +01:00
Sukru Senli	fb983f5dbc	questd: imonitor: bring down and up the wireless radios when bsd or acsd crashes	2017-12-22 15:21:30 +01:00
Sukru Senli	676e40a0cc	voice-client depend on asterisk13 or asterisk18-mod	2017-12-22 14:28:38 +01:00
Sukru Senli	215274ef98	tptest: remove tptest.bredband.net from list	2017-12-20 19:20:49 +01:00
Erik Horemans	02ca863b23	new ice-client 5.0.1-RC1	2017-12-20 13:53:51 +01:00
Reidar Cederqvist	6f86f000b1	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * b279429 fix empty client list on wl1 when wl0 is disabled ref #13485 * 1c47a44 change strndup to strdup to avoid warnings ------------------------------------------------------------------------------- commit b2794295fdf9469b6cd8ba1544f291d4b83a7d5a Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-15 11:33:13 +0100 fix empty client list on wl1 when wl0 is disabled ref #13485 Base directory -> / network.c \| 5 +++-- port.c \| 17 +++++++++++++++++ port.h \| 1 + 3 files changed, 21 insertions(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 1c47a44bfcb863319282900446bf20965c9eccbc Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-15 11:24:01 +0100 change strndup to strdup to avoid warnings Base directory -> / port.c \| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -------------------------------------------------------------------------------	2017-12-15 11:34:14 +01:00
Sukru Senli	8506eed1e4	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 4bbcb4d network: handle rssi for repeated arp clients ------------------------------------------------------------------------------- commit 4bbcb4d2f8c901c18cdf4456e65497975e03fada Author: Sukru Senli <sukru.senli@inteno.se> Date: 2017-12-13 17:39:02 +0100 network: handle rssi for repeated arp clients Base directory -> / network.c \| 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) -------------------------------------------------------------------------------	2017-12-13 17:40:02 +01:00
Sukru Senli	53b3f486bd	questd: imonitor: do not restart quest if lan ifname is missing or is bridge	2017-12-13 13:38:22 +01:00
Sukru Senli	e31e5f32da	questd-3.1.40	2017-12-13 13:11:50 +01:00
Reidar Cederqvist	26c2dae0c9	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * b4b9988 questd: improve parsing * 9e98e21 questd: get nvram Hardware Version value * 875d5fe fix c99 warning * 2711c6b questd: print rssi value from extender * f62075b questd: get rssi value from extender * cd39df6 add missing close for ioctl socket ------------------------------------------------------------------------------- commit b4b99885bea425f552e8a844ff2f15e2d4672c65 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 17:12:37 +0100 questd: improve parsing Base directory -> / dumper.c \| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 9e98e21a84347b3d77a5ae44fb2fc783c7bb77dd Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 16:27:27 +0100 questd: get nvram Hardware Version value Base directory -> / dumper.c \| 20 ++++++++++++++++++++ system.c \| 5 +++++ system.h \| 1 + 3 files changed, 26 insertions(+) ------------------------------------------------------------------------------- commit 875d5fe069d178ecb1b4b9bca78aba90691afc12 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-30 16:13:31 +0100 fix c99 warning Base directory -> / wificontrol.c \| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 2711c6b34357ea25abe08d43612347f6e0c4b5b2 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:37:56 +0100 questd: print rssi value from extender Base directory -> / network.c \| 30 +++++++++++++++++++----------- network.h \| 7 ++++++- 2 files changed, 25 insertions(+), 12 deletions(-) ------------------------------------------------------------------------------- commit f62075bd509755052e6006db9e901476145500db Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:35:06 +0100 questd: get rssi value from extender Base directory -> / Makefile \| 2 +- wificontrol.c \| 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) ------------------------------------------------------------------------------- commit cd39df609dcb7f824f50d4d544ac5247bcd85b3f Author: Reidar Cederqvist <reidar.cederqvist@gmail.com> Date: 2017-12-04 12:47:24 +0100 add missing close for ioctl socket Base directory -> / network.c \| 1 + 1 file changed, 1 insertion(+) -------------------------------------------------------------------------------	2017-12-07 15:48:04 +01:00
Erik Horemans	2f2d88f770	new ice-client ice-client 5.0.1-RC0	2017-12-05 16:34:25 +01:00
Ionut-Alex Oprea	540b09e26b	imonitor: increase questd memory limit to 20MB refs #13511	2017-12-05 14:24:40 +01:00
Robin Stjerndorff	001c25ee12	Update feed [ feed_inteno_packages ] package [ questd ] ------------------------------------------------------------------------------- * 16cb4dd questd: improve parsing * 312ca10 questd: get nvram Hardware Version value * 824c247 fix c99 warning * 83a7011 questd: print rssi value from extender * b554abd questd: get rssi value from extender ------------------------------------------------------------------------------- commit 16cb4dda3909efef54b84d44fa11dc28f9763c8c Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 17:12:37 +0100 questd: improve parsing Base directory -> / dumper.c \| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ------------------------------------------------------------------------------- commit 312ca10075347ea1ca4d4a051d079ff5643a934e Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-12-04 16:27:27 +0100 questd: get nvram Hardware Version value Base directory -> / dumper.c \| 20 ++++++++++++++++++++ system.c \| 5 +++++ system.h \| 1 + 3 files changed, 26 insertions(+) ------------------------------------------------------------------------------- commit 824c24781123b0cc83216486732e5a03823ec5ed Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-30 16:13:31 +0100 fix c99 warning Base directory -> / wificontrol.c \| 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ------------------------------------------------------------------------------- commit 83a7011877b6a7b1dcbcfd925037ffd77de5165f Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:37:56 +0100 questd: print rssi value from extender Base directory -> / network.c \| 30 +++++++++++++++++++----------- network.h \| 7 ++++++- 2 files changed, 25 insertions(+), 12 deletions(-) ------------------------------------------------------------------------------- commit b554abd3fa7e0898095bfb575803081f716d3723 Author: Robin Stjerndorff <robin.stjerndorff@inteno.se> Date: 2017-11-23 15:35:06 +0100 questd: get rssi value from extender Base directory -> / Makefile \| 2 +- wificontrol.c \| 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 71 insertions(+), 5 deletions(-) -------------------------------------------------------------------------------	2017-12-04 17:27:22 +01:00
Reidar Cederqvist	1193886cef	changed the default value for enable in catv from 'no' to '0' both the new and old value work with the current inti.d script	2016-08-31 14:20:38 +02:00
Reidar Cederqvist	cebc3f53e5	updated the init.d script for catv so it gets a bool for enable from config and sends "on/off" to ubus call catv set-enable	2016-08-31 14:16:36 +02:00