[asterisk-commits] oej: branch oej/darjeeling-prack-1.8 r369624 - /team/oej/darjeeling-prack-1.8...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Jul  5 08:43:23 2012
New Revision: 369624

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369624
Log:
Support non-PRACK-calls too. Bah.

Modified:
    team/oej/darjeeling-prack-1.8/channels/chan_sip.c

Modified: team/oej/darjeeling-prack-1.8/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/darjeeling-prack-1.8/channels/chan_sip.c?view=diff&rev=369624&r1=369623&r2=369624
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_sip.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_sip.c Thu Jul  5 08:43:23 2012
@@ -22637,7 +22637,7 @@
 			p->invitestate = INV_COMPLETED;
 			if (!p->lastinvite)
 				sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
-			res = -1;
+			res = 0;
 			goto request_invite_cleanup;
 		}
 	}
@@ -22651,16 +22651,14 @@
 	if (p->reqsipoptions & SIP_OPT_100REL || p->sipoptions & SIP_OPT_100REL) {
 		if (ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK)) {	/* Is PRACK enabled for this dialog? */
 			ast_set_flag(&p->flags[2], SIP_PAGE3_100REL);	/* Mark PRACK as active for this dialog */
-		} else {
+		} else if (p->reqsipoptions & SIP_OPT_100REL) {
 			/* If PRACK was required but is disabled in configuration, don't play */
-			if (p->reqsipoptions & SIP_OPT_100REL) {
-				transmit_response(p, "420 Bad extension (unsupported)", req);
-			}
+			transmit_response(p, "420 Bad extension (unsupported)", req);
 			p->invitestate = INV_COMPLETED;
 			if (!p->lastinvite) {
 				sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT);
 			}
-			res = -1;
+			res = 0;
 			goto request_invite_cleanup;
 		}
 	}