[asterisk-commits] file: branch file/gulp_new_invite r395332 - in /team/file/gulp_new_invite/res...

[SVN commits to the Asterisk project]

Author: file
Date: Wed Jul 24 16:20:52 2013
New Revision: 395332

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395332
Log:
Incorporate review feedback.

Modified:
    team/file/gulp_new_invite/res/res_sip/sip_distributor.c
    team/file/gulp_new_invite/res/res_sip_session.c

Modified: team/file/gulp_new_invite/res/res_sip/sip_distributor.c
URL: http://svnview.digium.com/svn/asterisk/team/file/gulp_new_invite/res/res_sip/sip_distributor.c?view=diff&rev=395332&r1=395331&r2=395332
==============================================================================
--- team/file/gulp_new_invite/res/res_sip/sip_distributor.c (original)
+++ team/file/gulp_new_invite/res/res_sip/sip_distributor.c Wed Jul 24 16:20:52 2013
@@ -106,7 +106,10 @@
 		}
 	}
 
-	if (!pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_cancel_method) && !serializer) {
+	if (rdata->msg_info.msg->type == PJSIP_REQUEST_MSG && (
+		!pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_cancel_method) || 
+		!pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, &pjsip_bye_method)) &&
+		!serializer) {
 		pjsip_endpt_respond_stateless(ast_sip_get_pjsip_endpoint(), rdata, 481, NULL, NULL, NULL);
 		goto end;
 	}

Modified: team/file/gulp_new_invite/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/file/gulp_new_invite/res/res_sip_session.c?view=diff&rev=395332&r1=395331&r2=395332
==============================================================================
--- team/file/gulp_new_invite/res/res_sip_session.c (original)
+++ team/file/gulp_new_invite/res/res_sip_session.c Wed Jul 24 16:20:52 2013
@@ -963,6 +963,7 @@
 
 	if (endpoint->dtmf == AST_SIP_DTMF_INBAND) {
 		if (!(session->dsp = ast_dsp_new())) {
+			ao2_ref(session, -1);
 			return NULL;
 		}
 
@@ -970,6 +971,7 @@
 	}
 
 	if (add_supplements(session)) {
+		ao2_ref(session, -1);
 		return NULL;
 	}
 	AST_LIST_TRAVERSE(&session->supplements, iter, next) {