[svn-commits] murf: branch murf/AEL-blockcomments r41526 - in
/team/murf/AEL-blockcomments:...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Aug 30 19:36:03 MST 2006
Author: murf
Date: Wed Aug 30 21:36:02 2006
New Revision: 41526
URL: http://svn.digium.com/view/asterisk?rev=41526&view=rev
Log:
Merged revisions 41505,41507,41523 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r41505 | file | 2006-08-30 19:48:04 -0600 (Wed, 30 Aug 2006) | 2 lines
Update configure script to check for Zaptel VLDTMF support since this will now be required. If you build and don't have Zap stuff, upgrade your zaptel copy. As well - change some minor things so that we get "checking for" and not "checking checking for".
........
r41507 | file | 2006-08-30 19:59:02 -0600 (Wed, 30 Aug 2006) | 2 lines
Merge in VLDTMF support with Zaptel/Core done by the ever great Darumkilla Russell Bryant and the RTP portion done by myself, Muffinlicious Joshua Colp. This has gone through so many discussions/revisions it's not funny but we finally have it!
........
r41523 | file | 2006-08-30 20:03:01 -0600 (Wed, 30 Aug 2006) | 2 lines
Force a rebuild since we mucked with enough stuff to justify it
........
Modified:
team/murf/AEL-blockcomments/ (props changed)
team/murf/AEL-blockcomments/.cleancount
team/murf/AEL-blockcomments/UPGRADE.txt
team/murf/AEL-blockcomments/acinclude.m4
team/murf/AEL-blockcomments/apps/app_echo.c
team/murf/AEL-blockcomments/channels/chan_agent.c
team/murf/AEL-blockcomments/channels/chan_alsa.c
team/murf/AEL-blockcomments/channels/chan_features.c
team/murf/AEL-blockcomments/channels/chan_h323.c
team/murf/AEL-blockcomments/channels/chan_iax2.c
team/murf/AEL-blockcomments/channels/chan_jingle.c
team/murf/AEL-blockcomments/channels/chan_local.c
team/murf/AEL-blockcomments/channels/chan_mgcp.c
team/murf/AEL-blockcomments/channels/chan_misdn.c
team/murf/AEL-blockcomments/channels/chan_oss.c
team/murf/AEL-blockcomments/channels/chan_phone.c
team/murf/AEL-blockcomments/channels/chan_sip.c
team/murf/AEL-blockcomments/channels/chan_skinny.c
team/murf/AEL-blockcomments/channels/chan_vpb.cc
team/murf/AEL-blockcomments/channels/chan_zap.c
team/murf/AEL-blockcomments/channels/iax2-parser.c
team/murf/AEL-blockcomments/configs/sip.conf.sample
team/murf/AEL-blockcomments/configure
team/murf/AEL-blockcomments/configure.ac
team/murf/AEL-blockcomments/include/asterisk/channel.h
team/murf/AEL-blockcomments/include/asterisk/frame.h
team/murf/AEL-blockcomments/include/asterisk/rtp.h
team/murf/AEL-blockcomments/main/app.c
team/murf/AEL-blockcomments/main/channel.c
team/murf/AEL-blockcomments/main/dsp.c
team/murf/AEL-blockcomments/main/file.c
team/murf/AEL-blockcomments/main/rtp.c
team/murf/AEL-blockcomments/res/res_agi.c
team/murf/AEL-blockcomments/res/res_features.c
Propchange: team/murf/AEL-blockcomments/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 30 21:36:02 2006
@@ -1,1 +1,1 @@
-/trunk:1-41503
+/trunk:1-41525
Modified: team/murf/AEL-blockcomments/.cleancount
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/.cleancount?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/.cleancount (original)
+++ team/murf/AEL-blockcomments/.cleancount Wed Aug 30 21:36:02 2006
@@ -1,1 +1,1 @@
-22
+23
Modified: team/murf/AEL-blockcomments/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/UPGRADE.txt?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/UPGRADE.txt (original)
+++ team/murf/AEL-blockcomments/UPGRADE.txt Wed Aug 30 21:36:02 2006
@@ -303,6 +303,12 @@
option in sip.conf is removed to osp.conf as authpolicy. allowguest option
in sip.conf cannot be set as osp anymore.
+* The Asterisk RTP stack has been changed in regards to RFC2833 reception
+ and transmission. Packets will now be sent with proper duration instead of all
+ at once. If you are receiving calls from a pre-1.4 Asterisk installation you
+ will want to turn on the rfc2833compensate option. Without this option your
+ DTMF reception may act poorly.
+
* The $SIPUSERAGENT dialplan variable is deprecated and will be removed
in coming versions of Asterisk. Please use the dialplan function
SIPCHANINFO(useragent) instead.
Modified: team/murf/AEL-blockcomments/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/acinclude.m4?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/acinclude.m4 (original)
+++ team/murf/AEL-blockcomments/acinclude.m4 Wed Aug 30 21:36:02 2006
@@ -2,7 +2,7 @@
AC_DEFUN([AST_GCC_ATTRIBUTE],
[
-AC_MSG_CHECKING(checking for compiler 'attribute $1' support)
+AC_MSG_CHECKING(for compiler 'attribute $1' support)
AC_COMPILE_IFELSE(
AC_LANG_PROGRAM([static int __attribute__(($1)) test(void) {}],
[]),
Modified: team/murf/AEL-blockcomments/apps/app_echo.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/apps/app_echo.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/apps/app_echo.c (original)
+++ team/murf/AEL-blockcomments/apps/app_echo.c Wed Aug 30 21:36:02 2006
@@ -71,19 +71,13 @@
f->delivery.tv_usec = 0;
switch (f->frametype) {
case AST_FRAME_DTMF:
- case AST_FRAME_DTMF_END:
if (f->subclass == '#') {
res = 0;
ast_frfree(f);
goto end;
}
/* fall through */
- case AST_FRAME_DTMF_BEGIN:
- case AST_FRAME_VOICE:
- case AST_FRAME_VIDEO:
- case AST_FRAME_TEXT:
- case AST_FRAME_HTML:
- case AST_FRAME_IMAGE:
+ default:
if (ast_write(chan, f)) {
ast_frfree(f);
goto end;
Modified: team/murf/AEL-blockcomments/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_agent.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_agent.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_agent.c Wed Aug 30 21:36:02 2006
@@ -238,7 +238,8 @@
static struct ast_channel *agent_request(const char *type, int format, void *data, int *cause);
static int agent_devicestate(void *data);
static void agent_logoff_maintenance(struct agent_pvt *p, char *loginchan, long logintime, const char *uniqueid, char *logcommand);
-static int agent_digit(struct ast_channel *ast, char digit);
+static int agent_digit_begin(struct ast_channel *ast, char digit);
+static int agent_digit_end(struct ast_channel *ast, char digit);
static int agent_call(struct ast_channel *ast, char *dest, int timeout);
static int agent_hangup(struct ast_channel *ast);
static int agent_answer(struct ast_channel *ast);
@@ -258,7 +259,8 @@
.capabilities = -1,
.requester = agent_request,
.devicestate = agent_devicestate,
- .send_digit = agent_digit,
+ .send_digit_begin = agent_digit_begin,
+ .send_digit_end = agent_digit_end,
.call = agent_call,
.hangup = agent_hangup,
.answer = agent_answer,
@@ -491,7 +493,8 @@
}
}
break;
- case AST_FRAME_DTMF:
+ case AST_FRAME_DTMF_BEGIN:
+ case AST_FRAME_DTMF_END:
if (!p->acknowledged && (f->subclass == '#')) {
if (option_verbose > 2)
ast_verbose(VERBOSE_PREFIX_3 "%s acknowledged\n", p->chan->name);
@@ -511,7 +514,9 @@
ast_frfree(f);
f = &ast_null_frame;
}
- break;
+ default:
+ /* pass everything else on through */
+ break;
}
}
@@ -603,15 +608,22 @@
return res;
}
-static int agent_digit(struct ast_channel *ast, char digit)
+static int agent_digit_begin(struct ast_channel *ast, char digit)
{
struct agent_pvt *p = ast->tech_pvt;
int res = -1;
ast_mutex_lock(&p->lock);
- if (p->chan)
- res = p->chan->tech->send_digit(p->chan, digit);
- else
- res = 0;
+ ast_senddigit_begin(p->chan, digit);
+ ast_mutex_unlock(&p->lock);
+ return res;
+}
+
+static int agent_digit_end(struct ast_channel *ast, char digit)
+{
+ struct agent_pvt *p = ast->tech_pvt;
+ int res = -1;
+ ast_mutex_lock(&p->lock);
+ ast_senddigit_end(p->chan, digit);
ast_mutex_unlock(&p->lock);
return res;
}
Modified: team/murf/AEL-blockcomments/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_alsa.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_alsa.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_alsa.c Wed Aug 30 21:36:02 2006
@@ -203,7 +203,7 @@
.description = tdesc,
.capabilities = AST_FORMAT_SLINEAR,
.requester = alsa_request,
- .send_digit = alsa_digit,
+ .send_digit_end = alsa_digit,
.send_text = alsa_text,
.hangup = alsa_hangup,
.answer = alsa_answer,
Modified: team/murf/AEL-blockcomments/channels/chan_features.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_features.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_features.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_features.c Wed Aug 30 21:36:02 2006
@@ -95,7 +95,8 @@
#define SUB_THREEWAY 2 /* Three-way call */
static struct ast_channel *features_request(const char *type, int format, void *data, int *cause);
-static int features_digit(struct ast_channel *ast, char digit);
+static int features_digit_begin(struct ast_channel *ast, char digit);
+static int features_digit_end(struct ast_channel *ast, char digit);
static int features_call(struct ast_channel *ast, char *dest, int timeout);
static int features_hangup(struct ast_channel *ast);
static int features_answer(struct ast_channel *ast);
@@ -109,7 +110,8 @@
.description = tdesc,
.capabilities = -1,
.requester = features_request,
- .send_digit = features_digit,
+ .send_digit_begin = features_digit_begin,
+ .send_digit_end = features_digit_end,
.call = features_call,
.hangup = features_hangup,
.answer = features_answer,
@@ -300,7 +302,7 @@
return res;
}
-static int features_digit(struct ast_channel *ast, char digit)
+static int features_digit_begin(struct ast_channel *ast, char digit)
{
struct feature_pvt *p = ast->tech_pvt;
int res = -1;
@@ -310,7 +312,23 @@
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
if (!x && p->subchan)
- res = ast_senddigit(p->subchan, digit);
+ res = ast_senddigit_begin(p->subchan, digit);
+ ast_mutex_unlock(&p->lock);
+
+ return res;
+}
+
+static int features_digit_end(struct ast_channel *ast, char digit)
+{
+ struct feature_pvt *p = ast->tech_pvt;
+ int res = -1;
+ int x;
+
+ /* Queue up a frame representing the indication as a control frame */
+ ast_mutex_lock(&p->lock);
+ x = indexof(p, ast, 0);
+ if (!x && p->subchan)
+ res = ast_senddigit_end(p->subchan, digit);
ast_mutex_unlock(&p->lock);
return res;
}
Modified: team/murf/AEL-blockcomments/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_h323.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_h323.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_h323.c Wed Aug 30 21:36:02 2006
@@ -220,7 +220,8 @@
static int h323_do_reload(void);
static struct ast_channel *oh323_request(const char *type, int format, void *data, int *cause);
-static int oh323_digit(struct ast_channel *c, char digit);
+static int oh323_digit_begin(struct ast_channel *c, char digit);
+static int oh323_digit_end(struct ast_channel *c, char digit);
static int oh323_call(struct ast_channel *c, char *dest, int timeout);
static int oh323_hangup(struct ast_channel *c);
static int oh323_answer(struct ast_channel *c);
@@ -235,7 +236,8 @@
.capabilities = ((AST_FORMAT_MAX_AUDIO << 1) - 1),
.properties = AST_CHAN_TP_WANTSJITTER | AST_CHAN_TP_CREATESJITTER,
.requester = oh323_request,
- .send_digit = oh323_digit,
+ .send_digit_begin = oh323_digit_begin,
+ .send_digit_end = oh323_digit_end,
.call = oh323_call,
.hangup = oh323_hangup,
.answer = oh323_answer,
@@ -381,11 +383,17 @@
ast_mutex_unlock(&iflock);
}
+static int oh323_digit_begin(struct ast_channel *chan, char digit)
+{
+ /* XXX Implement me, plz, kthx */
+ return 0;
+}
+
/**
* Send (play) the specified digit to the channel.
*
*/
-static int oh323_digit(struct ast_channel *c, char digit)
+static int oh323_digit_end(struct ast_channel *c, char digit)
{
struct oh323_pvt *pvt = (struct oh323_pvt *) c->tech_pvt;
char *token;
Modified: team/murf/AEL-blockcomments/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_iax2.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_iax2.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_iax2.c Wed Aug 30 21:36:02 2006
@@ -776,7 +776,8 @@
static int iax2_answer(struct ast_channel *c);
static int iax2_call(struct ast_channel *c, char *dest, int timeout);
static int iax2_devicestate(void *data);
-static int iax2_digit(struct ast_channel *c, char digit);
+static int iax2_digit_begin(struct ast_channel *c, char digit);
+static int iax2_digit_end(struct ast_channel *c, char digit);
static int iax2_do_register(struct iax2_registry *reg);
static int iax2_fixup(struct ast_channel *oldchannel, struct ast_channel *newchan);
static int iax2_hangup(struct ast_channel *c);
@@ -809,7 +810,8 @@
.properties = AST_CHAN_TP_WANTSJITTER,
.requester = iax2_request,
.devicestate = iax2_devicestate,
- .send_digit = iax2_digit,
+ .send_digit_begin = iax2_digit_begin,
+ .send_digit_end = iax2_digit_end,
.send_text = iax2_sendtext,
.send_image = iax2_sendimage,
.send_html = iax2_sendhtml,
@@ -2379,9 +2381,14 @@
-static int iax2_digit(struct ast_channel *c, char digit)
-{
- return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF, digit, 0, NULL, 0, -1);
+static int iax2_digit_begin(struct ast_channel *c, char digit)
+{
+ return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF_BEGIN, digit, 0, NULL, 0, -1);
+}
+
+static int iax2_digit_end(struct ast_channel *c, char digit)
+{
+ return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF_END, digit, 0, NULL, 0, -1);
}
static int iax2_sendtext(struct ast_channel *c, const char *text)
Modified: team/murf/AEL-blockcomments/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_jingle.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_jingle.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_jingle.c Wed Aug 30 21:36:02 2006
@@ -171,7 +171,8 @@
/* Forward declarations */
static struct ast_channel *jingle_request(const char *type, int format, void *data, int *cause);
-static int jingle_digit(struct ast_channel *ast, char digit);
+static int jingle_digit_begin(struct ast_channel *ast, char digit);
+static int jingle_digit_end(struct ast_channel *ast, char digit);
static int jingle_call(struct ast_channel *ast, char *dest, int timeout);
static int jingle_hangup(struct ast_channel *ast);
static int jingle_answer(struct ast_channel *ast);
@@ -194,7 +195,8 @@
.description = "Jingle Channel Driver",
.capabilities = ((AST_FORMAT_MAX_AUDIO << 1) - 1),
.requester = jingle_request,
- .send_digit = jingle_digit,
+ .send_digit_begin = jingle_digit_begin,
+ .send_digit_end = jingle_digit_end,
.bridge = ast_rtp_bridge,
.call = jingle_call,
.hangup = jingle_hangup,
@@ -1181,7 +1183,13 @@
return res;
}
-static int jingle_digit(struct ast_channel *ast, char digit)
+static int jingle_digit_begin(struct ast_channel *chan, char digit)
+{
+ /* XXX Does jingle have a concept of the length of a dtmf digit ? */
+ return 0;
+}
+
+static int jingle_digit_end(struct ast_channel *ast, char digit)
{
struct jingle_pvt *p = ast->tech_pvt;
struct jingle *client = p->parent;
Modified: team/murf/AEL-blockcomments/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_local.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_local.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_local.c Wed Aug 30 21:36:02 2006
@@ -67,7 +67,8 @@
#define IS_OUTBOUND(a,b) (a == b->chan ? 1 : 0)
static struct ast_channel *local_request(const char *type, int format, void *data, int *cause);
-static int local_digit(struct ast_channel *ast, char digit);
+static int local_digit_begin(struct ast_channel *ast, char digit);
+static int local_digit_end(struct ast_channel *ast, char digit);
static int local_call(struct ast_channel *ast, char *dest, int timeout);
static int local_hangup(struct ast_channel *ast);
static int local_answer(struct ast_channel *ast);
@@ -85,7 +86,8 @@
.description = tdesc,
.capabilities = -1,
.requester = local_request,
- .send_digit = local_digit,
+ .send_digit_begin = local_digit_begin,
+ .send_digit_end = local_digit_end,
.call = local_call,
.hangup = local_hangup,
.answer = local_answer,
@@ -327,11 +329,11 @@
return res;
}
-static int local_digit(struct ast_channel *ast, char digit)
+static int local_digit_begin(struct ast_channel *ast, char digit)
{
struct local_pvt *p = ast->tech_pvt;
int res = -1;
- struct ast_frame f = { AST_FRAME_DTMF, };
+ struct ast_frame f = { AST_FRAME_DTMF_BEGIN, };
int isoutbound;
ast_mutex_lock(&p->lock);
@@ -339,6 +341,23 @@
f.subclass = digit;
res = local_queue_frame(p, isoutbound, &f, ast);
ast_mutex_unlock(&p->lock);
+
+ return res;
+}
+
+static int local_digit_end(struct ast_channel *ast, char digit)
+{
+ struct local_pvt *p = ast->tech_pvt;
+ int res = -1;
+ struct ast_frame f = { AST_FRAME_DTMF_END, };
+ int isoutbound;
+
+ ast_mutex_lock(&p->lock);
+ isoutbound = IS_OUTBOUND(ast, p);
+ f.subclass = digit;
+ res = local_queue_frame(p, isoutbound, &f, ast);
+ ast_mutex_unlock(&p->lock);
+
return res;
}
Modified: team/murf/AEL-blockcomments/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_mgcp.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_mgcp.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_mgcp.c Wed Aug 30 21:36:02 2006
@@ -427,7 +427,8 @@
static int mgcp_write(struct ast_channel *ast, struct ast_frame *frame);
static int mgcp_indicate(struct ast_channel *ast, int ind, const void *data, size_t datalen);
static int mgcp_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-static int mgcp_senddigit(struct ast_channel *ast, char digit);
+static int mgcp_senddigit_begin(struct ast_channel *ast, char digit);
+static int mgcp_senddigit_end(struct ast_channel *ast, char digit);
static int mgcp_devicestate(void *data);
static const struct ast_channel_tech mgcp_tech = {
@@ -444,7 +445,8 @@
.write = mgcp_write,
.indicate = mgcp_indicate,
.fixup = mgcp_fixup,
- .send_digit = mgcp_senddigit,
+ .send_digit_begin = mgcp_senddigit_begin,
+ .send_digit_end = mgcp_senddigit_end,
.bridge = ast_rtp_bridge,
};
@@ -1221,7 +1223,13 @@
return 0;
}
-static int mgcp_senddigit(struct ast_channel *ast, char digit)
+static int mgcp_senddigit_begin(struct ast_channel *ast, char digit)
+{
+ /* Let asterisk play inband indications */
+ return -1;
+}
+
+static int mgcp_senddigit_end(struct ast_channel *ast, char digit)
{
struct mgcp_subchannel *sub = ast->tech_pvt;
char tmp[4];
@@ -1233,7 +1241,7 @@
ast_mutex_lock(&sub->lock);
transmit_notify_request(sub, tmp);
ast_mutex_unlock(&sub->lock);
- return -1;
+ return -1; /* Return non-zero so that Asterisk will stop the inband indications */
}
/*!
Modified: team/murf/AEL-blockcomments/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_misdn.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_misdn.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_misdn.c Wed Aug 30 21:36:02 2006
@@ -2006,7 +2006,13 @@
return 0;
}
-static int misdn_digit(struct ast_channel *ast, char digit )
+static int misdn_digit_begin(struct ast_channel *chan, char digit)
+{
+ /* XXX Modify this callback to support Asterisk controlling the length of DTMF */
+ return 0;
+}
+
+static int misdn_digit_end(struct ast_channel *ast, char digit )
{
struct chan_list *p;
@@ -2983,7 +2989,8 @@
.description="Channel driver for mISDN Support (Bri/Pri)",
.capabilities= AST_FORMAT_ALAW ,
.requester=misdn_request,
- .send_digit=misdn_digit,
+ .send_digit_begin=misdn_digit_begin,
+ .send_digit_end=misdn_digit_end,
.call=misdn_call,
.bridge=misdn_bridge,
.hangup=misdn_hangup,
@@ -3001,7 +3008,8 @@
.description="Channel driver for mISDN Support (Bri/Pri)",
.capabilities=AST_FORMAT_ALAW ,
.requester=misdn_request,
- .send_digit=misdn_digit,
+ .send_digit_begin=misdn_digit_begin,
+ .send_digit_end=misdn_digit_end,
.call=misdn_call,
.hangup=misdn_hangup,
.answer=misdn_answer,
Modified: team/murf/AEL-blockcomments/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_oss.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_oss.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_oss.c Wed Aug 30 21:36:02 2006
@@ -407,7 +407,8 @@
static struct ast_channel *oss_request(const char *type, int format, void *data
, int *cause);
-static int oss_digit(struct ast_channel *c, char digit);
+static int oss_digit_begin(struct ast_channel *c, char digit);
+static int oss_digit_end(struct ast_channel *c, char digit);
static int oss_text(struct ast_channel *c, const char *text);
static int oss_hangup(struct ast_channel *c);
static int oss_answer(struct ast_channel *c);
@@ -423,7 +424,8 @@
.description = tdesc,
.capabilities = AST_FORMAT_SLINEAR,
.requester = oss_request,
- .send_digit = oss_digit,
+ .send_digit_begin = oss_digit_begin,
+ .send_digit_end = oss_digit_end,
.send_text = oss_text,
.hangup = oss_hangup,
.answer = oss_answer,
@@ -757,7 +759,12 @@
/*
* some of the standard methods supported by channels.
*/
-static int oss_digit(struct ast_channel *c, char digit)
+static int oss_digit_begin(struct ast_channel *c, char digit)
+{
+ return 0;
+}
+
+static int oss_digit_end(struct ast_channel *c, char digit)
{
/* no better use for received digits than print them */
ast_verbose( " << Console Received digit %c >> \n", digit);
Modified: team/murf/AEL-blockcomments/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_phone.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_phone.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_phone.c Wed Aug 30 21:36:02 2006
@@ -161,7 +161,8 @@
static char cid_name[AST_MAX_EXTENSION];
static struct ast_channel *phone_request(const char *type, int format, void *data, int *cause);
-static int phone_digit(struct ast_channel *ast, char digit);
+static int phone_digit_begin(struct ast_channel *ast, char digit);
+static int phone_digit_end(struct ast_channel *ast, char digit);
static int phone_call(struct ast_channel *ast, char *dest, int timeout);
static int phone_hangup(struct ast_channel *ast);
static int phone_answer(struct ast_channel *ast);
@@ -177,7 +178,8 @@
.description = tdesc,
.capabilities = AST_FORMAT_G723_1 | AST_FORMAT_SLINEAR | AST_FORMAT_ULAW,
.requester = phone_request,
- .send_digit = phone_digit,
+ .send_digit_begin = phone_digit_begin,
+ .send_digit_end = phone_digit_end,
.call = phone_call,
.hangup = phone_hangup,
.answer = phone_answer,
@@ -192,7 +194,8 @@
.type = "Phone",
.description = tdesc,
.requester = phone_request,
- .send_digit = phone_digit,
+ .send_digit_begin = phone_digit_begin,
+ .send_digit_end = phone_digit_end,
.call = phone_call,
.hangup = phone_hangup,
.answer = phone_answer,
@@ -240,7 +243,13 @@
return 0;
}
-static int phone_digit(struct ast_channel *ast, char digit)
+static int phone_digit_begin(struct ast_channel *chan, char digit)
+{
+ /* XXX Modify this callback to let Asterisk support controlling the length of DTMF */
+ return 0;
+}
+
+static int phone_digit_end(struct ast_channel *ast, char digit)
{
struct phone_pvt *p;
int outdigit;
@@ -329,7 +338,7 @@
{
digit++;
while (*digit)
- phone_digit(ast, *digit++);
+ phone_digit_end(ast, *digit++);
}
}
Modified: team/murf/AEL-blockcomments/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_sip.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_sip.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_sip.c Wed Aug 30 21:36:02 2006
@@ -743,9 +743,10 @@
#define SIP_PAGE2_CALL_ONHOLD (3 << 23) /*!< Call states */
#define SIP_PAGE2_CALL_ONHOLD_ONEDIR (1 << 23) /*!< 23: One directional hold */
#define SIP_PAGE2_CALL_ONHOLD_INACTIVE (2 << 24) /*!< 24: Inactive */
+#define SIP_PAGE2_RFC2833_COMPENSATE (1 << 26)
#define SIP_PAGE2_FLAGS_TO_COPY \
- (SIP_PAGE2_ALLOWSUBSCRIBE | SIP_PAGE2_ALLOWOVERLAP | SIP_PAGE2_VIDEOSUPPORT | SIP_PAGE2_T38SUPPORT)
+ (SIP_PAGE2_ALLOWSUBSCRIBE | SIP_PAGE2_ALLOWOVERLAP | SIP_PAGE2_VIDEOSUPPORT | SIP_PAGE2_T38SUPPORT | SIP_PAGE2_RFC2833_COMPENSATE)
/* SIP packet flags */
#define SIP_PKT_DEBUG (1 << 0) /*!< Debug this packet */
@@ -1161,7 +1162,8 @@
static int sip_indicate(struct ast_channel *ast, int condition, const void *data, size_t datalen);
static int sip_transfer(struct ast_channel *ast, const char *dest);
static int sip_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-static int sip_senddigit(struct ast_channel *ast, char digit);
+static int sip_senddigit_begin(struct ast_channel *ast, char digit);
+static int sip_senddigit_end(struct ast_channel *ast, char digit);
/*--- Transmitting responses and requests */
static int sipsock_read(int *id, int fd, short events, void *ignore);
@@ -1512,7 +1514,8 @@
.indicate = sip_indicate,
.transfer = sip_transfer,
.fixup = sip_fixup,
- .send_digit = sip_senddigit,
+ .send_digit_begin = sip_senddigit_begin,
+ .send_digit_end = sip_senddigit_end,
.bridge = ast_rtp_bridge,
.send_text = sip_sendtext,
};
@@ -2515,12 +2518,14 @@
ast_log(LOG_DEBUG, "Setting NAT on RTP to %s\n", natflags ? "On" : "Off");
ast_rtp_setnat(r->rtp, natflags);
ast_rtp_setdtmf(r->rtp, ast_test_flag(&r->flags[0], SIP_DTMF) != SIP_DTMF_INFO);
+ ast_rtp_setdtmfcompensate(r->rtp, ast_test_flag(&r->flags[1], SIP_PAGE2_RFC2833_COMPENSATE));
}
if (r->vrtp) {
if (option_debug)
ast_log(LOG_DEBUG, "Setting NAT on VRTP to %s\n", natflags ? "On" : "Off");
ast_rtp_setnat(r->vrtp, natflags);
ast_rtp_setdtmf(r->vrtp, 0);
+ ast_rtp_setdtmfcompensate(r->vrtp, 0);
}
if (r->udptl) {
if (option_debug)
@@ -3441,9 +3446,31 @@
return ret;
}
+static int sip_senddigit_begin(struct ast_channel *ast, char digit)
+{
+ struct sip_pvt *p = ast->tech_pvt;
+ int res = 0;
+
+ ast_mutex_lock(&p->lock);
+ switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {
+ case SIP_DTMF_INBAND:
+ res = -1; /* Tell Asterisk to generate inband indications */
+ break;
+ case SIP_DTMF_RFC2833:
+ if (p->rtp)
+ ast_rtp_senddigit_begin(p->rtp, digit);
+ break;
+ default:
+ break;
+ }
+ ast_mutex_unlock(&p->lock);
+
+ return res;
+}
+
/*! \brief Send DTMF character on SIP channel
within one call, we're able to transmit in many methods simultaneously */
-static int sip_senddigit(struct ast_channel *ast, char digit)
+static int sip_senddigit_end(struct ast_channel *ast, char digit)
{
struct sip_pvt *p = ast->tech_pvt;
int res = 0;
@@ -3455,13 +3482,14 @@
break;
case SIP_DTMF_RFC2833:
if (p->rtp)
- ast_rtp_senddigit(p->rtp, digit);
+ ast_rtp_senddigit_end(p->rtp, digit);
break;
case SIP_DTMF_INBAND:
- res = -1;
+ res = -1; /* Tell Asterisk to stop inband indications */
break;
}
ast_mutex_unlock(&p->lock);
+
return res;
}
@@ -4049,10 +4077,12 @@
return NULL;
}
ast_rtp_setdtmf(p->rtp, ast_test_flag(&p->flags[0], SIP_DTMF) != SIP_DTMF_INFO);
+ ast_rtp_setdtmfcompensate(p->rtp, ast_test_flag(&p->flags[1], SIP_PAGE2_RFC2833_COMPENSATE));
ast_rtp_settos(p->rtp, global_tos_audio);
if (p->vrtp) {
ast_rtp_settos(p->vrtp, global_tos_video);
ast_rtp_setdtmf(p->vrtp, 0);
+ ast_rtp_setdtmfcompensate(p->vrtp, 0);
}
if (p->udptl)
ast_udptl_settos(p->udptl, global_tos_audio);
@@ -12835,6 +12865,7 @@
extract_uri(p, req); /* Get the Contact URI */
build_contact(p); /* Build our contact header */
ast_rtp_setdtmf(p->rtp, ast_test_flag(&p->flags[0], SIP_DTMF) != SIP_DTMF_INFO);
+ ast_rtp_setdtmfcompensate(p->rtp, ast_test_flag(&p->flags[1], SIP_PAGE2_RFC2833_COMPENSATE));
if (!replace_id && gotdest) { /* No matching extension found */
if (gotdest == 1 && ast_test_flag(&p->flags[1], SIP_PAGE2_ALLOWOVERLAP)) {
@@ -14856,6 +14887,9 @@
} else if (!strcasecmp(v->name, "t38pt_tcp")) {
ast_set_flag(&mask[1], SIP_PAGE2_T38SUPPORT_TCP);
ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_T38SUPPORT_TCP);
+ } else if (!strcasecmp(v->name, "rfc2833compensate")) {
+ ast_set_flag(&mask[1], SIP_PAGE2_RFC2833_COMPENSATE);
+ ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_RFC2833_COMPENSATE);
}
return res;
Modified: team/murf/AEL-blockcomments/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_skinny.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_skinny.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_skinny.c Wed Aug 30 21:36:02 2006
@@ -1013,7 +1013,8 @@
static int skinny_write(struct ast_channel *ast, struct ast_frame *frame);
static int skinny_indicate(struct ast_channel *ast, int ind, const void *data, size_t datalen);
static int skinny_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
-static int skinny_senddigit(struct ast_channel *ast, char digit);
+static int skinny_senddigit_begin(struct ast_channel *ast, char digit);
+static int skinny_senddigit_end(struct ast_channel *ast, char digit);
static const struct ast_channel_tech skinny_tech = {
.type = "Skinny",
@@ -1028,7 +1029,8 @@
.write = skinny_write,
.indicate = skinny_indicate,
.fixup = skinny_fixup,
- .send_digit = skinny_senddigit,
+ .send_digit_begin = skinny_senddigit_begin,
+ .send_digit_end = skinny_senddigit_end,
/* .bridge = ast_rtp_bridge, */
};
@@ -2467,7 +2469,12 @@
return 0;
}
-static int skinny_senddigit(struct ast_channel *ast, char digit)
+static int skinny_senddigit_begin(struct ast_channel *ast, char digit)
+{
+ return -1; /* Start inband indications */
+}
+
+static int skinny_senddigit_end(struct ast_channel *ast, char digit)
{
#if 0
struct skinny_subchannel *sub = ast->tech_pvt;
@@ -2478,7 +2485,7 @@
sprintf(tmp, "%d", digit);
transmit_tone(d->session, digit);
#endif
- return -1;
+ return -1; /* Stop inband indications */
}
static char *control2str(int ind) {
Modified: team/murf/AEL-blockcomments/channels/chan_vpb.cc
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_vpb.cc?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_vpb.cc (original)
+++ team/murf/AEL-blockcomments/channels/chan_vpb.cc Wed Aug 30 21:36:02 2006
@@ -341,9 +341,9 @@
static struct ast_channel *vpb_new(struct vpb_pvt *i, enum ast_channel_state state, char *context);
static void *do_chanreads(void *pvt);
-
static struct ast_channel *vpb_request(const char *type, int format, void *data, int *cause);
-static int vpb_digit(struct ast_channel *ast, char digit);
+static int vpb_digit_begin(struct ast_channel *ast, char digit);
+static int vpb_digit_end(struct ast_channel *ast, char digit);
static int vpb_call(struct ast_channel *ast, char *dest, int timeout);
static int vpb_hangup(struct ast_channel *ast);
static int vpb_answer(struct ast_channel *ast);
@@ -360,9 +360,8 @@
properties: 0,
requester: vpb_request,
devicestate: NULL,
- send_digit: vpb_digit,
- send_digit_begin: NULL,
- send_digit_end: NULL,
+ send_digit_begin: vpb_digit_begin,
+ send_digit_end: vpb_digit_end,
call: vpb_call,
hangup: vpb_hangup,
answer: vpb_answer,
@@ -389,9 +388,8 @@
properties: 0,
requester: vpb_request,
devicestate: NULL,
- send_digit: vpb_digit,
- send_digit_begin: NULL,
- send_digit_end: NULL,
+ send_digit_begin: vpb_digit_begin,
+ send_digit_end: vpb_digit_end,
call: vpb_call,
hangup: vpb_hangup,
answer: vpb_answer,
@@ -863,11 +861,11 @@
vpb_timer_stop(p->ring_timer);
vpb_timer_start(p->ring_timer);
} else
- f.frametype = -1; /* ignore ring on station port. */
+ f.frametype = AST_FRAME_NULL; /* ignore ring on station port. */
break;
case VPB_RING_OFF:
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
break;
case VPB_TIMEREXP:
@@ -876,12 +874,12 @@
p->state = VPB_STATE_PLAYBUSY;
vpb_timer_stop(p->busy_timer);
vpb_timer_start(p->busy_timer);
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
} else if (e->data == p->ringback_timer_id) {
playtone(p->handle, &Ringbacktone);
vpb_timer_stop(p->ringback_timer);
vpb_timer_start(p->ringback_timer);
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
} else if (e->data == p->ring_timer_id) {
/* We didnt get another ring in time! */
if (p->owner->_state != AST_STATE_UP) {
@@ -890,23 +888,23 @@
f.subclass = AST_CONTROL_HANGUP;
} else {
vpb_timer_stop(p->ring_timer);
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
}
} else {
- f.frametype = -1; /* Ignore. */
+ f.frametype = AST_FRAME_NULL; /* Ignore. */
}
break;
case VPB_DTMF_DOWN:
case VPB_DTMF:
if (use_ast_dtmfdet){
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
} else if (p->owner->_state == AST_STATE_UP) {
f.frametype = AST_FRAME_DTMF;
f.subclass = e->data;
} else
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
break;
case VPB_TONEDETECT:
@@ -950,11 +948,11 @@
f.subclass = AST_CONTROL_HANGUP;
} else {
p->lastgrunt = ast_tvnow();
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
}
}
else {
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
}
break;
@@ -970,7 +968,7 @@
f.subclass = AST_CONTROL_HANGUP;
#else
ast_log(LOG_NOTICE,"%s: Got call progress callback but blind dialing \n", p->dev);
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
#endif
break;
@@ -983,14 +981,14 @@
if (p->owner->_state == AST_STATE_UP)
f.subclass = AST_CONTROL_HANGUP;
else
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
}
break;
case VPB_LOOP_ONHOOK:
if (p->owner->_state == AST_STATE_UP)
f.subclass = AST_CONTROL_HANGUP;
else
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
break;
case VPB_STATION_ONHOOK:
f.subclass = AST_CONTROL_HANGUP;
@@ -1009,22 +1007,22 @@
if (option_verbose > 1)
ast_verbose(VERBOSE_PREFIX_2 "%s: Dialend\n", p->dev);
} else {
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
}
break;
case VPB_PLAY_UNDERFLOW:
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
vpb_reset_play_fifo_alarm(p->handle);
break;
case VPB_RECORD_OVERFLOW:
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
vpb_reset_record_fifo_alarm(p->handle);
break;
default:
- f.frametype = -1;
+ f.frametype = AST_FRAME_NULL;
break;
}
@@ -1831,7 +1829,12 @@
return 0;
}
-static int vpb_digit(struct ast_channel *ast, char digit)
+static int vpb_digit_begin(struct ast_channel *ast, char digit)
+{
+ /* XXX Modify this callback to let Asterisk control the length of DTMF */
+ return 0;
+}
+static int vpb_digit_end(struct ast_channel *ast, char digit)
{
struct vpb_pvt *p = (struct vpb_pvt *)ast->tech_pvt;
char s[2];
Modified: team/murf/AEL-blockcomments/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/murf/AEL-blockcomments/channels/chan_zap.c?rev=41526&r1=41525&r2=41526&view=diff
==============================================================================
--- team/murf/AEL-blockcomments/channels/chan_zap.c (original)
+++ team/murf/AEL-blockcomments/channels/chan_zap.c Wed Aug 30 21:36:02 2006
@@ -690,10 +690,12 @@
#endif
int polarity;
int dsp_features;
+ char begindigit;
} *iflist = NULL, *ifend = NULL;
static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause);
-static int zt_digit(struct ast_channel *ast, char digit);
+static int zt_digit_begin(struct ast_channel *ast, char digit);
+static int zt_digit_end(struct ast_channel *ast, char digit);
static int zt_sendtext(struct ast_channel *c, const char *text);
static int zt_call(struct ast_channel *ast, char *rdest, int timeout);
static int zt_hangup(struct ast_channel *ast);
@@ -711,7 +713,8 @@
.description = tdesc,
.capabilities = AST_FORMAT_SLINEAR | AST_FORMAT_ULAW | AST_FORMAT_ALAW,
.requester = zt_request,
- .send_digit = zt_digit,
+ .send_digit_begin = zt_digit_begin,
+ .send_digit_end = zt_digit_end,
.send_text = zt_sendtext,
.call = zt_call,
.hangup = zt_hangup,
@@ -1002,45 +1005,113 @@
return 0;
}
-static int zt_digit(struct ast_channel *ast, char digit)
-{
- ZT_DIAL_OPERATION zo;
- struct zt_pvt *p;
+static int digit_to_dtmfindex(char digit)
+{
+ if (isdigit(digit))
+ return ZT_TONE_DTMF_BASE + (digit - '0');
+ else if (digit >= 'A' && digit <= 'D')
+ return ZT_TONE_DTMF_A + (digit - 'A');
+ else if (digit >= 'a' && digit <= 'd')
+ return ZT_TONE_DTMF_A + (digit - 'a');
+ else if (digit == '*')
+ return ZT_TONE_DTMF_s;
+ else if (digit == '#')
+ return ZT_TONE_DTMF_p;
+ else
+ return -1;
+}
+
+static int zt_digit_begin(struct ast_channel *chan, char digit)
+{
+ struct zt_pvt *pvt;
+ int index;
+ int dtmf = -1;
+
+ pvt = chan->tech_pvt;
+
+ ast_mutex_lock(&pvt->lock);
+
+ index = zt_get_index(chan, pvt, 0);
+
+ if ((index != SUB_REAL) || !pvt->owner)
+ goto out;
+
+#ifdef HAVE_PRI
+ if ((pvt->sig == SIG_PRI) && (chan->_state == AST_STATE_DIALING) && !pvt->proceeding) {
+ if (pvt->setup_ack) {
+ if (!pri_grab(pvt, pvt->pri)) {
+ pri_information(pvt->pri->pri, pvt->call, digit);
+ pri_rel(pvt->pri);
+ } else
+ ast_log(LOG_WARNING, "Unable to grab PRI on span %d\n", pvt->span);
+ } else if (strlen(pvt->dialdest) < sizeof(pvt->dialdest) - 1) {
[... 1608 lines stripped ...]
More information about the svn-commits
mailing list