Compare commits

...

27 Commits

Author SHA1 Message Date
Sukru Senli
0a3a24887a inteno-netmodes: testnet: fix typo 2018-03-27 09:53:11 +02:00
Sukru Senli
bda0cf272d inteno-netmodes: testnet: direct operstate check error to devnull 2018-03-26 14:49:02 +02:00
Sukru Senli
ca5def7858 inteno-netmodes: testnet: disable access to wireless only if uplink is wifi wan refs #14531 2018-03-26 14:48:54 +02:00
Sukru Senli
5c2254aecf voice-client: show only the calls with account info in the call log refs #14164 2018-03-26 14:48:33 +02:00
Ke Hu
7664fde351 fix public lib
change from git to http
2018-03-26 14:48:10 +02:00
Sukru Senli
2196e73ed0 inteno-netmodes: adapt netmodes configs to new vlan and dsl config way 2018-03-26 14:48:00 +02:00
Sukru Senli
97489b4486 icwmp: add uci-defaults script to set reqopts 2018-03-26 14:47:44 +02:00
Sukru Senli
de6b8769b3 iup: add uci-default script to set reqopts 2018-03-26 14:47:31 +02:00
Ronny Nilsson
f4724c3752 voice-client: Revert part of 6694e1975b
where I removed a bit to much.
2018-03-26 14:47:03 +02:00
Ronny Nilsson
35d027315f voice-client: Reduce default set of codecs for SIP
peers. We try to have ALAW only everywhere due to
previously there has been unnecessary transcodings
in several places.
2018-03-26 14:46:50 +02:00
Sukru Senli
a033f7d156 icwmp: reload icwmp when DNS servers are changed as well 2018-03-26 14:46:08 +02:00
Kenneth Johansson
eff9168d56 generate_tarballs: mediatek linux dir has changed name.
It is only linux-iopsys-ramips now.
2018-03-26 14:45:44 +02:00
Sukru Senli
984ab428e8 inteno-netmodes: limit bridged mode from sdx810-ap 2018-03-26 14:45:30 +02:00
Ronny Nilsson
f228e6c33d voice_client: re-enable comment away settings Asterisk no longer need.
It should work now.
This reverts commit b15782bd07.
2018-03-26 14:45:20 +02:00
Ke Hu
1d31e5146c add config.in file
endptmng needs open options
2018-03-26 14:43:57 +02:00
Ke Hu
3ebe50cdcd upload name issue
kernel name is 502030, but config define is 502003
different name.
2018-03-26 14:43:44 +02:00
Erik Horemans
ae536baf4f new ice-client 5.0.2-RC15 2018-03-26 14:43:24 +02:00
Kent Ekholm
5f6909df27 Revert "Comment away settings Asterisk no more need. The Endptmngr program"
This reverts commit 460e72f094.

This commit made incoming calls not work beacause no codecs was configured.
2018-03-26 14:42:55 +02:00
Ionut-Alex Oprea
8b0ba2d99a inteno-netmodes: flush network cache before getting the ip 2018-03-26 14:42:37 +02:00
Ronny Nilsson
4198997de3 voice_client: remove unused code 2018-03-26 14:42:16 +02:00
Ronny Nilsson
62156b99ea voice_client: for Asterisk v13 in combination with endptmngr we try
to limit excessive voice transcoding. We use ALAW everywhere internally
and transcode only if it really is necessary.
2018-03-26 14:42:08 +02:00
Sukru Senli
1273c0babc inteno-netmodes: fix netmode-discover checking for wifi script running 2018-03-26 14:41:40 +02:00
Sukru Senli
e34a521387 inteno-netmodes: exclude SDX810-AP board from routed_brcm 2018-03-26 14:41:37 +02:00
Ionut-Alex Oprea
1b696b7f11 inteno-netmodes: netmode-discover: prevent busy waiting 2018-03-26 14:41:12 +02:00
Benjamin Larsson
8ee2414777 Update feed [ feed_inteno_packages ] package [ questd ]
-------------------------------------------------------------------------------
* bc42507 router.wireless: allow getting assoclist for a specific vif
* 540e9cb do not arping arponly clients fixes #14416
* f642d10 wireless: mediatek: enumerate only AP mode interfaces in load_wireless
-------------------------------------------------------------------------------
commit bc42507b2530185bb6650c56c02acd6d5e271a15
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-17 10:26:33 +0100

    router.wireless: allow getting assoclist for a specific vif

