OpenWrt/openwrt-feed-telephony
1
0
Fork 0
mirror of https://git.openwrt.org/feed/telephony.git synced 2025-01-09 04:09:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #878 from dangowrt/asterisk-chan-lantiq-log-channel-state-23.05

Browse Source 
asterisk-chan-lantiq: import patches improving log output
This commit is contained in:
Jiri Slachta 2024-07-03 17:19:40 +02:00 committed by GitHub
commit 98c8a5aa46
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 80 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/asterisk-chan-lantiq/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=asterisk-chan-lantiq
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
PKG_SOURCE_VERSION:=2f029ec8778420538c8151c6aceba0f7b44b07c9

32
net/asterisk-chan-lantiq/patches/0003-use-channel_state-enum.patch Normal file
View File

@ -0,0 +1,32 @@
From 1fded33e58cb57a6c67195bd7cd822a25c0c073d Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 29 Jun 2024 01:05:51 +0100
Subject: [PATCH 1/2] use channel_state enum
Make compiler aware of finite states listed in enum.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
src/channels/chan_lantiq.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/src/channels/chan_lantiq.c
+++ b/src/channels/chan_lantiq.c
@@ -141,7 +141,7 @@ enum channel_state {
static struct lantiq_pvt {
struct ast_channel *owner; /* Channel we belong to, possibly NULL */
int port_id; /* Port number of this object, 0..n */
- int channel_state;
+ enum channel_state channel_state;/* Current state of the channel */
char context[AST_MAX_CONTEXT]; /* this port's dialplan context */
int dial_timer; /* timer handle for autodial timeout */
char dtmfbuf[AST_MAX_EXTENSION]; /* buffer holding dialed digits */
@@ -1401,6 +1401,8 @@ static int lantiq_dev_event_hook(int c,
case INCALL:
ret = lantiq_end_call(c);
break;
+ default:
+ break;
}
iflist[c].channel_state = ONHOOK;

24
net/asterisk-chan-lantiq/patches/0004-report-state-in-lantiq_dev_event_digit.patch Normal file
View File

@ -0,0 +1,24 @@
From c1af296bac46a828f16c616f0f470b0d525e7860 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 29 Jun 2024 01:12:47 +0100
Subject: [PATCH 2/2] report state in lantiq_dev_event_digit
Inform user about channel state in case of unhandled digit.
As it is not really an error, use NOTICE log level instead of ERROR.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
src/channels/chan_lantiq.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/src/channels/chan_lantiq.c
+++ b/src/channels/chan_lantiq.c
@@ -1574,7 +1574,7 @@ static void lantiq_dev_event_digit(int c
}
break;
default:
- ast_log(LOG_ERROR, "don't know what to do in unhandled state\n");
+ ast_log(LOG_NOTICE, "don't know what to do in unhandled state %s\n", state_string(pvt->channel_state));
break;
}

23
net/asterisk-chan-lantiq/patches/0005-inform-requester-about-busy-channel.patch Normal file
View File

@ -0,0 +1,23 @@
From cdc77d6f9388c42bd6e21666b8a4d5789e93d05e Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Sat, 29 Jun 2024 01:20:16 +0100
Subject: [PATCH] inform requester about busy channel
Set cause to AST_CAUSE_USER_BUSY if requesting the channel failed
due to being offhook already.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
src/channels/chan_lantiq.c | 1 +
1 file changed, 1 insertion(+)
--- a/src/channels/chan_lantiq.c
+++ b/src/channels/chan_lantiq.c
@@ -1283,6 +1283,7 @@ static struct ast_channel *ast_lantiq_re
/* Bail out if channel is already in use */
struct lantiq_pvt *pvt = &iflist[port_id];
if (! pvt->channel_state == ONHOOK) {
+ *cause = AST_CAUSE_USER_BUSY;
ast_debug(1, "TAPI channel %i alread in use.\n", port_id+1);
} else {
chan = lantiq_channel(AST_STATE_DOWN, port_id, NULL, NULL, cap, assigned_ids, requestor);