Merge 357665, update .version and ChangeLog

git-svn-id: https://origsvn.digium.com/svn/asterisk/tags/1.8.10.0-rc4@357724 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Matthew Jordan
2012-03-01 22:18:11 +00:00
parent fcaa93a479
commit 2f4b4cde38
5 changed files with 22 additions and 152 deletions

View File

@@ -1 +1 @@
1.8.10.0-rc3
1.8.10.0-rc4

View File

@@ -1,3 +1,16 @@
2012-03-02 Asterisk Development Team <asteriskteam@digium.com>
* Asterisk 1.8.10.0-rc4 Released.
* main/acl.c: Prevent outbound SIP NOTIFY packets from displaying
a port of 0.
In the change from 1.6.2 to 1.8, ast_sockaddr was introduced which
changed the behavior of ast_find_ourip such that port number was
wiped out. This caused the port in internip (which is used for
Contact and Call-ID on NOTIFYs) to be 0. This change causes
ast_find_ourip to be port-preserving again.
2012-02-28 Asterisk Development Team <asteriskteam@digium.com>
* Asterisk 1.8.10.0-rc3 Released.

View File

@@ -1,61 +0,0 @@
<!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.10.0-rc3</title></head>
<body>
<h1 align="center"><a name="top">Release Summary</a></h1>
<h3 align="center">asterisk-1.8.10.0-rc3</h3>
<h3 align="center">Date: 2012-02-28</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-1.8.10.0-rc2.</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>
2 mjordan<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=357261">357261</a></td><td>mjordan</td><td>Create 1.8.10.0-rc3</td>
<td></td></tr><tr><td><a href="http://svn.digium.com/view/asterisk/branches/1.8?view=revision&revision=357264">357264</a></td><td>mjordan</td><td>Updates for 1.8.10.0-rc3</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 | 62 ++++++++++++++++++++++++
asterisk-1.8.10.0-rc2-summary.html | 64 ------------------------
asterisk-1.8.10.0-rc2-summary.txt | 95 -------------------------------------
channels/chan_sip.c | 46 +++++++++++------
main/channel.c | 10 +++
6 files changed, 102 insertions(+), 177 deletions(-)
</pre><br/>
<hr/>
</body>
</html>

View File

@@ -1,89 +0,0 @@
Release Summary
asterisk-1.8.10.0-rc3
Date: 2012-02-28
<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.10.0-rc2.
----------------------------------------------------------------------
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
2 mjordan
----------------------------------------------------------------------
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 |
|------------+----------+---------------------------+--------------------|
| 357261 | mjordan | Create 1.8.10.0-rc3 | |
|------------+----------+---------------------------+--------------------|
| 357264 | mjordan | Updates for 1.8.10.0-rc3 | |
+------------------------------------------------------------------------+
----------------------------------------------------------------------
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 | 62 ++++++++++++++++++++++++
asterisk-1.8.10.0-rc2-summary.html | 64 ------------------------
asterisk-1.8.10.0-rc2-summary.txt | 95 -------------------------------------
channels/chan_sip.c | 46 +++++++++++------
main/channel.c | 10 +++
6 files changed, 102 insertions(+), 177 deletions(-)
----------------------------------------------------------------------

View File

@@ -737,6 +737,7 @@ int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindad
{
char ourhost[MAXHOSTNAMELEN] = "";
struct ast_sockaddr root;
int res, port = ast_sockaddr_port(ourip);
/* just use the bind address if it is nonzero */
if (!ast_sockaddr_is_any(bindaddr)) {
@@ -749,6 +750,8 @@ int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindad
ast_log(LOG_WARNING, "Unable to get hostname\n");
} else {
if (resolve_first(ourip, ourhost, PARSE_PORT_FORBID, family) == 0) {
/* reset port since resolve_first wipes this out */
ast_sockaddr_set_port(ourip, port);
return 0;
}
}
@@ -756,8 +759,12 @@ int ast_find_ourip(struct ast_sockaddr *ourip, const struct ast_sockaddr *bindad
/* A.ROOT-SERVERS.NET. */
if (!resolve_first(&root, "A.ROOT-SERVERS.NET", PARSE_PORT_FORBID, 0) &&
!ast_ouraddrfor(&root, ourip)) {
/* reset port since resolve_first wipes this out */
ast_sockaddr_set_port(ourip, port);
return 0;
}
return get_local_address(ourip);
res = get_local_address(ourip);
ast_sockaddr_set_port(ourip, port);
return res;
}