mirror of
				https://github.com/asterisk/asterisk.git
				synced 2025-11-04 05:15:22 +00:00 
			
		
		
		
	Compare commits
	
		
			10 Commits
		
	
	
		
			certified/
			...
			1.8.27.0-r
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					42d2a3ea27 | ||
| 
						 | 
					5adf6ce258 | ||
| 
						 | 
					4cef9cb1c0 | ||
| 
						 | 
					5f43173c8b | ||
| 
						 | 
					4472de7634 | ||
| 
						 | 
					ca31d94e1e | ||
| 
						 | 
					3a6d1d4e9a | ||
| 
						 | 
					3af2a340fd | ||
| 
						 | 
					c290901812 | ||
| 
						 | 
					50d4e9da02 | 
							
								
								
									
										1
									
								
								.lastclean
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								.lastclean
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1 @@
 | 
			
		||||
40
 | 
			
		||||
							
								
								
									
										23
									
								
								CHANGES
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								CHANGES
									
									
									
									
									
								
							@@ -8,6 +8,29 @@
 | 
			
		||||
===
 | 
			
		||||
======================================================================
 | 
			
		||||
 | 
			
		||||
------------------------------------------------------------------------------
 | 
			
		||||
--- Functionality changes since Asterisk 1.8.26.1 ----------------------------
 | 
			
		||||
------------------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
chan_sip
 | 
			
		||||
-----------
 | 
			
		||||
 * SIP peers can now specify 'trust_id_outbound' which affects RPID/PAI
 | 
			
		||||
   fields for prohibited callingpres information. Values are legacy, no, and
 | 
			
		||||
   yes. By default, legacy is used.
 | 
			
		||||
   trust_id_outbound=legacy - behavior remains the same as 1.8.26.1. When
 | 
			
		||||
     dealing with prohibited callingpres and sendrpid=pai/rpid, RPID/PAI
 | 
			
		||||
     headers are appended to outbound SIP messages just as they are with
 | 
			
		||||
     allowed callingpres values, but data about the remote party's identity is
 | 
			
		||||
     anonymized.
 | 
			
		||||
     When sendrpid=rpid, only the remote party's domain is anonymized.
 | 
			
		||||
   trust_id_outbound=no - when dealing with prohibited callingpres, RPID/PAI
 | 
			
		||||
     headers are not sent.
 | 
			
		||||
   trust_id_outbound=yes - RPID/PAI headers are applied with the full remote
 | 
			
		||||
     party information in tact even for prohibited callingpres information.
 | 
			
		||||
     In the case of PAI, a Privacy: id header will be appended for prohibited
 | 
			
		||||
     calling information to communicate that the private information should
 | 
			
		||||
     not be relayed to untrusted parties.
 | 
			
		||||
 | 
			
		||||
------------------------------------------------------------------------------
 | 
			
		||||
--- Functionality changes since Asterisk 1.8.19.1 ----------------------------
 | 
			
		||||
------------------------------------------------------------------------------
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										68
									
								
								asterisk-1.8.27.0-rc2-summary.html
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										68
									
								
								asterisk-1.8.27.0-rc2-summary.html
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,68 @@
 | 
			
		||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 | 
			
		||||
<html xmlns="http://www.w3.org/1999/xhtml">
 | 
			
		||||
<head><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /><title>Release Summary - asterisk-1.8.27.0-rc2</title></head>
 | 
			
		||||
<body>
 | 
			
		||||
<h1 align="center"><a name="top">Release Summary</a></h1>
 | 
			
		||||
<h3 align="center">asterisk-1.8.27.0-rc2</h3>
 | 
			
		||||
<h3 align="center">Date: 2014-04-22</h3>
 | 
			
		||||
<h3 align="center"><asteriskteam@digium.com></h3>
 | 
			
		||||
<hr/>
 | 
			
		||||
<h2 align="center">Table of Contents</h2>
 | 
			
		||||
