Compare commits

...

9 Commits

Author SHA1 Message Date
Asterisk Autobuilder
3f2411a18d Importing release summary for 11.6.0-rc2 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc2@401238 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-10-18 16:45:21 +00:00
Asterisk Autobuilder
52013a1688 Update ChangeLog for r401182
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc2@401236 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-10-18 16:42:15 +00:00
Asterisk Autobuilder
6f27615759 Merge changes for 11.6.0-rc2
* Remove old summaries; update version; update ChangeLog
* Merged r399513 for ASTERISK-22560
* Merged r401167 for ASTERISK-22236
* Merged r401179 for ASTERISK-22718
* Merged r401182 for ASTERISK-22729



git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc2@401235 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-10-18 16:38:45 +00:00
Asterisk Autobuilder
4a104c1300 Create 11.6.0-rc2
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc2@401221 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-10-18 15:49:25 +00:00
Asterisk Autobuilder
adf51fff8f Use autotagged externals
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc1@399454 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-19 14:20:05 +00:00
Asterisk Autobuilder
fe784e169f Importing release summary for 11.6.0-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc1@399453 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-19 14:19:30 +00:00
Asterisk Autobuilder
1001d7972b Importing files for 11.6.0-rc1 release.
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc1@399452 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-19 14:19:24 +00:00
Asterisk Autobuilder
71e611a852 Creating tag for the release of asterisk-11.6.0-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc1@399451 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-19 14:15:45 +00:00
Asterisk Autobuilder
6df08f781a Creating tag for the release of asterisk-11.6.0-rc1
git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/11.6.0-rc1@399449 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2013-09-19 14:11:37 +00:00
8 changed files with 27173 additions and 6 deletions

1
.lastclean Normal file
View File

@@ -0,0 +1 @@
40

1
.version Normal file
View File

@@ -0,0 +1 @@
11.6.0-rc2

26995
ChangeLog Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,62 @@
<!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-11.6.0-rc2</title></head>
<body>
<h1 align="center"><a name="top">Release Summary</a></h1>
<h3 align="center">asterisk-11.6.0-rc2</h3>
<h3 align="center">Date: 2013-10-18</h3>
<h3 align="center">&lt;asteriskteam@digium.com&gt;</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-11.6.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>
3 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/11?view=revision&revision=401221">401221</a></td><td>bebuild</td><td>Create 11.6.0-rc2</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=401235">401235</a></td><td>bebuild</td><td>Merge changes for 11.6.0-rc2</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/11?view=revision&revision=401236">401236</a></td><td>bebuild</td><td>Update ChangeLog for r401182</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
ChangeLog | 49 +++
asterisk-11.6.0-rc1-summary.html | 576 ---------------------------------------
channels/chan_sip.c | 11
main/channel.c | 16 +
main/logger.c | 2
6 files changed, 73 insertions(+), 583 deletions(-)
</pre><br/>
<hr/>
</body>
</html>

View File

@@ -0,0 +1,91 @@
Release Summary
asterisk-11.6.0-rc2
Date: 2013-10-18
<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-11.6.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
3 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 |
|-----------+---------+------------------------------+-------------------|
| 401221 | bebuild | Create 11.6.0-rc2 | |
|-----------+---------+------------------------------+-------------------|
| 401235 | bebuild | Merge changes for 11.6.0-rc2 | |
|-----------+---------+------------------------------+-------------------|
| 401236 | bebuild | Update ChangeLog for r401182 | |
+------------------------------------------------------------------------+
----------------------------------------------------------------------
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
ChangeLog | 49 +++
asterisk-11.6.0-rc1-summary.html | 576 ---------------------------------------
channels/chan_sip.c | 11
main/channel.c | 16 +
main/logger.c | 2
6 files changed, 73 insertions(+), 583 deletions(-)
----------------------------------------------------------------------

View File