Base directory -> /
 wireless.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 540e9cbd658a88b763462496fa86c0c464f1dbfc
Author: Sukru Senli <sukru.senli@inteno.se>
Date: 2018-03-12 16:08:27 +0100

    do not arping arponly clients fixes #14416

Base directory -> /
 network.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit f642d104fe5ea0403d9e679a44a2ff4aff6d9cfa
Author: Anjan Chanda <anjan.chanda@inteno.se>
Date: 2018-03-05 13:59:01 +0100

    wireless: mediatek: enumerate only AP mode interfaces in load_wireless

Base directory -> /
 wireless.c | 3 +++
 1 file changed, 3 insertions(+)
-------------------------------------------------------------------------------
2018-03-26 14:37:00 +02:00
Benjamin Larsson
3f612c793f Update feed [ feed_inteno_packages ] package [ icwmp ]
-------------------------------------------------------------------------------
* dc02548 Ticket refs #13818: Not able to Upgrade/downgrade RG using TR069 . Required/Steps for Upgrade procedure
* 0b1c4df Ticket refs #14185: TR069 reboot not working
-------------------------------------------------------------------------------
commit dc025485291cad748addb4b90403b298efb95fab
Author: Omar Kallel <omar.kallel@pivasoftware.com>
Date: 2018-03-01 11:37:55 +0100

    Ticket refs #13818: Not able to Upgrade/downgrade RG using TR069 .
    Required/Steps for Upgrade procedure

Base directory -> /
 xml.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 0b1c4df5fb969289c1af6dc578d3b3a6c9782167
Author: Omar Kallel <omar.kallel@pivasoftware.com>
Date: 2018-03-01 14:21:25 +0100

    Ticket refs #14185: TR069 reboot not working

Base directory -> /
 event.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
-------------------------------------------------------------------------------
2018-03-26 14:36:50 +02:00
Benjamin Larsson
517cc84ed5 Update feed [ feed_inteno_packages ] package [ endptmngr ]
-------------------------------------------------------------------------------
* e2733e1 Unify init error handling in main().
* 40f9dff Extend signals handling to catch more of them. Needed for procd reload to work.
* 075323d Re-enable of endptmngr automatic restart. The feature should work now.
* 049ab98 At startup it's no error if we can't lookup Asterisk address. It will be handled later.
* 02788f1 Variable renames for consentient naming.
* afdd8d5 Variable rename for consentient naming.
* 40b5bc1 Move variables to collect them in a nicer looking one place.
* ba83865 Move add and remove of our UBUS objects to separate functions to enable receive of messages once we are fully ready.
* 62ea918 Move closing down and freeing of all endpoint resources to a separed function, callable from several places.
* 67e408c Mark all endpoint states as not yet initialized on startup and use that later on when scanning for endpoints in use.
* a01aa5a Pass phone line number along with each audio packet.
* 9aa9950 Change debug printouts for lines to become similar to what Asterisk chan_brcm.c used.
* 1e48a90 Remove an unused compiler attribute.
* b8445e4 Regarding the RPC fifos with Asterisk; become independent of daemon startup order and Asterisk restart recovery by opening all fifos R/W.
* 010856f Better cleanup at exit
* aec7c3d Before closing the application we need to free all resources or the voip lib won't work next time we startup.
* a5867ab Helper for closing all active connections.
* 3394e42 Debug print of endpoint name
* 07e1b54 Need to check ending NULL of the string as well or "on1234" matched "on".
* 4d58f0c Fix inverted return code for setting signal tone.
* 5fb719b Line signaling didn't work before the first connection, such as the dialtone for offhook events.
-------------------------------------------------------------------------------
commit e2733e11e42e5014af7f4b6140aa0a3b6cbb6d10
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-13 15:17:44 +0100

    Unify init error handling in main().

Base directory -> /
 src/endpt.c | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)
-------------------------------------------------------------------------------
commit 40f9dffb608e146bb5d7e34bf84af665147ef79f
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-13 15:15:28 +0100

    Extend signals handling to catch more of them. Needed for procd reload to
    work.

Base directory -> /
 src/endpt.c | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit 075323d823f2d0b2c755ffbfa17c375a01214f23
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 17:20:49 +0100

    Re-enable of endptmngr automatic restart. The feature should work now.

    Revert "Revert "Restart the endptmngr daemon when UCI voice client
    settings"" This reverts commit 719be12028f018e0c1e145082b920e7aefc3c8fa.

