[asterisk-commits] file: trunk r45281 - in /trunk: ./ channels/chan_sip.c configs/sip.conf.sample

[asterisk-commits at lists.digium.com]

Author: file
Date: Mon Oct 16 15:08:23 2006
New Revision: 45281

URL: http://svn.digium.com/view/asterisk?rev=45281&view=rev
Log:
Merged revisions 45280 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r45280 | file | 2006-10-16 16:06:18 -0400 (Mon, 16 Oct 2006) | 10 lines

Merged revisions 45265 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r45265 | file | 2006-10-16 15:59:54 -0400 (Mon, 16 Oct 2006) | 2 lines

Use responses rather then replies even though they mean the same thing.

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c
    trunk/configs/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?rev=45281&r1=45280&r2=45281&view=diff
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Mon Oct 16 15:08:23 2006
@@ -536,7 +536,7 @@
 static int global_capability = AST_FORMAT_ULAW | AST_FORMAT_ALAW | AST_FORMAT_GSM | AST_FORMAT_H263;
 static int noncodeccapability = AST_RTP_DTMF;
 
-static int global_ignoreoodreplies = 1;
+static int global_ignoreoodresponses = 1;
 
 /* Object counters */
 static int suserobjs = 0;                /*!< Static users */
@@ -4260,7 +4260,8 @@
 	}
 	ast_mutex_unlock(&iflock);
 
-	if (req->method == SIP_RESPONSE && global_ignoreoodreplies)
+	/* If this is a response and we have ignoring of out of dialog responses turned on, then drop it */
+	if (req->method == SIP_RESPONSE && global_ignoreoodresponses)
 		return NULL;
 
 	/* Allocate new call */
@@ -9992,7 +9993,7 @@
 	ast_cli(fd, "  Allow subscriptions:    %s\n", ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE) ? "Yes" : "No");
 	ast_cli(fd, "  Allow overlap dialing:  %s\n", ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP) ? "Yes" : "No");
 	ast_cli(fd, "  Promsic. redir:         %s\n", ast_test_flag(&global_flags[0], SIP_PROMISCREDIR) ? "Yes" : "No");
-	ast_cli(fd, "  Drop misc replies:      %s\n", global_ignoreoodreplies ? "Yes" : "No");
+	ast_cli(fd, "  Drop misc responses:    %s\n", global_ignoreoodresponses ? "Yes" : "No");
 	ast_cli(fd, "  SIP domain support:     %s\n", AST_LIST_EMPTY(&domain_list) ? "No" : "Yes");
 	ast_cli(fd, "  Call to non-local dom.: %s\n", allow_external_domains ? "Yes" : "No");
 	ast_cli(fd, "  URI user is phone no:   %s\n", ast_test_flag(&global_flags[0], SIP_USEREQPHONE) ? "Yes" : "No");
@@ -14976,11 +14977,11 @@
 	} else if (!strcasecmp(v->name, "rfc2833compensate")) {
 		ast_set_flag(&mask[1], SIP_PAGE2_RFC2833_COMPENSATE);
 		ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_RFC2833_COMPENSATE);
-	} else if (!strcasecmp(v->name, "ignoreoodreplies")) {
+	} else if (!strcasecmp(v->name, "ignoreoodresponses")) {
 		if (ast_true(v->value))
-			global_ignoreoodreplies = 1;
+			global_ignoreoodresponses = 1;
 		else
-			global_ignoreoodreplies = 0;
+			global_ignoreoodresponses = 0;
 	}
 
 	return res;
@@ -15670,7 +15671,7 @@
 	ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE);	/* Default for peers, users: TRUE */
 	ast_set_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP);		/* Default for peers, users: TRUE */
 	ast_set_flag(&global_flags[1], SIP_PAGE2_RTUPDATE);
-	global_ignoreoodreplies = 1;
+	global_ignoreoodresponses = 1;
 
 	/* Initialize some reasonable defaults at SIP reload (used both for channel and as default for peers and users */
 	ast_copy_string(default_context, DEFAULT_CONTEXT, sizeof(default_context));

Modified: trunk/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/sip.conf.sample?rev=45281&r1=45280&r2=45281&view=diff
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Mon Oct 16 15:08:23 2006
@@ -132,7 +132,7 @@
 				; contrary to the RFC3551 specification, the peer _should_
 				; be negotiating AAL2-G726-32 instead :-(
 
-;ignoreoodreplies = no          ; If no then out of dialog replies will not be ignored
+;ignoreoodresponses = no        ; If no then out of dialog responses will not be ignored
 
 ;
 ; If regcontext is specified, Asterisk will dynamically create and destroy a
@@ -168,6 +168,7 @@
 				; Useful to limit subscriptions to local extensions
 				; Settable per peer/user also
 ;notifyringing = yes		; Notify subscriptions on RINGING state
+
 ;----------------------------------------- T.38 FAX PASSTHROUGH SUPPORT -----------------------
 ;
 ; This setting is available in the [general] section as well as in device configurations.