Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv8206
Modified Files:
chan_h323.c
Log Message:
Lets try this - an attempt to properly deal with DTMF
Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- chan_h323.c 15 Sep 2005 03:16:07 -0000 1.126
+++ chan_h323.c 15 Sep 2005 03:26:02 -0000 1.127
@@ -347,22 +347,30 @@
{
struct oh323_pvt *pvt = (struct oh323_pvt *) c->tech_pvt;
char *token;
- if (h323debug)
- ast_log(LOG_DEBUG, "Sending digit %c on %s\n", digit, c->name);
- if (!pvt)
+
+ if (!pvt) {
+ ast_log(LOG_ERROR, "No private structure?! This is bad\n";
return -1;
+ }
ast_mutex_lock(&pvt->lock);
if (pvt->rtp && (pvt->options.dtmfmode & H323_DTMF_RFC2833)) {
+ /* out-of-band DTMF */
+ if (h323debug) {
+ ast_log(LOG_DEBUG, "Sending out-of-band digit %c on
%s\n", digit, c->name);
+ }
ast_rtp_senddigit(pvt->rtp, digit);
+ } else {
+ /* in-band DTMF */
+ if (h323debug) {
+ ast_log(LOG_DEBUG, "Sending inband digit %c on %s\n",
digit, c->name);
+ }
+ token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
+ h323_send_tone(token, digit);
+ if (token) {
+ free(token);
+ }
}
- /* If in-band DTMF is desired, send that */
- if (h323debug)
- ast_log(LOG_DEBUG, "Sending digit %c on %s\n", digit, c->name);
- token = pvt->cd.call_token ? strdup(pvt->cd.call_token) : NULL;
ast_mutex_unlock(&pvt->lock);
- h323_send_tone(token, digit);
- if (token)
- free(token);
oh323_update_info(c);
return 0;
}
_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs
