[asterisk-commits] file: trunk r403365 - in /trunk: ./ res/res_pjsip_t38.c

[SVN commits to the Asterisk project]

Author: file
Date: Wed Dec  4 14:54:52 2013
New Revision: 403365

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403365
Log:
res_pjsip_t38: Don't pass T.38 control frames through to other hooks.

This crept up during gateway testing where the gateway would receive
the request to negotiate and assume it came from the remote side, causing
the gateway state machine to go a little, to a use a technical term,
"wonky".
........

Merged revisions 403364 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_t38.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-12-merged (original)
+++ branch-12-merged Wed Dec  4 14:54:52 2013
@@ -1,1 +1,1 @@
-/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290,403311-403312,403324,403329,403349
+/branches/12:1-398558,398560-398577,398579-399305,399307-401390,401392-403175,403179,403207,403209,403221,403223,403240,403256,403258,403271,403290,403311-403312,403324,403329,403349,403364

Modified: trunk/res/res_pjsip_t38.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_t38.c?view=diff&rev=403365&r1=403364&r2=403365
==============================================================================
--- trunk/res/res_pjsip_t38.c (original)
+++ trunk/res/res_pjsip_t38.c Wed Dec  4 14:54:52 2013
@@ -113,11 +113,7 @@
 
 	data->session = session;
 	ao2_ref(session, +1);
-
-	if (!(data->frame = ast_frdup(frame))) {
-		ao2_cleanup(data);
-		return NULL;
-	}
+	data->frame = frame;
 
 	return data;
 }
@@ -396,6 +392,8 @@
 		if (ast_sip_push_task(session->serializer, t38_interpret_parameters, data)) {
 			ao2_ref(data, -1);
 		}
+
+		f = &ast_null_frame;
 	} else if (f->frametype == AST_FRAME_MODEM) {
 		RAII_VAR(struct ast_sip_session_media *, session_media, NULL, ao2_cleanup);