<ol>
 | 
			
		||||
   <li><a href="#summary">Summary</a></li>
 | 
			
		||||
   <li><a href="#contributors">Contributors</a></li>
 | 
			
		||||
   <li><a href="#commits">Other Changes</a></li>
 | 
			
		||||
   <li><a href="#diffstat">Diffstat</a></li>
 | 
			
		||||
</ol>
 | 
			
		||||
<hr/>
 | 
			
		||||
<a name="summary"><h2 align="center">Summary</h2></a>
 | 
			
		||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This release includes only bug fixes.  The changes included were made only to address problems that have been identified in this release series.  Users should be able to safely upgrade to this version if this release series is already in use.  Users considering upgrading from a previous release series are strongly encouraged to review the UPGRADE.txt document as well as the CHANGES document for information about upgrading to this release series.</p>
 | 
			
		||||
<p>The data in this summary reflects changes that have been made since the previous release, asterisk-1.8.27.0-rc1.</p>
 | 
			
		||||
<hr/>
 | 
			
		||||
<a name="contributors"><h2 align="center">Contributors</h2></a>
 | 
			
		||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This table lists the people who have submitted code, those that have tested patches, as well as those that reported issues on the issue tracker that were resolved in this release.  For coders, the number is how many of their patches (of any size) were committed into this release.  For testers, the number is the number of times their name was listed as assisting with testing a patch.  Finally, for reporters, the number is the number of issues that they reported that were closed by commits that went into this release.</p>
 | 
			
		||||
<table width="100%" border="0">
 | 
			
		||||
<tr>
 | 
			
		||||
<td width="33%"><h3>Coders</h3></td>
 | 
			
		||||
<td width="33%"><h3>Testers</h3></td>
 | 
			
		||||
<td width="33%"><h3>Reporters</h3></td>
 | 
			
		||||
</tr>
 | 
			
		||||
<tr valign="top">
 | 
			
		||||
<td>
 | 
			
		||||
5 bebuild<br/>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
</td>
 | 
			
		||||
<td>
 | 
			
		||||
</td>
 | 
			
		||||
</tr>
 | 
			
		||||
</table>
 | 
			
		||||
<hr/>
 | 
			
		||||
<a name="commits"><h2 align="center">Commits Not Associated with an Issue</h2></a>
 | 
			
		||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a list of all changes that went into this release that did not directly close an issue from the issue tracker.  The commits may have been marked as being related to an issue.  If that is the case, the issue numbers are listed here, as well.</p>
 | 
			
		||||
<table width="100%" border="1">
 | 
			
		||||
<tr><td><b>Revision</b></td><td><b>Author</b></td><td><b>Summary</b></td><td><b>Issues Referenced</b></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=412805">412805</a></td><td>bebuild</td><td>Create 1.8.27.0-rc2</td>
 | 
			
		||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=412817">412817</a></td><td>bebuild</td><td>Update .version, remove summaries</td>
 | 
			
		||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=412872">412872</a></td><td>bebuild</td><td>Merge r412328,412744,412764,412821 for ASTERISK-19465</td>
 | 
			
		||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=412875">412875</a></td><td>bebuild</td><td>Importing release summary for 1.8.27.0-rc2 release.</td>
 | 
			
		||||
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=412896">412896</a></td><td>bebuild</td><td>Importing release summary for 1.8.27.0-rc2 release.</td>
 | 
			
		||||
<td></td></tr></table>
 | 
			
		||||
<hr/>
 | 
			
		||||
<a name="diffstat"><h2 align="center">Diffstat Results</h2></a>
 | 
			
		||||
<center><a href="#top">[Back to Top]</a></center><br/><p>This is a summary of the changes to the source code that went into this release that was generated using the diffstat utility.</p>
 | 
			
		||||
<pre>
 | 
			
		||||
.version                           |    2
 | 
			
		||||
