[asterisk-commits] mjordan: tag 10.2.0-rc4 r357730 - in /tags/10.2.0-rc4: ./ main/

[SVN commits to the Asterisk project]

Author: mjordan
Date: Thu Mar  1 16:21:37 2012
New Revision: 357730

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=357730
Log:
Merge 357667, update ChangeLog and .version

Removed:
    tags/10.2.0-rc4/asterisk-10.2.0-rc3-summary.html
    tags/10.2.0-rc4/asterisk-10.2.0-rc3-summary.txt
Modified:
    tags/10.2.0-rc4/   (props changed)
    tags/10.2.0-rc4/.version
    tags/10.2.0-rc4/ChangeLog
    tags/10.2.0-rc4/main/acl.c

Propchange: tags/10.2.0-rc4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar  1 16:21:37 2012
@@ -1,1 +1,1 @@
-/branches/10:353372,353397,353916,354000,354496,354543,354548,355733,356476,357095
+/branches/10:353372,353397,353916,354000,354496,354543,354548,355733,356476,357095,357667

Modified: tags/10.2.0-rc4/.version
URL: http://svnview.digium.com/svn/asterisk/tags/10.2.0-rc4/.version?view=diff&rev=357730&r1=357729&r2=357730
==============================================================================
--- tags/10.2.0-rc4/.version (original)
+++ tags/10.2.0-rc4/.version Thu Mar  1 16:21:37 2012
@@ -1,1 +1,1 @@
-10.2.0-rc3
+10.2.0-rc4

Modified: tags/10.2.0-rc4/ChangeLog
URL: http://svnview.digium.com/svn/asterisk/tags/10.2.0-rc4/ChangeLog?view=diff&rev=357730&r1=357729&r2=357730
==============================================================================
--- tags/10.2.0-rc4/ChangeLog (original)
+++ tags/10.2.0-rc4/ChangeLog Thu Mar  1 16:21:37 2012
@@ -1,3 +1,16 @@
+2012-03-01  Asterisk Development Team <asteriskteam at digium.com>
+
+	* Asterisk 10.2.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 at digium.com>
 
 	* Asterisk 10.2.0-rc3 Released.

Modified: tags/10.2.0-rc4/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/tags/10.2.0-rc4/main/acl.c?view=diff&rev=357730&r1=357729&r2=357730
==============================================================================
--- tags/10.2.0-rc4/main/acl.c (original)
+++ tags/10.2.0-rc4/main/acl.c Thu Mar  1 16:21:37 2012
@@ -737,6 +737,7 @@
 {
 	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 @@
 		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 @@
 	/* 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;
+}
+