From e4d1524c23efbed6f1a6f36dbca00e9bc5007573 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Wed, 2 Jan 2008 22:41:23 +0000
Subject: [PATCH] actually parse and store echocan parameters from
zapata.conf... this *should* work <G>
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@96073 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_zap.c | 66 ++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 59 insertions(+), 7 deletions(-)
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index e266818ea7..f9c02d286a 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -12819,6 +12819,60 @@ static int build_channels(struct zt_chan_conf conf, int iscrv, const char *value
/** The length of the parameters list of 'zapchan'.
* \todo Move definition of MAX_CHANLIST_LEN to a proper place. */
#define MAX_CHANLIST_LEN 80
+
+#if defined(HAVE_ZAPTEL_ECHOCANPARAMS)
+static void process_echocancel(struct zt_chan_conf *confp, const char *data, unsigned int line)
+{
+ char *parse = ast_strdupa(data);
+ char *params[ZT_MAX_ECHOCANPARAMS + 1];
+ unsigned int param_count;
+ unsigned int x;
+
+ if (!(param_count = ast_app_separate_args(parse, ',', params, sizeof(params) / sizeof(params[0]))))
+ return;
+
+ memset(&confp->chan.echocancel, 0, sizeof(confp->chan.echocancel));
+
+ /* first parameter is tap length, process it here */
+
+ x = ast_strlen_zero(params[0]) ? 0 : atoi(params[0]);
+
+ if ((x == 32) || (x == 64) || (x == 128) || (x == 256) || (x == 512) || (x == 1024))
+ confp->chan.echocancel.head.tap_length = x;
+ else if ((confp->chan.echocancel.head.tap_length = ast_true(params[0])))
+ confp->chan.echocancel.head.tap_length = 128;
+
+ /* now process any remaining parameters */
+
+ for (x = 1; x < param_count; x++) {
+ struct {
+ char *name;
+ char *value;
+ } param;
+
+ if (ast_app_separate_args(params[x], '=', (char **) ¶m, 2) < 1) {
+ ast_log(LOG_WARNING, "Invalid echocancel parameter supplied at line %d: '%s'\n", line, params[x]);
+ continue;
+ }
+
+ if (ast_strlen_zero(param.name) || (strlen(param.name) > sizeof(confp->chan.echocancel.params[0].name)-1)) {
+ ast_log(LOG_WARNING, "Invalid echocancel parameter supplied at line %d: '%s'\n", line, param.name);
+ continue;
+ }
+
+ strcpy(confp->chan.echocancel.params[confp->chan.echocancel.head.param_count].name, param.name);
+
+ if (param.value) {
+ if (sscanf(param.value, "%ud", &confp->chan.echocancel.params[confp->chan.echocancel.head.param_count].value) != 1) {
+ ast_log(LOG_WARNING, "Invalid echocancel parameter value supplied at line %d: '%s'\n", line, param.value);
+ continue;
+ }
+ }
+ confp->chan.echocancel.head.param_count++;
+ }
+}
+#endif /* defined(HAVE_ZAPTEL_ECHOCANPARAMS) */
+
static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int reload, int skipchannels)
{
struct zt_pvt *tmp;
@@ -12948,17 +13002,15 @@ static int process_zap(struct zt_chan_conf *confp, struct ast_variable *v, int r
confp->chan.callprogress |= CALLPROGRESS_FAX_INCOMING | CALLPROGRESS_FAX_OUTGOING;
} else if (!strcasecmp(v->name, "echocancel")) {
#if defined(HAVE_ZAPTEL_ECHOCANPARAMS)
- unsigned int *ec = &confp->chan.echocancel.head.tap_length;
+ process_echocancel(confp, v->value, v->lineno);
#else
- int *ec = &confp->chan.echocancel;
-#endif
-
y = ast_strlen_zero(v->value) ? 0 : atoi(v->value);
if ((y == 32) || (y == 64) || (y == 128) || (y == 256) || (y == 512) || (y == 1024))
- *ec = y;
- else if ((*ec = ast_true(v->value)))
- *ec = 128;
+ confp->chan.echocancel = y;
+ else if ((confp->chan.echocancel = ast_true(v->value)))
+ confp->chan.echocancel = 128;
+#endif
} else if (!strcasecmp(v->name, "echotraining")) {
if (sscanf(v->value, "%d", &y) == 1) {
if ((y < 10) || (y > 4000)) {
--
GitLab