@@ -16884,9 +16884,8 @@ static enum check_auth_result register_verify(struct sip_pvt *p, struct ast_sock
} else {
set_peer_nat(p, peer);
if (p->natdetected && ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_RPORT)) {
ast_copy_flags(&p->flags[0], &peer->flags[0], SIP_NAT_FORCE_RPORT);
}
ast_copy_flags(&p->flags[0], &peer->flags[0], SIP_NAT_FORCE_RPORT);
if (!(res = check_auth(p, req, peer->name, peer->secret, peer->md5secret, SIP_REGISTER, uri2, XMIT_UNRELIABLE))) {
if (sip_cancel_destroy(p))
@@ -17938,9 +17937,9 @@ static void check_for_nat(const struct ast_sockaddr *addr, struct sip_pvt *p)
return;
}
if (ast_sockaddr_cmp(addr, &p->recv)) {
char *tmp_str = ast_strdupa(ast_sockaddr_stringify(addr));
ast_debug(3, "NAT detected for %s / %s\n", tmp_str, ast_sockaddr_stringify(&p->recv));
if (ast_sockaddr_cmp_addr(addr, &p->recv)) {
char *tmp_str = ast_strdupa(ast_sockaddr_stringify_addr(addr));
ast_debug(3, "NAT detected for %s / %s\n", tmp_str, ast_sockaddr_stringify_addr(&p->recv));
p->natdetected = 1;
if (ast_test_flag(&p->flags[2], SIP_PAGE3_NAT_AUTO_RPORT)) {
ast_set_flag(&p->flags[0], SIP_NAT_FORCE_RPORT);

View File

@@ -6793,6 +6793,8 @@ int ast_do_masquerade(struct ast_channel *original)
{
int x;
int origstate;
unsigned int orig_disablestatecache;
unsigned int clone_disablestatecache;
int visible_indication;
int clone_was_zombie = 0;/*!< TRUE if the clonechan was a zombie before the masquerade. */
struct ast_frame *current;
@@ -7029,6 +7031,20 @@ int ast_do_masquerade(struct ast_channel *original)
ast_channel_state_set(original, ast_channel_state(clonechan));
ast_channel_state_set(clonechan, origstate);
/* And the swap the cachable state too. Otherwise we'd start caching
* Local channels and ignoring real ones. */
orig_disablestatecache = ast_test_flag(ast_channel_flags(original), AST_FLAG_DISABLE_DEVSTATE_CACHE);
clone_disablestatecache = ast_test_flag(ast_channel_flags(clonechan), AST_FLAG_DISABLE_DEVSTATE_CACHE);
if (orig_disablestatecache != clone_disablestatecache) {
if (orig_disablestatecache) {
ast_clear_flag(ast_channel_flags(original), AST_FLAG_DISABLE_DEVSTATE_CACHE);
ast_set_flag(ast_channel_flags(clonechan), AST_FLAG_DISABLE_DEVSTATE_CACHE);
} else {
ast_set_flag(ast_channel_flags(original), AST_FLAG_DISABLE_DEVSTATE_CACHE);
ast_clear_flag(ast_channel_flags(clonechan), AST_FLAG_DISABLE_DEVSTATE_CACHE);
}
}
/* Mangle the name of the clone channel */
snprintf(zombn, sizeof(zombn), "%s<ZOMBIE>", orig); /* quick, hide the brains! */
__ast_change_name_nolink(clonechan, zombn);

View File

@@ -1811,6 +1811,7 @@ void __ast_verbose_ap(const char *file, int line, const char *func, int level, s
res = ast_str_set_va(&buf, 0, fmt, ap);
/* If the build failed then we can drop this allocated message */
if (res == AST_DYNSTR_BUILD_FAILED) {
ast_free(buf);
return;
}
@@ -1838,6 +1839,7 @@ void __ast_verbose_ap(const char *file, int line, const char *func, int level, s
} while (p && *p);
ast_log_callid(__LOG_VERBOSE, file, line, func, callid, "%s", ast_str_buffer(prefixed));
ast_free(buf);
}
void __ast_verbose(const char *file, int line, const char *func, int level, const char *fmt, ...)