Base directory -> /
 files/etc/init.d/endptmngr | 5 +++++
 1 file changed, 5 insertions(+)
-------------------------------------------------------------------------------
commit 049ab98df570596c02e34b0b5283c5a609bc9142
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 17:20:40 +0100

    At startup it's no error if we can't lookup Asterisk address. It will be
    handled later.

Base directory -> /
 src/ubus.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
-------------------------------------------------------------------------------
commit 02788f1cb602c45e1f380ca2d06bd18885aa3d71
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 14:57:06 +0100

    Variable renames for consentient naming.

Base directory -> /
 src/ubus.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
-------------------------------------------------------------------------------
commit afdd8d52f751ae19ebfcc093e661b42bf2e5f500
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 14:53:47 +0100

    Variable rename for consentient naming.

Base directory -> /
 src/ubus.c | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 85 insertions(+), 11 deletions(-)
-------------------------------------------------------------------------------
commit 40b5bc1823dd278ee9259bc2e57fa2490877e756
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 13:17:24 +0100

    Move variables to collect them in a nicer looking one place.

Base directory -> /
 src/ubus.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit ba8386553fc6f5c925ecfbcfce4b03d79369a879
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 13:14:42 +0100

    Move add and remove of our UBUS objects to separate functions to enable
    receive of messages once we are fully ready.

Base directory -> /
 src/endpt.c |  2 ++
 src/ubus.c  | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 src/ubus.h  |  2 ++
 3 files changed, 49 insertions(+), 6 deletions(-)
-------------------------------------------------------------------------------
commit 62ea9182dccd7849074f1aabd2f5adc492f778e7
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 13:09:57 +0100

    Move closing down and freeing of all endpoint resources to a separed
    function, callable from several places.

Base directory -> /
 src/endpt.c | 93 ++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 55 insertions(+), 38 deletions(-)
-------------------------------------------------------------------------------
commit 67e408c3ed2e85692ebc48d0bce43d5c59725086
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-12 13:05:21 +0100

    Mark all endpoint states as not yet initialized on startup and use that
    later on when scanning for endpoints in use.

Base directory -> /
 src/endpt.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
-------------------------------------------------------------------------------
commit a01aa5acec534058d19f4bec6163bbf28809c281
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-10 00:20:03 +0100

    Pass phone line number along with each audio packet.

Base directory -> /
 src/endpt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 9aa9950930867cd135e9ef3fbfdea7d9e29ce6c7
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-09 23:18:32 +0100

    Change debug printouts for lines to become similar to what Asterisk
    chan_brcm.c used.

Base directory -> /
 src/endpt.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 1e48a90aaaeadf395054800a67d39dafc9d1d696
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-09 23:17:38 +0100

    Remove an unused compiler attribute.

Base directory -> /
 src/endpt.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit b8445e49d78cf04b0ba96af4680684671b3a47f1
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-09 23:17:00 +0100

    Regarding the RPC fifos with Asterisk; become independent of daemon startup
    order and Asterisk restart recovery by opening all fifos R/W.

Base directory -> /
 src/endpt.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)
-------------------------------------------------------------------------------
commit 010856fcfbd9196a93b6b244f7f907ec4897f8ac
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-09 19:51:46 +0100

    Better cleanup at exit

Base directory -> /
 src/endpt.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
-------------------------------------------------------------------------------
commit aec7c3d5968c118c702619803a3393e58520f7aa
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-09 14:48:11 +0100

    Before closing the application we need to free all resources or the voip lib
    won't work next time we startup.

Base directory -> /
 src/endpt.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 47 insertions(+), 12 deletions(-)
-------------------------------------------------------------------------------
commit a5867ab823ef6b7069c106fbbb7046d8dc3159ca
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-09 14:46:44 +0100

    Helper for closing all active connections.

Base directory -> /
 src/endpt.c | 19 +++++++++++++++++++
 src/endpt.h |  1 +
 2 files changed, 20 insertions(+)
-------------------------------------------------------------------------------
commit 3394e42a19cec4e77508227a38fbe51067f833a2
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-06 18:28:11 +0100

    Debug print of endpoint name

