From 56f93e1eab6d90ed066c4e75b733ee3c075f9c4e Mon Sep 17 00:00:00 2001 From: Sukru Senli Date: Thu, 23 Apr 2020 12:41:08 +0200 Subject: [PATCH] voice_client: adapt to led name change --- voice-client/files/etc/init.d/voice_client | 2 +- voice-client/files/sbin/voice-monitor | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/voice-client/files/etc/init.d/voice_client b/voice-client/files/etc/init.d/voice_client index 144a753f1..63937e708 100755 --- a/voice-client/files/etc/init.d/voice_client +++ b/voice-client/files/etc/init.d/voice_client @@ -2242,7 +2242,7 @@ stop_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"}' + ubus call led.voice set '{"state":"off"}' # FXS channel module must be reloaded before sip module. Otherwise some attributes like # line's registration state which is updated by SIP module through callback might be diff --git a/voice-client/files/sbin/voice-monitor b/voice-client/files/sbin/voice-monitor index 03d6ff5bd..30b2ae8b0 100755 --- a/voice-client/files/sbin/voice-monitor +++ b/voice-client/files/sbin/voice-monitor @@ -13,7 +13,7 @@ for peer in $(uci show voice_client | grep sip_service_provider | awk -F[.,=] '{ done if [ $ACCOUNTENABLED -eq 0 ]; then - ubus call led.voice1 set '{"state":"off"}' + ubus call led.voice set '{"state":"off"}' exit fi @@ -26,11 +26,11 @@ asterisk -x 'sip show registry' | grep -q "Registered" && REGISTERED=1 ubus call endpt status | grep -q "OFFHOOK" && OFFHOOK=1 if [ $OFFHOOK -eq 1 ]; then - ubus call led.voice1 set '{"state":"notice"}' + ubus call led.voice set '{"state":"notice"}' elif [ $REGISTERED -eq 1 ]; then - ubus call led.voice1 set '{"state":"ok"}' + ubus call led.voice set '{"state":"ok"}' else - ubus call led.voice1 set '{"state":"error"}' + ubus call led.voice set '{"state":"error"}' fi ubus listen asterisk.registry asterisk.endpoint | \ @@ -41,10 +41,10 @@ while read event ; do json_get_var status status if [ "$status" == "Registered" ]; then REGISTERED=1 - [ $OFFHOOK -eq 0 ] && ubus call led.voice1 set '{"state":"ok"}' + [ $OFFHOOK -eq 0 ] && ubus call led.voice set '{"state":"ok"}' else REGISTERED=0 - [ $OFFHOOK -eq 0 ] && ubus call led.voice1 set '{"state":"error"}' + [ $OFFHOOK -eq 0 ] && ubus call led.voice set '{"state":"error"}' fi elif json_select asterisk.endpoint >/dev/null; then json_get_var event event @@ -52,14 +52,14 @@ while read event ; do case $event in OFFHOOK) OFFHOOK=1 - ubus call led.voice1 set '{"state":"notice"}' + ubus call led.voice set '{"state":"notice"}' ;; ONHOOK) OFFHOOK=0 if [ $REGISTERED -eq 1 ]; then - ubus call led.voice1 set '{"state":"ok"}' + ubus call led.voice set '{"state":"ok"}' else - ubus call led.voice1 set '{"state":"error"}' + ubus call led.voice set '{"state":"error"}' fi ;; *)