From 2f4b4cde38f533596e4f128b4abb8306f732a28c Mon Sep 17 00:00:00 2001 From: Matthew Jordan Date: Thu, 1 Mar 2012 22:18:11 +0000 Subject: [PATCH] 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 --- .version | 2 +- ChangeLog | 13 +++++ asterisk-1.8.10.0-rc3-summary.html | 61 -------------------- asterisk-1.8.10.0-rc3-summary.txt | 89 ------------------------------ main/acl.c | 9 ++- 5 files changed, 22 insertions(+), 152 deletions(-) delete mode 100644 asterisk-1.8.10.0-rc3-summary.html delete mode 100644 asterisk-1.8.10.0-rc3-summary.txt diff --git a/.version b/.version index 838e224bf2..36427da0e1 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -1.8.10.0-rc3 +1.8.10.0-rc4 diff --git a/ChangeLog b/ChangeLog index da6cc04ee5..ed837f468f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2012-03-02 Asterisk Development Team + + * 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 * Asterisk 1.8.10.0-rc3 Released. diff --git a/asterisk-1.8.10.0-rc3-summary.html b/asterisk-1.8.10.0-rc3-summary.html deleted file mode 100644 index 1b9abfa14d..0000000000 --- a/asterisk-1.8.10.0-rc3-summary.html +++ /dev/null @@ -1,61 +0,0 @@ - - -Release Summary - asterisk-1.8.10.0-rc3 - -

Release Summary

-

asterisk-1.8.10.0-rc3

-

Date: 2012-02-28

-

<asteriskteam@digium.com>

-
-

Table of Contents

-
    -
  1. Summary
    2. -
  2. Contributors
    3. -
  3. Other Changes
    4. -
  4. Diffstat
    5. -
-
-

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.

- - - -
RevisionAuthorSummaryIssues Referenced
357261mjordanCreate 1.8.10.0-rc3
357264mjordanUpdates 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(-)
-

-
- - diff --git a/asterisk-1.8.10.0-rc3-summary.txt b/asterisk-1.8.10.0-rc3-summary.txt deleted file mode 100644 index caeec168c5..0000000000 --- a/asterisk-1.8.10.0-rc3-summary.txt +++ /dev/null @@ -1,89 +0,0 @@ - Release Summary - - asterisk-1.8.10.0-rc3 - - Date: 2012-02-28 - - - - ---------------------------------------------------------------------- - - 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(-) - - ---------------------------------------------------------------------- diff --git a/main/acl.c b/main/acl.c index 160f60a919..cc57570b46 100644 --- a/main/acl.c +++ b/main/acl.c @@ -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; }