Base directory -> /
 src/endpt.c | 2 +-
 src/endpt.h | 3 ++-
 src/ubus.c  | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 07e1b54f4de1c715474c30b531782ba3e87d8cfc
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-05 16:38:02 +0100

    Need to check ending NULL of the string as well or "on1234" matched "on".

Base directory -> /
 src/ubus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 4d58f0cd79010c7a314ae019c4d0f86897aa8b2b
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-05 16:36:06 +0100

    Fix inverted return code for setting signal tone.

Base directory -> /
 src/ubus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
-------------------------------------------------------------------------------
commit 5fb719b5d4e52666385b875de3b2f47cef9c3d74
Author: Ronny Nilsson <ronny.nilsson@inteno.se>
Date: 2018-03-05 16:33:24 +0100

    Line signaling didn't work before the first connection, such as the dialtone
    for offhook events.

Base directory -> /
 src/endpt.c | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)
-------------------------------------------------------------------------------
2018-03-26 11:52:46 +02:00
37 changed files with 257 additions and 91 deletions

4
endptmngr/Config.in Executable file
View File

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

View File

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
PKG_VERSION:=0.1
PKG_SOURCE_URL:=git@private.inteno.se:endptmngr
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=e0e81b824ea1ab4ef7743e47ca3fd0747494df68
PKG_SOURCE_VERSION:=e2733e11e42e5014af7f4b6140aa0a3b6cbb6d10
PKG_NAME:=endptmngr
RSTRIP:=true

View File

