[asterisk-commits] mmichelson: branch group/issue8824 r145182 - in /team/group/issue8824: channe...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Mon Sep 29 16:14:21 2008
New Revision: 145182

URL: http://svn.digium.com/view/asterisk?view=rev&rev=145182
Log:
Change the rpid settings since I realized
that having two separate settings which potentially
control the same flags makes no sense and is too
dependent on the order the options are read.

I updated sip.conf.sample to explain the new
values for sendrpid


Modified:
    team/group/issue8824/channels/chan_sip.c
    team/group/issue8824/configs/sip.conf.sample

Modified: team/group/issue8824/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/channels/chan_sip.c?view=diff&rev=145182&r1=145181&r2=145182
==============================================================================
--- team/group/issue8824/channels/chan_sip.c (original)
+++ team/group/issue8824/channels/chan_sip.c Mon Sep 29 16:14:21 2008
@@ -20800,15 +20800,11 @@
 		ast_set2_flag(&flags[0], ast_true(v->value), SIP_TRUSTRPID);
 	} else if (!strcasecmp(v->name, "sendrpid")) {
 		ast_set_flag(&mask[0], SIP_SENDRPID);
-		ast_set2_flag(&flags[0], ast_true(v->value), SIP_SENDRPID);
-	} else if (!strcasecmp(v->name, "rpid_header")) {
-		ast_clear_flag(&flags[0], SIP_SENDRPID);
-		if (!strcasecmp(v->value, "rpid")) {
+		if (!strcasecmp(v->value, "pai")) {
+			ast_set_flag(&flags[0], SIP_SENDRPID_PAI);
+		} else if (!strcasecmp(v->value, "rpid")) {
 			ast_set_flag(&flags[0], SIP_SENDRPID_RPID);
-		} else if (!strcasecmp(v->value, "pai")) {
-			ast_set_flag(&flags[0], SIP_SENDRPID_PAI);
-		} else {
-			ast_log(LOG_NOTICE, "Unrecognized rpid_header value '%s'\n", v->value);
+		} else if (ast_true(v->value)) {
 			ast_set_flag(&flags[0], SIP_SENDRPID_RPID);
 		}
 	} else if (!strcasecmp(v->name, "g726nonstandard")) {

Modified: team/group/issue8824/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/configs/sip.conf.sample?view=diff&rev=145182&r1=145181&r2=145182
==============================================================================
--- team/group/issue8824/configs/sip.conf.sample (original)
+++ team/group/issue8824/configs/sip.conf.sample Mon Sep 29 16:14:21 2008
@@ -183,6 +183,11 @@
 ;relaxdtmf=yes                  ; Relax dtmf handling
 ;trustrpid = no                 ; If Remote-Party-ID should be trusted
 ;sendrpid = yes                 ; If Remote-Party-ID should be sent
+;sendrpid = rpid				; Use the "Remote-Party-ID" header
+								; to send the identity of the remote party
+								; This is identical to sendrpid=yes
+;sendrpid = pai					; Use the "P-Asserted-Identity" header
+								; to send the identity of the remote party
 ;rpid_header = rpid             ; Which header should be used when sending Remote Party ID
                                 ; 'rpid' means to send "Remote-Party-ID"
 								; 'pai' means to send "P-Asserted-Identity"