[asterisk-commits] qwell: branch qwell/ast_log-channelize r51323 -
in /team/qwell/ast_log-channe...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Fri Jan 19 11:25:50 MST 2007
Author: qwell
Date: Fri Jan 19 12:25:49 2007
New Revision: 51323
URL: http://svn.digium.com/view/asterisk?view=rev&rev=51323
Log:
Merged revisions 51308-51310,51312,51314 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r51308 | rizzo | 2007-01-19 11:38:28 -0600 (Fri, 19 Jan 2007) | 3 lines
remove variable declaration in the middle of a block
................
r51309 | rizzo | 2007-01-19 11:45:46 -0600 (Fri, 19 Jan 2007) | 4 lines
sizeof() is compatible with format %d so don't be too
picky on printf formats.
................
r51310 | rizzo | 2007-01-19 11:48:48 -0600 (Fri, 19 Jan 2007) | 4 lines
in the interest of portability, avoid using %zd when all
we need is to print is an integer that fits in 16 bits.
................
r51312 | rizzo | 2007-01-19 12:00:00 -0600 (Fri, 19 Jan 2007) | 10 lines
As the comment in the diff says:
AST_INLINE_API() is a macro that takes a block of code as an argument.
Using preprocessor #directives in the argument is not supported by all
compilers, and it is a bit of an obfuscation anyways, so avoid it.
As a workaround, define a macro that produces either its argument
or nothing, and use that instead of #ifdef/#endif within the
argument to AST_INLINE_API().
................
r51314 | russell | 2007-01-19 12:06:03 -0600 (Fri, 19 Jan 2007) | 31 lines
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
................
Modified:
team/qwell/ast_log-channelize/ (props changed)
team/qwell/ast_log-channelize/channels/chan_agent.c
team/qwell/ast_log-channelize/channels/chan_alsa.c
team/qwell/ast_log-channelize/channels/chan_features.c
team/qwell/ast_log-channelize/channels/chan_gtalk.c
team/qwell/ast_log-channelize/channels/chan_h323.c
team/qwell/ast_log-channelize/channels/chan_iax2.c
team/qwell/ast_log-channelize/channels/chan_jingle.c
team/qwell/ast_log-channelize/channels/chan_local.c
team/qwell/ast_log-channelize/channels/chan_mgcp.c
team/qwell/ast_log-channelize/channels/chan_misdn.c
team/qwell/ast_log-channelize/channels/chan_oss.c
team/qwell/ast_log-channelize/channels/chan_phone.c
team/qwell/ast_log-channelize/channels/chan_sip.c
team/qwell/ast_log-channelize/channels/chan_skinny.c
team/qwell/ast_log-channelize/channels/chan_zap.c
team/qwell/ast_log-channelize/include/asterisk/channel.h
team/qwell/ast_log-channelize/include/asterisk/strings.h
team/qwell/ast_log-channelize/main/channel.c
team/qwell/ast_log-channelize/main/frame.c
team/qwell/ast_log-channelize/main/rtp.c
Propchange: team/qwell/ast_log-channelize/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/qwell/ast_log-channelize/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 19 12:25:49 2007
@@ -1,1 +1,1 @@
-/trunk:1-51305
+/trunk:1-51322
Modified: team/qwell/ast_log-channelize/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_agent.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_agent.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_agent.c Fri Jan 19 12:25:49 2007
@@ -230,7 +230,7 @@
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_begin(struct ast_channel *ast, char digit);
-static int agent_digit_end(struct ast_channel *ast, char digit);
+static int agent_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
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);
@@ -610,12 +610,12 @@
return res;
}
-static int agent_digit_end(struct ast_channel *ast, char digit)
+static int agent_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct agent_pvt *p = ast->tech_pvt;
int res = -1;
ast_mutex_lock(&p->lock);
- ast_senddigit_end(p->chan, digit);
+ ast_senddigit_end(p->chan, digit, duration);
ast_mutex_unlock(&p->lock);
return res;
}
Modified: team/qwell/ast_log-channelize/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_alsa.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_alsa.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_alsa.c Fri Jan 19 12:25:49 2007
@@ -185,7 +185,7 @@
/* ZZ */
static struct ast_channel *alsa_request(const char *type, int format, void *data, int *cause);
-static int alsa_digit(struct ast_channel *c, char digit);
+static int alsa_digit(struct ast_channel *c, char digit, unsigned int duration);
static int alsa_text(struct ast_channel *c, const char *text);
static int alsa_hangup(struct ast_channel *c);
static int alsa_answer(struct ast_channel *c);
@@ -494,10 +494,11 @@
return readdev;
}
-static int alsa_digit(struct ast_channel *c, char digit)
-{
- ast_mutex_lock(&alsalock);
- ast_verbose(" << Console Received digit %c >> \n", digit);
+static int alsa_digit(struct ast_channel *c, char digit, unsigned int duration)
+{
+ ast_mutex_lock(&alsalock);
+ ast_verbose(" << Console Received digit %c of duration %u ms >> \n",
+ digit, duration);
ast_mutex_unlock(&alsalock);
return 0;
}
Modified: team/qwell/ast_log-channelize/channels/chan_features.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_features.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_features.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_features.c Fri Jan 19 12:25:49 2007
@@ -93,7 +93,7 @@
static struct ast_channel *features_request(const char *type, int format, void *data, int *cause);
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_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
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);
@@ -316,7 +316,7 @@
return res;
}
-static int features_digit_end(struct ast_channel *ast, char digit)
+static int features_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct feature_pvt *p = ast->tech_pvt;
int res = -1;
@@ -326,7 +326,7 @@
ast_mutex_lock(&p->lock);
x = indexof(p, ast, 0);
if (!x && p->subchan)
- res = ast_senddigit_end(p->subchan, digit);
+ res = ast_senddigit_end(p->subchan, digit, duration);
ast_mutex_unlock(&p->lock);
return res;
}
Modified: team/qwell/ast_log-channelize/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_gtalk.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_gtalk.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_gtalk.c Fri Jan 19 12:25:49 2007
@@ -170,7 +170,9 @@
/* Forward declarations */
static struct ast_channel *gtalk_request(const char *type, int format, void *data, int *cause);
-static int gtalk_digit(struct ast_channel *ast, char digit);
+static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duration);
+static int gtalk_digit_begin(struct ast_channel *ast, char digit);
+static int gtalk_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
static int gtalk_call(struct ast_channel *ast, char *dest, int timeout);
static int gtalk_hangup(struct ast_channel *ast);
static int gtalk_answer(struct ast_channel *ast);
@@ -195,8 +197,8 @@
.description = "Gtalk Channel Driver",
.capabilities = ((AST_FORMAT_MAX_AUDIO << 1) - 1),
.requester = gtalk_request,
- .send_digit_begin = gtalk_digit,
- .send_digit_end = gtalk_digit,
+ .send_digit_begin = gtalk_digit_begin,
+ .send_digit_end = gtalk_digit_end,
.bridge = ast_rtp_bridge,
.call = gtalk_call,
.hangup = gtalk_hangup,
@@ -1338,7 +1340,17 @@
return res;
}
-static int gtalk_digit(struct ast_channel *ast, char digit)
+static int gtalk_digit_begin(struct ast_channel *chan, char digit)
+{
+ return gtalk_digit(chan, digit, 0);
+}
+
+static int gtalk_digit_end(struct ast_channel *chan, char digit, unsigned int duration)
+{
+ return gtalk_digit(chan, digit, duration);
+}
+
+static int gtalk_digit(struct ast_channel *ast, char digit, unsigned int duration)
{
struct gtalk_pvt *p = ast->tech_pvt;
struct gtalk *client = p->parent;
@@ -1373,8 +1385,8 @@
iks_insert_node(gtalk, dtmf);
ast_mutex_lock(&p->lock);
- if(ast->dtmff.frametype == AST_FRAME_DTMF) {
- ast_verbose("Sending 250ms dtmf!\n");
+ if (ast->dtmff.frametype == AST_FRAME_DTMF) {
+ ast_log(LOG_DEBUG, "Sending 250ms dtmf!\n");
} else if (ast->dtmff.frametype == AST_FRAME_DTMF_BEGIN) {
iks_insert_attrib(dtmf, "action", "button-down");
} else if (ast->dtmff.frametype == AST_FRAME_DTMF_END) {
Modified: team/qwell/ast_log-channelize/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_h323.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_h323.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_h323.c Fri Jan 19 12:25:49 2007
@@ -235,7 +235,7 @@
static struct ast_channel *oh323_request(const char *type, int format, void *data, int *cause);
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_digit_end(struct ast_channel *c, char digit, unsigned int duration);
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);
@@ -548,7 +548,7 @@
* Send (play) the specified digit to the channel.
*
*/
-static int oh323_digit_end(struct ast_channel *c, char digit)
+static int oh323_digit_end(struct ast_channel *c, char digit, unsigned int duration)
{
struct oh323_pvt *pvt = (struct oh323_pvt *) c->tech_pvt;
char *token;
Modified: team/qwell/ast_log-channelize/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_iax2.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_iax2.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_iax2.c Fri Jan 19 12:25:49 2007
@@ -817,7 +817,7 @@
static int iax2_call(struct ast_channel *c, char *dest, int timeout);
static int iax2_devicestate(void *data);
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_digit_end(struct ast_channel *c, char digit, unsigned int duration);
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);
@@ -2476,7 +2476,7 @@
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)
+static int iax2_digit_end(struct ast_channel *c, char digit, unsigned int duration)
{
return send_command_locked(PTR_TO_CALLNO(c->tech_pvt), AST_FRAME_DTMF_END, digit, 0, NULL, 0, -1);
}
@@ -6352,8 +6352,8 @@
return 1;
if (packet_len < (sizeof(*meta) + sizeof(*mth))) {
- ast_log(NULL, LOG_WARNING, "midget meta trunk packet received (%d of %zd min)\n", packet_len,
- sizeof(*meta) + sizeof(*mth));
+ ast_log(NULL, LOG_WARNING, "midget meta trunk packet received (%d of %d min)\n", packet_len,
+ (int) (sizeof(*meta) + sizeof(*mth)));
return 1;
}
mth = (struct ast_iax2_meta_trunk_hdr *)(meta->data);
@@ -6523,7 +6523,7 @@
memcpy(&sin, &thread->iosin, sizeof(sin));
if (res < sizeof(*mh)) {
- ast_log(NULL, LOG_WARNING, "midget packet received (%d of %zd min)\n", res, sizeof(*mh));
+ ast_log(NULL, LOG_WARNING, "midget packet received (%d of %d min)\n", res, (int) sizeof(*mh));
return 1;
}
if ((vh->zeros == 0) && (ntohs(vh->callno) & 0x8000)) {
@@ -6684,7 +6684,7 @@
}
/* A full frame */
if (res < sizeof(*fh)) {
- ast_log(NULL, LOG_WARNING, "midget packet received (%d of %zd min)\n", res, sizeof(*fh));
+ ast_log(NULL, LOG_WARNING, "midget packet received (%d of %d min)\n", res, (int) sizeof(*fh));
ast_mutex_unlock(&iaxsl[fr->callno]);
return 1;
}
Modified: team/qwell/ast_log-channelize/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_jingle.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_jingle.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_jingle.c Fri Jan 19 12:25:49 2007
@@ -169,7 +169,7 @@
/* Forward declarations */
static struct ast_channel *jingle_request(const char *type, int format, void *data, int *cause);
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_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
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);
@@ -1182,13 +1182,7 @@
return res;
}
-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)
+static int jingle_digit(struct ast_channel *ast, char digit, unsigned int duration)
{
struct jingle_pvt *p = ast->tech_pvt;
struct jingle *client = p->parent;
@@ -1223,9 +1217,7 @@
iks_insert_node(jingle, dtmf);
ast_mutex_lock(&p->lock);
- if(ast->dtmff.frametype == AST_FRAME_DTMF) {
- ast_verbose("Sending 250ms dtmf!\n");
- } else if (ast->dtmff.frametype == AST_FRAME_DTMF_BEGIN) {
+ if (ast->dtmff.frametype == AST_FRAME_DTMF_BEGIN) {
iks_insert_attrib(dtmf, "action", "button-down");
} else if (ast->dtmff.frametype == AST_FRAME_DTMF_END) {
iks_insert_attrib(dtmf, "action", "button-up");
@@ -1236,6 +1228,16 @@
iks_delete(dtmf);
ast_mutex_unlock(&p->lock);
return 0;
+}
+
+static int jingle_digit_begin(struct ast_channel *chan, char digit)
+{
+ return jingle_digit(chan, digit, 0);
+}
+
+static int jingle_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
+{
+ return jingle_digit(ast, digit, duration);
}
static int jingle_sendhtml(struct ast_channel *ast, int subclass, const char *data, int datalen)
Modified: team/qwell/ast_log-channelize/channels/chan_local.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_local.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_local.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_local.c Fri Jan 19 12:25:49 2007
@@ -68,7 +68,7 @@
static struct ast_channel *local_request(const char *type, int format, void *data, int *cause);
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_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
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);
@@ -368,7 +368,7 @@
return res;
}
-static int local_digit_end(struct ast_channel *ast, char digit)
+static int local_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct local_pvt *p = ast->tech_pvt;
int res = -1;
@@ -381,6 +381,7 @@
ast_mutex_lock(&p->lock);
isoutbound = IS_OUTBOUND(ast, p);
f.subclass = digit;
+ f.len = duration;
res = local_queue_frame(p, isoutbound, &f, ast);
ast_mutex_unlock(&p->lock);
Modified: team/qwell/ast_log-channelize/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_mgcp.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_mgcp.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_mgcp.c Fri Jan 19 12:25:49 2007
@@ -428,7 +428,7 @@
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_begin(struct ast_channel *ast, char digit);
-static int mgcp_senddigit_end(struct ast_channel *ast, char digit);
+static int mgcp_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration);
static int mgcp_devicestate(void *data);
static const struct ast_channel_tech mgcp_tech = {
@@ -1282,7 +1282,7 @@
return -1;
}
-static int mgcp_senddigit_end(struct ast_channel *ast, char digit)
+static int mgcp_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct mgcp_subchannel *sub = ast->tech_pvt;
char tmp[4];
Modified: team/qwell/ast_log-channelize/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_misdn.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_misdn.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_misdn.c Fri Jan 19 12:25:49 2007
@@ -2067,7 +2067,7 @@
return 0;
}
-static int misdn_digit_end(struct ast_channel *ast, char digit )
+static int misdn_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct chan_list *p;
Modified: team/qwell/ast_log-channelize/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_oss.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_oss.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_oss.c Fri Jan 19 12:25:49 2007
@@ -406,7 +406,7 @@
static struct ast_channel *oss_request(const char *type, int format, void *data
, int *cause);
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_digit_end(struct ast_channel *c, char digit, unsigned int duration);
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);
@@ -776,10 +776,11 @@
return 0;
}
-static int oss_digit_end(struct ast_channel *c, char digit)
+static int oss_digit_end(struct ast_channel *c, char digit, unsigned int duration)
{
/* no better use for received digits than print them */
- ast_verbose(" << Console Received digit %c >> \n", digit);
+ ast_verbose(" << Console Received digit %c of duration %u ms >> \n",
+ digit, duration);
return 0;
}
Modified: team/qwell/ast_log-channelize/channels/chan_phone.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_phone.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_phone.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_phone.c Fri Jan 19 12:25:49 2007
@@ -156,7 +156,7 @@
static struct ast_channel *phone_request(const char *type, int format, void *data, int *cause);
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_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
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);
@@ -244,12 +244,12 @@
return 0;
}
-static int phone_digit_end(struct ast_channel *ast, char digit)
+static int phone_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct phone_pvt *p;
int outdigit;
p = ast->tech_pvt;
- ast_log(NULL, LOG_NOTICE, "Dialed %c\n", digit);
+ ast_log(NULL, LOG_DEBUG, "Dialed %c\n", digit);
switch(digit) {
case '0':
case '1':
@@ -280,7 +280,7 @@
ast_log(NULL, LOG_WARNING, "Unknown digit '%c'\n", digit);
return -1;
}
- ast_log(NULL, LOG_NOTICE, "Dialed %d\n", outdigit);
+ ast_log(NULL, LOG_DEBUG, "Dialed %d\n", outdigit);
ioctl(p->fd, PHONE_PLAY_TONE, outdigit);
p->lastformat = -1;
return 0;
@@ -333,7 +333,7 @@
{
digit++;
while (*digit)
- phone_digit_end(ast, *digit++);
+ phone_digit_end(ast, *digit++, 0);
}
}
Modified: team/qwell/ast_log-channelize/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_sip.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_sip.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_sip.c Fri Jan 19 12:25:49 2007
@@ -1228,7 +1228,7 @@
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_begin(struct ast_channel *ast, char digit);
-static int sip_senddigit_end(struct ast_channel *ast, char digit);
+static int sip_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration);
/*--- Transmitting responses and requests */
static int sipsock_read(int *id, int fd, short events, void *ignore);
@@ -1250,7 +1250,7 @@
static int transmit_request_with_auth(struct sip_pvt *p, int sipmethod, int seqno, enum xmittype reliable, int newbranch);
static int transmit_invite(struct sip_pvt *p, int sipmethod, int sdp, int init);
static int transmit_reinvite_with_sdp(struct sip_pvt *p, int t38version);
-static int transmit_info_with_digit(struct sip_pvt *p, const char digit);
+static int transmit_info_with_digit(struct sip_pvt *p, const char digit, unsigned int duration);
static int transmit_info_with_vidupdate(struct sip_pvt *p);
static int transmit_message_with_text(struct sip_pvt *p, const char *text);
static int transmit_refer(struct sip_pvt *p, const char *dest);
@@ -1495,7 +1495,7 @@
static int add_header_contentLength(struct sip_request *req, int len);
static int add_line(struct sip_request *req, const char *line);
static int add_text(struct sip_request *req, const char *text);
-static int add_digit(struct sip_request *req, char digit);
+static int add_digit(struct sip_request *req, char digit, unsigned int duration);
static int add_vidupdate(struct sip_request *req);
static void add_route(struct sip_request *req, struct sip_route *route);
static int copy_header(struct sip_request *req, const struct sip_request *orig, const char *field);
@@ -1561,6 +1561,30 @@
.send_digit_end = sip_senddigit_end,
.bridge = ast_rtp_bridge,
.early_bridge = ast_rtp_early_bridge,
+ .send_text = sip_sendtext,
+};
+
+/*! \brief This version of the sip channel tech has no send_digit_begin
+ * callback. This is for use with channels using SIP INFO DTMF so that
+ * the core knows that the channel doesn't want DTMF BEGIN frames. */
+static const struct ast_channel_tech sip_tech_info = {
+ .type = "SIP",
+ .description = "Session Initiation Protocol (SIP)",
+ .capabilities = ((AST_FORMAT_MAX_AUDIO << 1) - 1),
+ .properties = AST_CHAN_TP_WANTSJITTER | AST_CHAN_TP_CREATESJITTER,
+ .requester = sip_request_call,
+ .devicestate = sip_devicestate,
+ .call = sip_call,
+ .hangup = sip_hangup,
+ .answer = sip_answer,
+ .read = sip_read,
+ .write = sip_write,
+ .write_video = sip_write,
+ .indicate = sip_indicate,
+ .transfer = sip_transfer,
+ .fixup = sip_fixup,
+ .send_digit_end = sip_senddigit_end,
+ .bridge = ast_rtp_bridge,
.send_text = sip_sendtext,
};
@@ -3688,7 +3712,7 @@
/*! \brief Send DTMF character on SIP channel
within one call, we're able to transmit in many methods simultaneously */
-static int sip_senddigit_end(struct ast_channel *ast, char digit)
+static int sip_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
struct sip_pvt *p = ast->tech_pvt;
int res = 0;
@@ -3696,7 +3720,7 @@
sip_pvt_lock(p);
switch (ast_test_flag(&p->flags[0], SIP_DTMF)) {
case SIP_DTMF_INFO:
- transmit_info_with_digit(p, digit);
+ transmit_info_with_digit(p, digit, duration);
break;
case SIP_DTMF_RFC2833:
if (p->rtp)
@@ -3857,7 +3881,11 @@
return NULL;
}
sip_pvt_lock(i);
- tmp->tech = &sip_tech;
+
+ if (ast_test_flag(&i->flags[0], SIP_DTMF) == SIP_DTMF_INFO)
+ tmp->tech = &sip_tech_info;
+ else
+ tmp->tech = &sip_tech;
/* Select our native format based on codec preference until we receive
something from another device to the contrary. */
@@ -5927,11 +5955,11 @@
/*! \brief Add DTMF INFO tone to sip message */
/* Always adds default duration 250 ms, regardless of what came in over the line */
-static int add_digit(struct sip_request *req, char digit)
+static int add_digit(struct sip_request *req, char digit, unsigned int duration)
{
char tmp[256];
- snprintf(tmp, sizeof(tmp), "Signal=%c\r\nDuration=250\r\n", digit);
+ snprintf(tmp, sizeof(tmp), "Signal=%c\r\nDuration=%u\r\n", digit, duration);
add_header(req, "Content-Type", "application/dtmf-relay");
add_header_contentLength(req, strlen(tmp));
add_line(req, tmp);
@@ -7491,12 +7519,12 @@
/*! \brief Send SIP INFO dtmf message, see Cisco documentation on cisco.com */
-static int transmit_info_with_digit(struct sip_pvt *p, const char digit)
+static int transmit_info_with_digit(struct sip_pvt *p, const char digit, unsigned int duration)
{
struct sip_request req;
reqprep(&req, p, SIP_INFO, 0, 1);
- add_digit(&req, digit);
+ add_digit(&req, digit, duration);
return send_request(p, &req, XMIT_RELIABLE, p->ocseq);
}
@@ -10881,6 +10909,7 @@
/* Need to check the media/type */
if (!strcasecmp(c, "application/dtmf-relay") ||
!strcasecmp(c, "application/vnd.nortelnetworks.digits")) {
+ unsigned int duration = 0;
/* Try getting the "signal=" part */
if (ast_strlen_zero(c = get_body(req, "Signal")) && ast_strlen_zero(c = get_body(req, "d"))) {
@@ -10890,7 +10919,12 @@
} else {
ast_copy_string(buf, c, sizeof(buf));
}
-
+
+ if (!ast_strlen_zero((c = get_body(req, "Duration"))))
+ duration = atoi(c);
+ if (!duration)
+ duration = 100; /* 100 ms */
+
if (!p->owner) { /* not a PBX call */
transmit_response(p, "481 Call leg/transaction does not exist", req);
sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
@@ -10928,6 +10962,7 @@
} else if (event < 16) {
f.subclass = 'A' + (event - 12);
}
+ f.len = duration;
ast_queue_frame(p->owner, &f);
if (sipdebug)
ast_verbose("* DTMF-relay event received: %c\n", f.subclass);
@@ -11428,7 +11463,7 @@
}
ast_channel_lock(chan);
- if (chan->tech != &sip_tech) {
+ if (chan->tech != &sip_tech && chan->tech != &sip_tech_info) {
ast_log(NULL, LOG_WARNING, "This function can only be used on SIP channels.\n");
ast_channel_unlock(chan);
return -1;
@@ -11603,7 +11638,7 @@
}
ast_channel_lock(chan);
- if (chan->tech != &sip_tech) {
+ if (chan->tech != &sip_tech && chan->tech != &sip_tech_info) {
ast_log(NULL, LOG_WARNING, "This function can only be used on SIP channels.\n");
ast_channel_unlock(chan);
return -1;
@@ -11851,7 +11886,7 @@
ast_log(NULL, LOG_WARNING, "Ooooh.. no tech! That's REALLY bad\n");
break;
}
- if (bridgepeer->tech == &sip_tech) {
+ if (bridgepeer->tech == &sip_tech || bridgepeer->tech == &sip_tech_info) {
bridgepvt = (struct sip_pvt*)(bridgepeer->tech_pvt);
if (bridgepvt->udptl) {
if (p->t38.state == T38_PEER_REINVITE) {
@@ -13654,7 +13689,7 @@
if ((bridgepeer = ast_bridged_channel(p->owner))) {
/* We have a bridge, and this is re-invite to switchover to T38 so we send re-invite with T38 SDP, to other side of bridge*/
/*! XXX: we should also check here does the other side supports t38 at all !!! XXX */
- if (bridgepeer->tech == &sip_tech) {
+ if (bridgepeer->tech == &sip_tech || bridgepeer->tech == &sip_tech_info) {
bridgepvt = (struct sip_pvt*)bridgepeer->tech_pvt;
if (bridgepvt->t38.state == T38_DISABLED) {
if (bridgepvt->udptl) { /* If everything is OK with other side's udptl struct */
@@ -13708,7 +13743,7 @@
struct ast_channel *bridgepeer = NULL;
struct sip_pvt *bridgepvt = NULL;
if ((bridgepeer = ast_bridged_channel(p->owner))) {
- if (bridgepeer->tech == &sip_tech) {
+ if (bridgepeer->tech == &sip_tech || bridgepeer->tech == &sip_tech_info) {
bridgepvt = (struct sip_pvt*)bridgepeer->tech_pvt;
/* Does the bridged peer have T38 ? */
if (bridgepvt->t38.state == T38_ENABLED) {
@@ -17015,7 +17050,7 @@
return 0;
}
ast_channel_lock(chan);
- if (chan->tech != &sip_tech) {
+ if (chan->tech != &sip_tech && chan->tech != &sip_tech_info) {
ast_log(NULL, LOG_WARNING, "Call this application only on SIP incoming calls\n");
ast_channel_unlock(chan);
return 0;
Modified: team/qwell/ast_log-channelize/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_skinny.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_skinny.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_skinny.c Fri Jan 19 12:25:49 2007
@@ -1028,7 +1028,7 @@
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_begin(struct ast_channel *ast, char digit);
-static int skinny_senddigit_end(struct ast_channel *ast, char digit);
+static int skinny_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration);
static const struct ast_channel_tech skinny_tech = {
.type = "Skinny",
@@ -2565,7 +2565,7 @@
return -1; /* Start inband indications */
}
-static int skinny_senddigit_end(struct ast_channel *ast, char digit)
+static int skinny_senddigit_end(struct ast_channel *ast, char digit, unsigned int duration)
{
#if 0
struct skinny_subchannel *sub = ast->tech_pvt;
Modified: team/qwell/ast_log-channelize/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/channels/chan_zap.c?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/channels/chan_zap.c (original)
+++ team/qwell/ast_log-channelize/channels/chan_zap.c Fri Jan 19 12:25:49 2007
@@ -724,7 +724,7 @@
static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause);
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_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
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);
@@ -1170,7 +1170,7 @@
return 0;
}
-static int zt_digit_end(struct ast_channel *chan, char digit)
+static int zt_digit_end(struct ast_channel *chan, char digit, unsigned int duration)
{
struct zt_pvt *pvt;
int res = 0;
@@ -11726,9 +11726,10 @@
|| !strcasecmp(v->name, "crv")
#endif
) {
+ int iscrv;
if (skipchannels)
continue;
- int iscrv = !strcasecmp(v->name, "crv");
+ iscrv = !strcasecmp(v->name, "crv");
if (build_channels(*confp, iscrv, v->value, reload, v->lineno, &found_pseudo))
return -1;
} else if (!strcasecmp(v->name, "zapchan")) {
Modified: team/qwell/ast_log-channelize/include/asterisk/channel.h
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/include/asterisk/channel.h?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/include/asterisk/channel.h (original)
+++ team/qwell/ast_log-channelize/include/asterisk/channel.h Fri Jan 19 12:25:49 2007
@@ -242,7 +242,7 @@
int (* const send_digit_begin)(struct ast_channel *chan, char digit);
/*! \brief Stop sending a literal DTMF digit */
- int (* const send_digit_end)(struct ast_channel *chan, char digit);
+ int (* const send_digit_end)(struct ast_channel *chan, char digit, unsigned int duration);
/*! \brief Call a given phone number (address, etc), but don't
take longer than timeout seconds to do so. */
@@ -479,7 +479,8 @@
struct ast_jb jb; /*!< The jitterbuffer state */
char emulate_dtmf_digit; /*!< Digit being emulated */
- unsigned int emulate_dtmf_samples; /*!< Number of samples left to emulate DTMF for */
+ unsigned int emulate_dtmf_duration; /*!< Number of ms left to emulate DTMF for */
+ struct timeval dtmf_begin_tv; /*!< The time that an in process digit began */
/*! \brief Data stores on the channel */
AST_LIST_HEAD_NOLOCK(datastores, ast_datastore) datastores;
@@ -498,34 +499,37 @@
/*! \brief ast_channel flags */
enum {
/*! Queue incoming dtmf, to be released when this flag is turned off */
- AST_FLAG_DEFER_DTMF = (1 << 1),
+ AST_FLAG_DEFER_DTMF = (1 << 1),
/*! write should be interrupt generator */
- AST_FLAG_WRITE_INT = (1 << 2),
+ AST_FLAG_WRITE_INT = (1 << 2),
/*! a thread is blocking on this channel */
- AST_FLAG_BLOCKING = (1 << 3),
+ AST_FLAG_BLOCKING = (1 << 3),
/*! This is a zombie channel */
- AST_FLAG_ZOMBIE = (1 << 4),
+ AST_FLAG_ZOMBIE = (1 << 4),
/*! There is an exception pending */
- AST_FLAG_EXCEPTION = (1 << 5),
+ AST_FLAG_EXCEPTION = (1 << 5),
/*! Listening to moh XXX anthm promises me this will disappear XXX */
- AST_FLAG_MOH = (1 << 6),
+ AST_FLAG_MOH = (1 << 6),
/*! This channel is spying on another channel */
- AST_FLAG_SPYING = (1 << 7),
+ AST_FLAG_SPYING = (1 << 7),
/*! This channel is in a native bridge */
- AST_FLAG_NBRIDGE = (1 << 8),
+ AST_FLAG_NBRIDGE = (1 << 8),
/*! the channel is in an auto-incrementing dialplan processor,
* so when ->priority is set, it will get incremented before
* finding the next priority to run */
- AST_FLAG_IN_AUTOLOOP = (1 << 9),
+ AST_FLAG_IN_AUTOLOOP = (1 << 9),
/*! This is an outgoing call */
- AST_FLAG_OUTGOING = (1 << 10),
+ AST_FLAG_OUTGOING = (1 << 10),
/*! This channel is being whispered on */
- AST_FLAG_WHISPER = (1 << 11),
+ AST_FLAG_WHISPER = (1 << 11),
/*! A DTMF_BEGIN frame has been read from this channel, but not yet an END */
- AST_FLAG_IN_DTMF = (1 << 12),
+ AST_FLAG_IN_DTMF = (1 << 12),
/*! A DTMF_END was received when not IN_DTMF, so the length of the digit is
* currently being emulated */
- AST_FLAG_EMULATE_DTMF = (1 << 13),
+ AST_FLAG_EMULATE_DTMF = (1 << 13),
+ /*! This is set to tell the channel not to generate DTMF begin frames, and
+ * to instead only generate END frames. */
+ AST_FLAG_END_DTMF_ONLY = (1 << 14),
};
/*! \brief ast_bridge_config flags */
@@ -934,14 +938,16 @@
* \return Returns 0 on success, -1 on failure
*/
int ast_senddigit_begin(struct ast_channel *chan, char digit);
+
/*! \brief Send a DTMF digit to a channel
* Send a DTMF digit to a channel.
* \param chan channel to act upon
* \param digit the DTMF digit to send, encoded in ASCII
+ * \param duration the duration of the digit ending in ms
* \return Returns 0 on success, -1 on failure
*/
-int ast_senddigit_end(struct ast_channel *chan, char digit);
+int ast_senddigit_end(struct ast_channel *chan, char digit, unsigned int duration);
/*! \brief Receives a text string from a channel
* Read a string of text from a channel
Modified: team/qwell/ast_log-channelize/include/asterisk/strings.h
URL: http://svn.digium.com/view/asterisk/team/qwell/ast_log-channelize/include/asterisk/strings.h?view=diff&rev=51323&r1=51322&r2=51323
==============================================================================
--- team/qwell/ast_log-channelize/include/asterisk/strings.h (original)
+++ team/qwell/ast_log-channelize/include/asterisk/strings.h Fri Jan 19 12:25:49 2007
@@ -361,15 +361,27 @@
}
)
+/*
+ * AST_INLINE_API() is a macro that takes a block of code as an argument.
+ * Using preprocessor #directives in the argument is not supported by all
+ * compilers, and it is a bit of an obfuscation anyways, so avoid it.
+ * As a workaround, define a macro that produces either its argument
+ * or nothing, and use that instead of #ifdef/#endif within the
+ * argument to AST_INLINE_API().
+ */
+#if defined(DEBUG_THREADLOCALS)
+#define _DB1(x) x
+#else
+#define _DB1(x)
+#endif
+
/*!
* Make space in a new string (e.g. to read in data from a file)
*/
AST_INLINE_API(
int ast_str_make_space(struct ast_str **buf, size_t new_len),
{
-#if defined(DEBUG_THREADLOCALS)
- struct ast_str *old_buf = *buf;
-#endif /* defined(DEBUG_THREADLOCALS) */
+ _DB1(struct ast_str *old_buf = *buf;)
if (new_len <= (*buf)->len)
return 0; /* success */
[... 364 lines stripped ...]
More information about the asterisk-commits
mailing list