@@ -20,13 +20,13 @@ 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.2
PKG_RELEASE:=RC5
PKG_RELEASE:=RC15
PKG_VERSION:=$(BASE_PKG_VERSION)-$(PKG_RELEASE)_$(DATE)_$(LOGIN)
export PKG_VERSION
###########################--RELEASE--################################
PKG_SOURCE_VERSION:=ccde96046faa55c6a904cb6fe9d7e7789d9fa767
PKG_SOURCE_VERSION:=9976efee33243e044b89e74b3c05429aeb777038
ifeq ($(CONFIG_ICE_OPEN),y)
TARGET_PROFILE=$(shell echo $(CONFIG_TARGET_BOARD) | sed s/\"//g)
PKG_SOURCE_URL:=http://iopsys.inteno.se/iopsys/consumer/

View File

@@ -12,7 +12,7 @@ PKG_VERSION:=4.0-2018-02-26
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=b45a55ebcf4b12f9bd2b8a30ad5e0a78077df327
PKG_SOURCE_VERSION:=dc025485291cad748addb4b90403b298efb95fab
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -162,8 +162,6 @@ define Package/icwmp-$(BUILD_VARIANT)/install
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_BIN) $(PKG_BUILD_DIR)/init/icwmpd.init $(1)/etc/init.d/icwmpd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/90-cwmpfirewall
$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
$(CP) ./files/icwmp.hotplug $(1)/etc/hotplug.d/iface/90-icwmp
ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
$(INSTALL_DIR) $(1)/usr/share/icwmp
$(CP) $(PKG_BUILD_DIR)/scripts/defaults $(1)/usr/share/icwmp
@@ -171,6 +169,7 @@ ifeq ($(CONFIG_CWMP_SCRIPTS_FULL),y)
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/icwmp.sh $(1)/usr/sbin/icwmp
endif
$(CP) ./files/* $(1)/
endef
define Build/InstallDev

View File

@@ -18,6 +18,8 @@ handle_icwmp_reload() {
mkdir -p /tmp/ipv4
network_flush_cache
local previpaddr=""
local curipaddr=""
local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
@@ -39,7 +41,14 @@ handle_icwmp_reload() {
network_get_subnets cursubnets $INTERFACE
[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
[ "$previpaddr" = "$curipaddr" -a "$prevgateway" = "$curgateway" -a "$prevsubnets" = "$cursubnets" ] && exit 0
local prevdnsservers=""
local curdnsservers=""
local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
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
/etc/init.d/icwmpd reload &
}

View File

@@ -0,0 +1,44 @@
#!/bin/sh
. /lib/functions.sh
set_cwmp_reqopts() {
### Ask for DHCP Option 43 only if CWMP is enabled ###
local wan=$(uci -q get cwmp.cpe.default_wan_interface)
local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
local discovery=0
case $dhcp_discovery in
enable|1) discovery=1 ;;
esac
local newreqopts=
local baseopts=
local reqopts="$(uci -q get network.$wan.reqopts)"
local proto="$(uci -q get network.$wan.proto)"
local tropts="43"
local oldreqopts="$reqopts"
local ropt iopt
for ropt in $reqopts; do
case $ropt in
43) ;;
*) baseopts="$baseopts $ropt" ;;
esac
done
ropt=""
reqopts="$baseopts $tropts"
for ropt in $reqopts; do
case $ropt in
43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
*) newreqopts="$newreqopts $ropt" ;;
esac
done
if [ "$proto" == "dhcp" ]; then
newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
[ "$newreqopts" == "$oldreqopts" ] && return
uci -q set network.$wan.reqopts="$newreqopts"
uci commit network
fi
}
set_cwmp_reqopts

View File

@@ -6,6 +6,7 @@
. /lib/functions/network.sh
. /lib/functions/netmode.sh
network_flush_cache
network_get_ipaddr ipaddr $INTERFACE
[ -z "$ipaddr" ] && exit

View File

@@ -12,7 +12,7 @@
"CG300",
"CG301",
"EX400",
"SDX*"
"SDX810-AP"
],
"acl" : [
"admin",

View File

@@ -28,10 +28,39 @@ config interface 'iptv'
option proto 'dhcp'
option gateway '0.0.0.0'
option reqopts 'staticroutes'
option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
option ifname 'ptm0.100 $WAN.100 $LAN4'
option defaultroute '0'
config interface 'wan6'
option proto 'dhcpv6'
option ifname '@wan'
config device 'atmwan'
option type 'untagged'
option ifname 'atm0'
option name 'atm0.1'
config device 'ptmwan'
option type 'untagged'
option ifname 'ptm0'
option name 'ptm0.1'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'
config device 'ethtv'
option type '8021q'
option name '$WAN.100'
option ifname '$WAN'
option vid '100'
option priority '0'
config device 'ptmtv'
option type '8021q'
option name 'ptm0.100'
option ifname 'ptm0'
option vid '100'
option priority '0'

View File

@@ -13,7 +13,7 @@
"CG301",
"EX400",
"F*",
"SDX*"
"SDX810-AP"
],
"acl" : [
"admin",

View File

@@ -28,7 +28,7 @@ config interface 'iptv'
option proto 'dhcp'
option gateway '0.0.0.0'
option reqopts 'staticroutes'
option ifname 'ptm0.100 atm1.1 $WAN.100 $LAN4'
option ifname 'ptm0.100 $WAN.100 $LAN4'
option defaultroute '0'
config interface 'voip'
@@ -36,10 +36,53 @@ config interface 'voip'
option proto 'dhcp'
option gateway '0.0.0.0'
option reqopts 'staticroutes'
option ifname 'ptm0.200 atm2.1 $WAN.200'
option ifname 'ptm0.200 $WAN.200'
option defaultroute '0'
config interface 'wan6'
option proto 'dhcpv6'
option ifname '@wan'
config device 'atmwan'
option type 'untagged'
option ifname 'atm0'
option name 'atm0.1'
config device 'ptmwan'
option type 'untagged'
option ifname 'ptm0'
option name 'ptm0.1'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'
config device 'ethtv'
option type '8021q'
option name '$WAN.100'
option ifname '$WAN'
option vid '100'
option priority '0'
config device 'ptmtv'
option type '8021q'
option name 'ptm0.100'
option ifname 'ptm0'
option vid '100'
option priority '0'
config device 'ethvoip'
option type '8021q'
option name '$WAN.200'
option ifname '$WAN'
option vid '200'
option priority '0'
config device 'ptmvoip'
option type '8021q'
option name 'ptm0.200'
option ifname 'ptm0'
option vid '200'
option priority '0'

View File

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

View File

@@ -13,3 +13,8 @@ config interface 'wan'
option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
option reqopts '43'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'

View File

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

View File

@@ -13,3 +13,8 @@ config interface 'wan'
option ifname '$WAN.1 $LAN1 $LAN2 $LAN3 $LAN4'
option reqopts '43'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'

View File

@@ -8,7 +8,8 @@
{ "sv" : "" }
],
"excluded_boards" : [
"EX4*"
"EX4*",
"SDX810-AP"
],
"credentials" : 0
}

View File

@@ -1,13 +0,0 @@
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'

View File

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

View File

@@ -1,9 +0,0 @@
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'

View File

@@ -27,3 +27,18 @@ config interface 'wan6'
option proto 'dhcpv6'
option ifname '@wan'
config device 'atmwan'
option type 'untagged'
option ifname 'atm0'
option name 'atm0.1'
config device 'ptmwan'
option type 'untagged'
option ifname 'ptm0'
option name 'ptm0.1'
config device 'ethwan'
option type 'untagged'
option ifname '$WAN'
option name '$WAN.1'

View File

@@ -21,11 +21,14 @@ mask_to_cidr() {
}
while true; do
[ -e /sys/class/net/br-wan ] || continue
[ -e /sys/class/net/br-wan ] || {
sleep 5
continue
}
unlisted=0
ps | grep -q wifi | grep -q reload || {
ps | grep wifi | grep -q reload || {
for mac in $(brctl showmacs br-wan 2>/dev/null | tail -n +2 | grep no | awk '{print$2}'); do
grep -q "$mac" /proc/net/arp || unlisted=$((unlisted+1))
done

View File

@@ -7,6 +7,7 @@ TVCON=0
WANIP=0
LASTSTATUS=""
CURSTATUS=""
ETHWAN="$(db -q get hw.board.ethernetWanPort)"
SLEEP_TIME=30
enableCounter=0
@@ -110,14 +111,16 @@ ping_uplink()
AccessPolicy=1
if [ -f /usr/sbin/iwpriv ]; then
# Do not allow clients to connect on 2.4GHz radio
iwpriv ra0 set AccessPolicy=$AccessPolicy
# Do not allow clients to connect on 5GHz radio
iwpriv rai0 set AccessPolicy=$AccessPolicy
# Disconnect clients on 2.4GHz radio
iwpriv ra0 set DisConnectAllSta=2
# Disconnect clients on 5GHz radio
iwpriv rai0 set DisConnectAllSta=2
grep -q up /sys/class/net/$ETHWAN/operstate 2>/dev/null || {
# Do not allow clients to connect on 2.4GHz radio
iwpriv ra0 set AccessPolicy=$AccessPolicy
# Do not allow clients to connect on 5GHz radio
iwpriv rai0 set AccessPolicy=$AccessPolicy
# Disconnect clients on 2.4GHz radio
iwpriv ra0 set DisConnectAllSta=2
# Disconnect clients on 5GHz radio
iwpriv rai0 set DisConnectAllSta=2
}
fi
else
echo "{ \"online\" : true }" > /tmp/internet_connection_status
@@ -160,11 +163,10 @@ test_connection() {
}
wan_have_ip() {
[ -d /sys/class/net/$port ] || return
[ -d /sys/class/net/$ETHWAN ] || return
ubus list led.wan >/dev/null 2>&1 || return
local port="$(db -q get hw.board.ethernetWanPort)"
local addr=$(ip a show dev $port | grep "inet "| awk '{print $2}')
local addr=$(ip a show dev $ETHWAN | grep "inet "| awk '{print $2}')
if [ -n "$addr" ]; then
WANIP=1

View File

@@ -4,7 +4,8 @@
build_bcmkernel_consumer() {
local tarfile bcmkernelcommith sdkversion
sdkversion=$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')
bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:4}*.mk | cut -d'=' -f2)
sdkversion=${sdkversion:0:4}${sdkversion:(-1)}
bcmkernelcommith=$(grep -w "PKG_SOURCE_VERSION:" $curdir/feeds/feed_inteno_broadcom/bcmkernel/${sdkversion:0:5}*.mk | cut -d'=' -f2)
# do not build bcmopen sdk if it was already built before
[ -n "$board" -a -n "$bcmkernelcommith" ] || return
ssh $SERVER "ls $FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz" && return
@@ -82,7 +83,7 @@ build_mediatek_kernel() {
ssh $SERVER "ls $FPATH/mediatek-kernel-open-$mediatek_commit.tar.gz" && return
echo "Building mediatek kernel tarball from kernel commit:"
echo $mediatek_commit
cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips_*/$kernel
cd build_dir/target-mipsel_1004kc*/linux-iopsys-ramips*/$kernel
# Save Kconfig files to recreate the same kernel config,
# delete everyting else.

