[svn-commits] oej: branch oej/darjeeling-prack-1.8 r369532 - /team/oej/darjeeling-prack-1.8...

[SVN commits to the Digium repositories]

Author: oej
Date: Mon Jul  2 13:23:30 2012
New Revision: 369532

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=369532
Log:
Various updates

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=369532&r1=369531&r2=369532
==============================================================================
--- team/oej/darjeeling-prack-1.8/channels/chan_sip.c (original)
+++ team/oej/darjeeling-prack-1.8/channels/chan_sip.c Mon Jul  2 13:23:30 2012
@@ -3786,7 +3786,7 @@
 		if (sscanf(ast_str_buffer(pkt->data), "SIP/2.0 %30u", &respid) == 1) {
 			pkt->response_code = respid;
 		}
-		if (ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK) && respid > 100 && respid < 200) {
+		if (ast_test_flag(&p->flags[2], SIP_PAGE3_100REL) && respid > 100 && respid < 200) {
 			pkt->rseqno = p->rseq;
 		}
 	}
@@ -4199,7 +4199,7 @@
 static void add_prack_respheader(struct sip_pvt *p, struct sip_request *req, int reliable)
 {
 	/* If method is INVITE and it contains Supported: 100 rel and we have enabled PRACK */
-	if (p->initreq.method == SIP_INVITE && p->sipoptions & SIP_OPT_100REL && ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK)) {
+	if (ast_test_flag(&p->flags[2], SIP_PAGE3_100REL)) {
 		/* Check if the invite has 100 REL supported here */
 		if (reliable == XMIT_PRACK) {
 			char buf[SIPBUFSIZE/2];
@@ -10552,8 +10552,7 @@
 		ast_clear_flag(&p->flags[1], SIP_PAGE2_CONNECTLINEUPDATE_PEND);
 		add_rpid(&resp, p);
 	}
-	if (ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK) && strncmp(msg, "100", 3) && !strncmp(msg, "1", 1)) {
-		/* SKREP */
+	if (ast_test_flag(&p->flags[2], SIP_PAGE3_100REL) && strncmp(msg, "100", 3) && !strncmp(msg, "1", 1)) {
 		ast_debug(2, "=!=!=!=!=!= PRACK applied to message \"%s\" \n", msg);
 		reliable = XMIT_PRACK;
 	}
@@ -11859,8 +11858,7 @@
 	if (rpid == TRUE) {
 		add_rpid(&resp, p);
 	}
-	if (ast_test_flag(&p->flags[2], SIP_PAGE3_PRACK) && strncmp(msg, "100", 3) && !strncmp(msg, "1", 1)) {
-		/* SKREP */
+	if (ast_test_flag(&p->flags[2], SIP_PAGE3_100REL) && strncmp(msg, "100", 3) && !strncmp(msg, "1", 1)) {
 		ast_debug(2, "=!=!=!=!=!= PRACK applied to message \"%s\" \n", msg);
 		reliable = XMIT_PRACK;
 	}
@@ -18781,7 +18779,7 @@
 			ast_cli(a->fd, "  Format:                 %s\n", ast_getformatname_multiple(formatbuf, sizeof(formatbuf), cur->owner ? cur->owner->nativeformats : 0) );
 			ast_cli(a->fd, "  T.38 support            %s\n", AST_CLI_YESNO(cur->udptl != NULL));
 			ast_cli(a->fd, "  Video support           %s\n", AST_CLI_YESNO(cur->vrtp != NULL));
-			ast_cli(a->fd, "  PRACK support           %s\n", AST_CLI_YESNO(ast_test_flag(&cur->flags[2], SIP_PAGE3_PRACK)));
+			ast_cli(a->fd, "  PRACK active            %s\n", AST_CLI_YESNO(ast_test_flag(&cur->flags[2], SIP_PAGE3_100REL)));
 			ast_cli(a->fd, "  MaxCallBR:              %d kbps\n", cur->maxcallbitrate);
 			ast_cli(a->fd, "  Theoretical Address:    %s\n", ast_sockaddr_stringify(&cur->sa));
 			ast_cli(a->fd, "  Received Address:       %s\n", ast_sockaddr_stringify(&cur->recv));