CHANGES                            |   23 +
 | 
			
		||||
ChangeLog                          |   18
 | 
			
		||||
asterisk-1.8.27.0-rc1-summary.html |  564 -----------------------------
 | 
			
		||||
asterisk-1.8.27.0-rc1-summary.txt  |  711 -------------------------------------
 | 
			
		||||
asterisk-1.8.27.0-rc2-summary.html |   67 +++
 | 
			
		||||
asterisk-1.8.27.0-rc2-summary.txt  |  100 +++++
 | 
			
		||||
channels/chan_sip.c                |   62 ++-
 | 
			
		||||
channels/sip/include/sip.h         |    7
 | 
			
		||||
configs/sip.conf.sample            |   12
 | 
			
		||||
10 files changed, 284 insertions(+), 1282 deletions(-)
 | 
			
		||||
</pre><br/>
 | 
			
		||||
<hr/>
 | 
			
		||||
</body>
 | 
			
		||||
</html>
 | 
			
		||||
							
								
								
									
										103
									
								
								asterisk-1.8.27.0-rc2-summary.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										103
									
								
								asterisk-1.8.27.0-rc2-summary.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,103 @@
 | 
			
		||||
                                Release Summary
 | 
			
		||||
 | 
			
		||||
                             asterisk-1.8.27.0-rc2
 | 
			
		||||
 | 
			
		||||
                                Date: 2014-04-22
 | 
			
		||||
 | 
			
		||||
                           <asteriskteam@digium.com>
 | 
			
		||||
 | 
			
		||||
     ----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
                               Table of Contents
 | 
			
		||||
 | 
			
		||||
    1. Summary
 | 
			
		||||
    2. Contributors
 | 
			
		||||
    3. Other Changes
 | 
			
		||||
    4. Diffstat
 | 
			
		||||
 | 
			
		||||
     ----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
                                    Summary
 | 
			
		||||
 | 
			
		||||
                                 [Back to Top]
 | 
			
		||||
 | 
			
		||||
   This release includes only bug fixes. The changes included were made only
 | 
			
		||||
   to address problems that have been identified in this release series.
 | 
			
		||||
   Users should be able to safely upgrade to this version if this release
 | 
			
		||||
   series is already in use. Users considering upgrading from a previous
 | 
			
		||||
   release series are strongly encouraged to review the UPGRADE.txt document
 | 
			
		||||
   as well as the CHANGES document for information about upgrading to this
 | 
			
		||||
   release series.
 | 
			
		||||
 | 
			
		||||
   The data in this summary reflects changes that have been made since the
 | 
			
		||||
   previous release, asterisk-1.8.27.0-rc1.
 | 
			
		||||
 | 
			
		||||
     ----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
                                  Contributors
 | 
			
		||||
 | 
			
		||||
                                 [Back to Top]
 | 
			
		||||
 | 
			
		||||
   This table lists the people who have submitted code, those that have
 | 
			
		||||
   tested patches, as well as those that reported issues on the issue tracker
 | 
			
		||||
   that were resolved in this release. For coders, the number is how many of
 | 
			
		||||
   their patches (of any size) were committed into this release. For testers,
 | 
			
		||||
   the number is the number of times their name was listed as assisting with
 | 
			
		||||
   testing a patch. Finally, for reporters, the number is the number of
 | 
			
		||||
   issues that they reported that were closed by commits that went into this
 | 
			
		||||
   release.
 | 
			
		||||
 | 
			
		||||
     Coders                   Testers                  Reporters              
 | 
			
		||||
   5 bebuild                
 | 
			
		||||
 | 
			
		||||
     ----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
                      Commits Not Associated with an Issue
 | 
			
		||||
 | 
			
		||||
                                 [Back to Top]
 | 
			
		||||
 | 
			
		||||
   This is a list of all changes that went into this release that did not
 | 
			
		||||
   directly close an issue from the issue tracker. The commits may have been
 | 
			
		||||
   marked as being related to an issue. If that is the case, the issue
 | 
			
		||||
   numbers are listed here, as well.
 | 
			
		||||
 | 
			
		||||
   +------------------------------------------------------------------------+
 | 
			
		||||
   | Revision | Author  | Summary                              | Issues     |
 | 
			
		||||
   |          |         |                                      | Referenced |
 | 
			
		||||
   |----------+---------+--------------------------------------+------------|
 | 
			
		||||
   | 412805   | bebuild | Create 1.8.27.0-rc2                  |            |
 | 
			
		||||
   |----------+---------+--------------------------------------+------------|
 | 
			
		||||
   | 412817   | bebuild | Update .version, remove summaries    |            |
 | 
			
		||||
   |----------+---------+--------------------------------------+------------|
 | 
			
		||||
   | 412872   | bebuild | Merge r412328,412744,412764,412821   |            |
 | 
			
		||||
   |          |         | for ASTERISK-19465                   |            |
 | 
			
		||||
   |----------+---------+--------------------------------------+------------|
 | 
			
		||||
   | 412875   | bebuild | Importing release summary for        |            |
 | 
			
		||||
   |          |         | 1.8.27.0-rc2 release.                |            |
 | 
			
		||||
   |----------+---------+--------------------------------------+------------|
 | 
			
		||||
   | 412896   | bebuild | Importing release summary for        |            |
 | 
			
		||||
   |          |         | 1.8.27.0-rc2 release.                |            |
 | 
			
		||||
   +------------------------------------------------------------------------+
 | 
			
		||||
 | 
			
		||||
     ----------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
                                Diffstat Results
 | 
			
		||||
 | 
			
		||||
                                 [Back to Top]
 | 
			
		||||
 | 
			
		||||
   This is a summary of the changes to the source code that went into this
 | 
			
		||||
   release that was generated using the diffstat utility.
 | 
			
		||||
 | 
			
		||||
 .version                           |    2
 | 
			
		||||
 CHANGES                            |   23 +
 | 
			
		||||
 ChangeLog                          |   18
 | 
			
		||||
 asterisk-1.8.27.0-rc1-summary.html |  564 -----------------------------
 | 
			
		||||
 asterisk-1.8.27.0-rc1-summary.txt  |  711 -------------------------------------
 | 
			
		||||
 asterisk-1.8.27.0-rc2-summary.html |   67 +++
 | 
			
		||||
 asterisk-1.8.27.0-rc2-summary.txt  |  100 +++++
 | 
			
		||||
 channels/chan_sip.c                |   62 ++-
 | 
			
		||||
 channels/sip/include/sip.h         |    7
 | 
			
		||||
 configs/sip.conf.sample            |   12
 | 
			
		||||
 10 files changed, 284 insertions(+), 1282 deletions(-)
 | 
			
		||||
 | 
			
		||||
     ----------------------------------------------------------------------
 | 
			
		||||