View File

@@ -0,0 +1,57 @@
#!/bin/sh
. /lib/functions.sh
management_interfaces() {
local DHCP_IFACES=""
is_notbridged_dhcp() {
local config="$1"
local proto="$(uci -q get network.$config.proto)"
local typ="$(uci -q get network.$config.type)"
if [ "$proto" == "dhcp" -a "$typ" != "bridge" ]; then
DHCP_IFACES="$DHCP_IFACES $config"
fi
}
config_load network
config_foreach is_notbridged_dhcp interface
echo $DHCP_IFACES
}
set_iup_reqopts() {
### Ask for IUP related DHCP options only if IUP is enabled ###
new_reqopts() {
local net=$1
local enabled="$(uci -q get provisioning.iup.enabled)"
enabled="${enabled:-on}"
local newreqopts=
local baseopts=
local reqopts="$(uci -q get network.$net.reqopts)"
local iupopts="66 67 128 224 225 226"
local ropt iopt
local net
for ropt in $reqopts; do
case $ropt in
66|67|128|224|225|226) ;;
*) baseopts="$baseopts $ropt" ;;
esac
done
ropt=""
reqopts="$baseopts $iupopts"
for ropt in $reqopts; do
case $ropt in
66|67|128|224|225|226) [ $enabled == "on" ] && newreqopts="$newreqopts $ropt" ;;
*) newreqopts="$newreqopts $ropt" ;;
esac
done
newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
echo "$newreqopts"
}
for net in $(management_interfaces); do
uci -q set network.$net.reqopts="$(new_reqopts $net)"
done
uci commit network
}
set_iup_reqopts

