[svn-commits] branch crichter/1.2-mqueued - r8491 in
/team/crichter/1.2-mqueued: channels/ ...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Mon Jan 23 10:16:40 MST 2006
Author: crichter
Date: Mon Jan 23 11:16:34 2006
New Revision: 8491
URL: http://svn.digium.com/view/asterisk?rev=8491&view=rev
Log:
added option to avoid proceeding for PTP lines (need_more_infos), added a dependency on chan_misdn_config.h for chan_misdn_config.c in channels/Makefile
Modified:
team/crichter/1.2-mqueued/channels/Makefile
team/crichter/1.2-mqueued/channels/chan_misdn.c
team/crichter/1.2-mqueued/channels/chan_misdn_config.c
team/crichter/1.2-mqueued/channels/misdn/chan_misdn_config.h
team/crichter/1.2-mqueued/channels/misdn/isdn_lib.c
team/crichter/1.2-mqueued/channels/misdn/isdn_lib.h
team/crichter/1.2-mqueued/configs/misdn.conf.sample
Modified: team/crichter/1.2-mqueued/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/channels/Makefile?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/channels/Makefile (original)
+++ team/crichter/1.2-mqueued/channels/Makefile Mon Jan 23 11:16:34 2006
@@ -237,7 +237,10 @@
chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a
$(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lisdnnet -lmISDN
-chan_misdn.o: chan_misdn.c
+chan_misdn.o: chan_misdn.c
+ $(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.3.0\" -c $< -o $@
+
+chan_misdn_config.o: chan_misdn_config.c misdn/chan_misdn_config.h
$(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.3.0\" -c $< -o $@
#chan_modem.so : chan_modem.o
Modified: team/crichter/1.2-mqueued/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/channels/chan_misdn.c?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/channels/chan_misdn.c (original)
+++ team/crichter/1.2-mqueued/channels/chan_misdn.c Mon Jan 23 11:16:34 2006
@@ -1091,6 +1091,8 @@
misdn_cfg_get( port, MISDN_CFG_RXGAIN, &bc->rxgain, sizeof(int));
misdn_cfg_get( port, MISDN_CFG_SENDDTMF, &bc->send_dtmf, sizeof(int));
+
+ misdn_cfg_get( port, MISDN_CFG_NEED_MORE_INFOS, &bc->need_more_infos, sizeof(int));
/*Initialize new Jitterbuffer*/
@@ -3137,7 +3139,7 @@
if (ast_exists_extension(ch->ast, ch->context, bc->dad, 1, bc->oad)) {
ch->state=MISDN_DIALING;
- if (bc->nt) {
+ if (bc->nt || (bc->need_more_infos && misdn_lib_is_ptp(bc->port)) ) {
int ret;
ret = misdn_lib_send_event(bc, EVENT_SETUP_ACKNOWLEDGE );
} else {
Modified: team/crichter/1.2-mqueued/channels/chan_misdn_config.c
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/channels/chan_misdn_config.c?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/channels/chan_misdn_config.c (original)
+++ team/crichter/1.2-mqueued/channels/chan_misdn_config.c Mon Jan 23 11:16:34 2006
@@ -107,6 +107,7 @@
{ "echocancel", MISDN_CFG_ECHOCANCEL, MISDN_CTYPE_BOOLINT, "0", 128 },
{ "echocancelwhenbridged", MISDN_CFG_ECHOCANCELWHENBRIDGED, MISDN_CTYPE_BOOL, "no", NONE },
{ "echotraining", MISDN_CFG_ECHOTRAINING, MISDN_CTYPE_BOOLINT, "1", 1 },
+ { "need_more_infos", MISDN_CFG_NEED_MORE_INFOS, MISDN_CTYPE_BOOL, "0", NONE },
{ "jitterbuffer", MISDN_CFG_JITTERBUFFER, MISDN_CTYPE_INT, "0", NONE },
{ "jitterbuffer_upper_threshold", MISDN_CFG_JITTERBUFFER_UPPER_THRESHOLD, MISDN_CTYPE_INT, "0", NONE },
{ "callgroup", MISDN_CFG_CALLGROUP, MISDN_CTYPE_ASTGROUP, NO_DEFAULT, NONE },
Modified: team/crichter/1.2-mqueued/channels/misdn/chan_misdn_config.h
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/channels/misdn/chan_misdn_config.h?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/channels/misdn/chan_misdn_config.h (original)
+++ team/crichter/1.2-mqueued/channels/misdn/chan_misdn_config.h Mon Jan 23 11:16:34 2006
@@ -46,6 +46,7 @@
MISDN_CFG_ECHOCANCEL, /* int */
MISDN_CFG_ECHOCANCELWHENBRIDGED, /* int (bool) */
MISDN_CFG_ECHOTRAINING, /* int (bool) */
+ MISDN_CFG_NEED_MORE_INFOS, /* bool */
MISDN_CFG_JITTERBUFFER, /* int */
MISDN_CFG_JITTERBUFFER_UPPER_THRESHOLD, /* int */
MISDN_CFG_CALLGROUP, /* ast_group_t */
Modified: team/crichter/1.2-mqueued/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/channels/misdn/isdn_lib.c?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/channels/misdn/isdn_lib.c (original)
+++ team/crichter/1.2-mqueued/channels/misdn/isdn_lib.c Mon Jan 23 11:16:34 2006
@@ -442,6 +442,8 @@
bc->channel = 0;
bc->in_use = 0;
+ bc->need_more_infos = 0;
+
bc->send_dtmf=0;
bc->nodsp=0;
bc->nojitter=0;
Modified: team/crichter/1.2-mqueued/channels/misdn/isdn_lib.h
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/channels/misdn/isdn_lib.h?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/channels/misdn/isdn_lib.h (original)
+++ team/crichter/1.2-mqueued/channels/misdn/isdn_lib.h Mon Jan 23 11:16:34 2006
@@ -198,6 +198,9 @@
int dtmf;
int send_dtmf;
+ /* get setup ack */
+ int need_more_infos;
+
/* wether we should use jollys dsp or not */
int nodsp;
Modified: team/crichter/1.2-mqueued/configs/misdn.conf.sample
URL: http://svn.digium.com/view/asterisk/team/crichter/1.2-mqueued/configs/misdn.conf.sample?rev=8491&r1=8490&r2=8491&view=diff
==============================================================================
--- team/crichter/1.2-mqueued/configs/misdn.conf.sample (original)
+++ team/crichter/1.2-mqueued/configs/misdn.conf.sample Mon Jan 23 11:16:34 2006
@@ -140,6 +140,16 @@
; default value: no
;
te_choose_channel=no
+
+
+;
+; Send Setup_Acknowledge on incoming calls anyway (instead of PROCEEDING),
+; this requests additional Infos, so we can waitfordigits
+; without much issues. This works only for PTP Ports
+;
+; default value: no
+;
+need_more_infos=no
; set the method to use for channel selection:
; standard - always choose the first free channel with the lowest number
More information about the svn-commits
mailing list