[asterisk-commits] may: branch may/chan_ooh323_evo r230770 - /team/may/chan_ooh323_evo/addons/

[SVN commits to the Asterisk project]

Author: may
Date: Sat Nov 21 20:14:57 2009
New Revision: 230770

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=230770
Log:
small changes: jitter settings, ooh323_fixup correction

Modified:
    team/may/chan_ooh323_evo/addons/chan_ooh323.c

Modified: team/may/chan_ooh323_evo/addons/chan_ooh323.c
URL: http://svnview.digium.com/svn/asterisk/team/may/chan_ooh323_evo/addons/chan_ooh323.c?view=diff&rev=230770&r1=230769&r2=230770
==============================================================================
--- team/may/chan_ooh323_evo/addons/chan_ooh323.c (original)
+++ team/may/chan_ooh323_evo/addons/chan_ooh323.c Sat Nov 21 20:14:57 2009
@@ -96,6 +96,7 @@
 	.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,
@@ -1327,6 +1328,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");
@@ -3619,7 +3622,7 @@
 	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;
@@ -3628,6 +3631,10 @@
 	*rtp = p->rtp ? ao2_ref(p->rtp, +1), p->rtp : NULL;
 
 	res = AST_RTP_GLUE_RESULT_LOCAL;
+
+	if (ast_test_flag(&global_jbconf, AST_JB_FORCED)) {
+		res = AST_RTP_GLUE_RESULT_FORBID;
+	}
 
 	return res;
 }