From a7a16746f5d7adc61f2df8f4a4192a872e9f5334 Mon Sep 17 00:00:00 2001
From: Sukru Senli <sukru.senli@iopsys.eu>
Date: Thu, 6 Jun 2019 13:40:25 +0200
Subject: [PATCH] voice-client: some cleanup
---
voice-client/files/etc/config/voice_client | 1 +
voice-client/files/etc/init.d/voice_client | 19 +++++++------------
.../files/etc/uci-defaults/99-voice_client | 1 +
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/voice-client/files/etc/config/voice_client b/voice-client/files/etc/config/voice_client
index d60de1e08..dc5816eee 100644
--- a/voice-client/files/etc/config/voice_client
+++ b/voice-client/files/etc/config/voice_client
@@ -174,4 +174,5 @@ config sip_service_provider 'sip0'
option redial '*66'
option is_fax '0'
option transport 'udp'
+ option call_lines '0'
diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client
index d291b5609..6b3238a65 100755
--- a/voice-client/files/etc/init.d/voice_client
+++ b/voice-client/files/etc/init.d/voice_client
@@ -1,8 +1,7 @@
#!/bin/sh /etc/rc.common
#
-# This file is part of luci-app-voice,
-# its purpose is to (re)create asterisk configuration files
-# from luci config file(s).
+# The purpose of this file is to (re)create asterisk
+# configuration files from voice_client UCI config file.
#
. /lib/functions.sh
. /lib/functions/network.sh
@@ -19,8 +18,10 @@ USE_PROCD=1
# Some global variables
SERIAL="$(getSerial)"
BASEMAC="$(getBaseMAC)"
+LINENAME="$(getLineName)"
+CHANNELNAME="$(getChannelName)"
MODULENAME=voice
-USERAGENT="Inteno_${SERIAL}_${BASEMAC}"
+USERAGENT="iopsys_${SERIAL}_${BASEMAC}"
ASTUSER=nobody
ASTGROUP=nogroup
@@ -32,9 +33,6 @@ ASTERISKDIR=/etc/asterisk
WORKDIR=/tmp/$MODULENAME.$$
MD5SUMSFILE=/tmp/$MODULENAME-sums.$$
-LINENAME="$(getLineName)"
-CHANNELNAME="$(getChannelName)"
-
# Whitespace separated list of $CHANNELNAME feature access codes
CHANNEL_FAC=
@@ -255,9 +253,6 @@ read_codecs_ptime()
# returns a list of lines, formatted to replace a tag with sed
# in a Dial() command
#
-# For backwards compatibility, if i is only a number (not prefixed by
-# "SIP/" or "CHANNEL/") then add "CHANNEL/"
-#
read_lines()
{
local line call_lines lineid ldx lines llength clength
@@ -288,8 +283,8 @@ read_lines()
[ -n "$lineid" ] || continue
- # -1 to get uci config index (which starts from 0)
- # +loffset to give correct number of channel driver
+ # -1 to match the line's uci config index number
+ # +loffset to match the correct number in channel driver
ldx=$((lineid-1+loffset))
lines="$lines$CHANNELNAME/$ldx&"
diff --git a/voice-client/files/etc/uci-defaults/99-voice_client b/voice-client/files/etc/uci-defaults/99-voice_client
index e1afa5360..364dcb80b 100755
--- a/voice-client/files/etc/uci-defaults/99-voice_client
+++ b/voice-client/files/etc/uci-defaults/99-voice_client
@@ -5,6 +5,7 @@
# Adapt to config section name changes
grep -q brcm_line /etc/config/voice_client && sed -i 's/brcm_line/tel_line/g' /etc/config/voice_client
grep -q brcm_advanced /etc/config/voice_client && sed -i 's/brcm_advanced/tel_advanced/g' /etc/config/voice_client
+grep -q BRCM /etc/config/voice_client && sed -i 's/BRCM\///g' /etc/config/voice_client
grep -q BRCM /etc/config/voice_client && sed -i 's/BRCM/TEL/g' /etc/config/voice_client
# Add call filter section
--
GitLab