summaryrefslogtreecommitdiff
path: root/addons/chan_ooh323.c
diff options
context:
space:
mode:
authorAlexandr Anikin <may@telecom-service.ru>2009-12-03 20:26:55 +0000
committerAlexandr Anikin <may@telecom-service.ru>2009-12-03 20:26:55 +0000
commit4d19e3eb4b6ab0e2b73e8adbcaa686b859037bd4 (patch)
tree57cdb80b0eac74690e13c2aa10e98884af4403f2 /addons/chan_ooh323.c
parentafee39cb4c89a5ebc5a75a1b9555d4f9d7fa3fdd (diff)
jitterbuffer setup correction
correction of double pointer references from previous rev git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@232853 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'addons/chan_ooh323.c')
-rw-r--r--addons/chan_ooh323.c21
1 files changed, 11 insertions, 10 deletions
diff --git a/addons/chan_ooh323.c b/addons/chan_ooh323.c
index 5fa3ae566..4c633ed3a 100644
--- a/addons/chan_ooh323.c
+++ b/addons/chan_ooh323.c
@@ -14,6 +14,8 @@
*
*****************************************************************************/
+/* Reworked version I, Nov-2009, by Alexandr Anikin, may@telecom-service.ru */
+
/*** MODULEINFO
<defaultenabled>no</defaultenabled>
@@ -94,6 +96,7 @@ static const struct ast_channel_tech ooh323_tech = {
.type = type,
.description = tdesc,
.capabilities = -1,
+ .properties = AST_CHAN_TP_WANTSJITTER | AST_CHAN_TP_CREATESJITTER,
.requester = ooh323_request,
.send_digit_begin = ooh323_digit_begin,
.send_digit_end = ooh323_digit_end,
@@ -1015,7 +1018,7 @@ static int ooh323_hangup(struct ast_channel *ast)
ast_update_use_count();
} else {
- ast_log(LOG_DEBUG, "No call to hangup\n" );
+ ast_debug(1, "No call to hangup\n" );
}
if (gH323Debug)
@@ -1326,6 +1329,8 @@ static int ooh323_fixup(struct ast_channel *oldchan, struct ast_channel *newchan
{
struct ooh323_pvt *p = newchan->tech_pvt;
+ if (!p) return -1;
+
if (gH323Debug)
ast_verbose("--- ooh323c ooh323_fixup\n");
@@ -3077,14 +3082,6 @@ static int load_module(void)
.onModeChanged = onModeChanged
};
- ast_log(LOG_NOTICE,
- "---------------------------------------------------------------------------------\n"
- "--- ******* IMPORTANT NOTE ***********\n"
- "---\n"
- "--- This module is currently unsupported. Use it at your own risk.\n"
- "---\n"
- "---------------------------------------------------------------------------------\n");
-
myself = ast_module_info->self;
h225Callbacks.onReceivedSetup = &ooh323_onReceivedSetup;
@@ -3625,7 +3622,7 @@ static enum ast_rtp_glue_result ooh323_get_rtp_peer(struct ast_channel *chan, st
enum ast_rtp_glue_result res = AST_RTP_GLUE_RESULT_LOCAL;
if (!(p = (struct ooh323_pvt *) chan->tech_pvt))
- return AST_RTP_GLUE_RESULT_FORBID;
+ return AST_RTP_GLUE_RESULT_FORBID;
if (!(p->rtp)) {
return AST_RTP_GLUE_RESULT_FORBID;
@@ -3635,6 +3632,10 @@ static enum ast_rtp_glue_result ooh323_get_rtp_peer(struct ast_channel *chan, st
res = AST_RTP_GLUE_RESULT_LOCAL;
+ if (ast_test_flag(&global_jbconf, AST_JB_FORCED)) {
+ res = AST_RTP_GLUE_RESULT_FORBID;
+ }
+
return res;
}