View File

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

View File

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

View File

@@ -22,6 +22,8 @@ directmedia=no
sipdebug=no
session-timers=refuse
videosupport=yes
disallow=all
allow=alaw
realm=|REALM|
defaultexpiry=|DEFAULTEXPIRY|

View File

@@ -155,9 +155,6 @@ config 'sip_service_provider' 'sip0'
option 'name' 'Account 1'
option 'enabled' '0'
option 'codec0' 'alaw'
option 'codec1' 'ulaw'
option 'codec2' 'g729'
option 'codec3' 'g726'
option 'autoframing' '1'
option 'cfim_on' '*21*'
option 'cfim_off' '#21#'

View File

@@ -793,11 +793,11 @@ configure_sip_provider()
fi
# Force ulaw/alaw if fax, otherwise read selected codecs
# if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
# sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/" $WORKDIR/sip_provider.tmp
# else
# sed -i "s/|ALLOW|/$(read_codecs_ptime $1)/" $WORKDIR/sip_provider.tmp
# fi
if [ -z "$is_fax" -o "$is_fax" = "1" ] ; then
sed -i "s/|ALLOW|/allow = ulaw\nallow = alaw/" $WORKDIR/sip_provider.tmp
else
sed -i "s/|ALLOW|/$(read_codecs_ptime $1)/" $WORKDIR/sip_provider.tmp
fi
# Autoframing
if [ -z "$autoframing" ] ; then
@@ -2081,19 +2081,6 @@ pbx_fix_ownership()
chown $ASTUSER:$ASTGROUP -R $ASTDIRSRECURSIVE
}
#Load brcm line types and counts using the brcminfo util
lineType=""
for x in $(brcminfo)
do
case $x in
"DECT") lineType="dectCount" ;;
"FXS") lineType="fxsCount" ;;
"FXO") lineType="fxoCount" ;;
"All") lineType="allCount" ;;
[0-9]) eval "$lineType=$x" ;;
esac
done
#
# Calculate a name for each brcm line, depending on port type
# and number. The name is used to make UI look better.

View File

@@ -106,11 +106,12 @@ case "$1" in
uci show voice_client | grep user | grep -wq "$from" && callok=1
uci show voice_client | grep user | grep -wq "$to" && callok=1
[ $callok -eq 0 ] && continue
account="$(echo $line | cut -d',' -f4)"
uci show voice_client | grep sip_service_provider | grep -wq "$account" || continue
timestart="$(echo $line | awk -F',' '{print $(NF-8)}')"
timend="$(echo $line | awk -F',' '{print $(NF-6)}')"
startdate=$(date -u -d "$timestart" +"%s")
enddate=$(date -u -d "$timend" +"%s")
#duration="$(date -d@$((startdate - enddate)) -u +%H:%M:%S)"
uci show voice_client | grep user | grep -wq "$from" && direction="OUTGOING" || direction="INCOMING"
json_add_object ""
json_add_string uniqueid "$uniqueid"