@@ -11406,6 +11406,7 @@ static int add_rpid(struct sip_request *req, struct sip_pvt *p)
 | 
			
		||||
	const char *fromdomain;
 | 
			
		||||
	const char *privacy = NULL;
 | 
			
		||||
	const char *screen = NULL;
 | 
			
		||||
	const char *anonymous_string = "\"Anonymous\" <sip:anonymous@anonymous.invalid>";
 | 
			
		||||
 | 
			
		||||
	if (!ast_test_flag(&p->flags[0], SIP_SENDRPID)) {
 | 
			
		||||
		return 0;
 | 
			
		||||
@@ -11428,16 +11429,41 @@ static int add_rpid(struct sip_request *req, struct sip_pvt *p)
 | 
			
		||||
	}
 | 
			
		||||
	lid_pres = ast_party_id_presentation(&p->owner->connected.id);
 | 
			
		||||
 | 
			
		||||
	fromdomain = S_OR(p->fromdomain, ast_sockaddr_stringify_host_remote(&p->ourip));
 | 
			
		||||
	if (((lid_pres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) &&
 | 
			
		||||
			(ast_test_flag(&p->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND) == SIP_PAGE2_TRUST_ID_OUTBOUND_NO)) {
 | 
			
		||||
		/* If pres is not allowed and we don't trust the peer, we don't apply an RPID header */
 | 
			
		||||
		return 0;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	fromdomain = p->fromdomain;
 | 
			
		||||
	if (!fromdomain ||
 | 
			
		||||
			((ast_test_flag(&p->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND) == SIP_PAGE2_TRUST_ID_OUTBOUND_YES) &&
 | 
			
		||||
			!strcmp("anonymous.invalid", fromdomain))) {
 | 
			
		||||
		/* If the fromdomain is NULL or if it was set to anonymous.invalid due to privacy settings and we trust the peer,
 | 
			
		||||
		 * use the host IP address */
 | 
			
		||||
		fromdomain = ast_sockaddr_stringify_host_remote(&p->ourip);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	lid_num = ast_uri_encode(lid_num, tmp2, sizeof(tmp2), 0);
 | 
			
		||||
 | 
			
		||||
	if (ast_test_flag(&p->flags[0], SIP_SENDRPID_PAI)) {
 | 
			
		||||
		ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
 | 
			
		||||
		add_header(req, "P-Asserted-Identity", ast_str_buffer(tmp));
 | 
			
		||||
		if ((lid_pres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) {
 | 
			
		||||
			add_header(req, "Privacy", "id");
 | 
			
		||||
		if (ast_test_flag(&p->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND) != SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY) {
 | 
			
		||||
			/* trust_id_outbound = yes - Always give full information even if it's private, but append a privacy header
 | 
			
		||||
			 * When private data is included */
 | 
			
		||||
			ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
 | 
			
		||||
			if ((lid_pres & AST_PRES_RESTRICTION) != AST_PRES_ALLOWED) {
 | 
			
		||||
				add_header(req, "Privacy", "id");
 | 
			
		||||
			}
 | 
			
		||||
		} else {
 | 
			
		||||
			/* trust_id_outbound = legacy - behave in a non RFC-3325 compliant manner and send anonymized data when
 | 
			
		||||
			 * when handling private data. */
 | 
			
		||||
			if ((lid_pres & AST_PRES_RESTRICTION) == AST_PRES_ALLOWED) {
 | 
			
		||||
				ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>", lid_name, lid_num, fromdomain);
 | 
			
		||||
			} else {
 | 
			
		||||
				ast_str_set(&tmp, -1, "%s", anonymous_string);
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
		add_header(req, "P-Asserted-Identity", ast_str_buffer(tmp));
 | 
			
		||||
	} else {
 | 
			
		||||
		ast_str_set(&tmp, -1, "\"%s\" <sip:%s@%s>;party=%s", lid_name, lid_num, fromdomain, p->outgoing_call ? "calling" : "called");
 | 
			
		||||
 | 
			
		||||
@@ -17719,6 +17745,18 @@ static const char *allowoverlap2str(int mode)
 | 
			
		||||
	return map_x_s(allowoverlapstr, mode, "<error>");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
static const struct _map_x_s trust_id_outboundstr[] = {
 | 
			
		||||
	{ SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY,  "Legacy" },
 | 
			
		||||
	{ SIP_PAGE2_TRUST_ID_OUTBOUND_NO,      "No" },
 | 
			
		||||
	{ SIP_PAGE2_TRUST_ID_OUTBOUND_YES,     "Yes" },
 | 
			
		||||
	{ -1,                                  NULL }, /* terminator */
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
static const char *trust_id_outbound2str(int mode)
 | 
			
		||||
{
 | 
			
		||||
	return map_x_s(trust_id_outboundstr, mode, "<error>");
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*! \brief Destroy disused contexts between reloads
 | 
			
		||||
	Only used in reload_config so the code for regcontext doesn't get ugly
 | 
			
		||||
*/
 | 
			
		||||
@@ -18270,6 +18308,7 @@ static char *_sip_show_peer(int type, int fd, struct mansession *s, const struct
 | 
			
		||||
		ast_cli(fd, "  Ign SDP ver  : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_IGNORESDPVERSION)));
 | 
			
		||||
		ast_cli(fd, "  Trust RPID   : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_TRUSTRPID)));
 | 
			
		||||
		ast_cli(fd, "  Send RPID    : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_SENDRPID)));
 | 
			
		||||
		ast_cli(fd, "  TrustIDOutbnd: %s\n", trust_id_outbound2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND)));
 | 
			
		||||
		ast_cli(fd, "  Subscriptions: %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)));
 | 
			
		||||
		ast_cli(fd, "  Overlap dial : %s\n", allowoverlap2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWOVERLAP)));
 | 
			
		||||
		if (peer->outboundproxy)
 | 
			
		||||
@@ -27664,6 +27703,19 @@ static int handle_common_options(struct ast_flags *flags, struct ast_flags *mask
 | 
			
		||||
	} else if (!strcasecmp(v->name, "rpid_immediate")) {
 | 
			
		||||
		ast_set_flag(&mask[1], SIP_PAGE2_RPID_IMMEDIATE);
 | 
			
		||||
		ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_RPID_IMMEDIATE);
 | 
			
		||||
	} else if (!strcasecmp(v->name, "trust_id_outbound")) {
 | 
			
		||||
		ast_set_flag(&mask[1], SIP_PAGE2_TRUST_ID_OUTBOUND);
 | 
			
		||||
		ast_clear_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND);
 | 
			
		||||
		if (!strcasecmp(v->value, "legacy")) {
 | 
			
		||||
			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY);
 | 
			
		||||
		} else if (ast_true(v->value)) {
 | 
			
		||||
			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_YES);
 | 
			
		||||
		} else if (ast_false(v->value)) {
 | 
			
		||||
			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_NO);
 | 
			
		||||
		} else {
 | 
			
		||||
			ast_log(LOG_WARNING, "Unknown trust_id_outbound mode '%s' on line %d, using legacy\n", v->value, v->lineno);
 | 
			
		||||
			ast_set_flag(&flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY);
 | 
			
		||||
		}
 | 
			
		||||
	} else if (!strcasecmp(v->name, "g726nonstandard")) {
 | 
			
		||||
		ast_set_flag(&mask[0], SIP_G726_NONSTANDARD);
 | 
			
		||||
		ast_set2_flag(&flags[0], ast_true(v->value), SIP_G726_NONSTANDARD);
 | 
			
		||||
 
 | 
			
		||||
@@ -348,13 +348,18 @@
 | 
			
		||||
#define SIP_PAGE2_HAVEPEERCONTEXT           (1 << 28)   /*< Are we associated with a configured peer context? */
 | 
			
		||||
#define SIP_PAGE2_USE_SRTP                  (1 << 29)   /*!< DP: Whether we should offer (only)  SRTP */
 | 
			
		||||
 | 
			
		||||
#define SIP_PAGE2_TRUST_ID_OUTBOUND         (3 << 30)   /*!< DP: Do we trust the peer with private presence information? */
 | 
			
		||||
#define SIP_PAGE2_TRUST_ID_OUTBOUND_LEGACY  (0 << 30)   /*!< Legacy, Do not provide private presence information, but include PAI/RPID when private */
 | 
			
		||||
#define SIP_PAGE2_TRUST_ID_OUTBOUND_NO      (1 << 30)   /*!< No, Do not provide private presence information, do not include PAI/RPID when private */
 | 
			
		||||
#define SIP_PAGE2_TRUST_ID_OUTBOUND_YES     (2 << 30)   /*!< Yes, provide private presence information in PAI/RPID headers */
 | 
			
		||||
 | 
			
		||||
#define SIP_PAGE2_FLAGS_TO_COPY \
 | 
			
		||||
	(SIP_PAGE2_ALLOWSUBSCRIBE | SIP_PAGE2_ALLOWOVERLAP | SIP_PAGE2_IGNORESDPVERSION | \
 | 
			
		||||
	SIP_PAGE2_VIDEOSUPPORT | SIP_PAGE2_T38SUPPORT | SIP_PAGE2_RFC2833_COMPENSATE | \
 | 
			
		||||
	SIP_PAGE2_BUGGY_MWI | SIP_PAGE2_TEXTSUPPORT | SIP_PAGE2_FAX_DETECT | \
 | 
			
		||||
	SIP_PAGE2_UDPTL_DESTINATION | SIP_PAGE2_VIDEOSUPPORT_ALWAYS | SIP_PAGE2_PREFERRED_CODEC | \
 | 
			
		||||
	SIP_PAGE2_RPID_IMMEDIATE | SIP_PAGE2_RPID_UPDATE | SIP_PAGE2_SYMMETRICRTP |\
 | 
			
		||||
	SIP_PAGE2_Q850_REASON | SIP_PAGE2_HAVEPEERCONTEXT | SIP_PAGE2_USE_SRTP)
 | 
			
		||||
	SIP_PAGE2_Q850_REASON | SIP_PAGE2_HAVEPEERCONTEXT | SIP_PAGE2_USE_SRTP | SIP_PAGE2_TRUST_ID_OUTBOUND)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#define SIP_PAGE3_SNOM_AOC               (1 << 0)  /*!< DPG: Allow snom aoc messages */
 | 
			
		||||
 
 | 
			
		||||
@@ -337,6 +337,17 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 | 
			
		||||
                                ; transmit such UPDATE messages to it, then you must enable this option.
 | 
			
		||||
                                ; Otherwise, we will have to wait until we can send a reinvite to
 | 
			
		||||
                                ; transmit the information.
 | 
			
		||||
;trust_id_outbound = no         ; Controls whether or not we trust this peer with private identity
 | 
			
		||||
                                ; information (when the remote party has callingpres=prohib or equivalent).
 | 
			
		||||
                                ; no - RPID/PAI headers will not be included for private peer information
 | 
			
		||||
                                ; yes - RPID/PAI headers will include the private peer information. Privacy
 | 
			
		||||
                                ;       requirements will be indicated in a Privacy header for sendrpid=pai
 | 
			
		||||
                                ; legacy - RPID/PAI will be included for private peer information. In the
 | 
			
		||||
                                ;       case of sendrpid=pai, private data that would be included in them
 | 
			
		||||
                                ;       will be anonymized. For sendrpid=rpid, private data may be included
 | 
			
		||||
                                ;       but the remote party's domain will be anonymized. The way legacy
 | 
			
		||||
                                ;       behaves may violate RFC-3325, but it follows historic behavior.
 | 
			
		||||
                                ; This option is set to 'legacy' by default
 | 
			
		||||
;prematuremedia=no              ; Some ISDN links send empty media frames before 
 | 
			
		||||
                                ; the call is in ringing or progress state. The SIP 
 | 
			
		||||
                                ; channel will then send 183 indicating early media
 | 
			
		||||
@@ -1134,6 +1145,7 @@ srvlookup=yes                   ; Enable DNS SRV lookups on outbound calls
 | 
			
		||||
; autoframing
 | 
			
		||||
; insecure
 | 
			
		||||
; trustrpid
 | 
			
		||||
; trust_id_outbound
 | 
			
		||||
; progressinband
 | 
			
		||||
; promiscredir
 | 
			
		||||
; useclientcode
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user