[asterisk-commits] dvossel: branch 1.6.0 r232354 - in /branches/1.6.0: ./ main/acl.c

[SVN commits to the Asterisk project]

Author: dvossel
Date: Wed Dec  2 11:03:26 2009
New Revision: 232354

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=232354
Log:
Merged revisions 232351 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r232351 | dvossel | 2009-12-02 11:00:15 -0600 (Wed, 02 Dec 2009) | 12 lines
  
  Merged revisions 232350 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r232350 | dvossel | 2009-12-02 10:59:18 -0600 (Wed, 02 Dec 2009) | 6 lines
    
    ast_outaddrfor doesn't do htons() on port, looks odd in strace.
    
    (closes issue #16290)
    Reported by: wdoekes
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/main/acl.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/main/acl.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/acl.c?view=diff&rev=232354&r1=232353&r2=232354
==============================================================================
--- branches/1.6.0/main/acl.c (original)
+++ branches/1.6.0/main/acl.c Wed Dec  2 11:03:26 2009
@@ -473,7 +473,7 @@
 		return -1;
 	}
 	sin.sin_family = AF_INET;
-	sin.sin_port = 5060;
+	sin.sin_port = htons(5060);
 	sin.sin_addr = *them;
 	if (connect(s, (struct sockaddr *)&sin, sizeof(sin))) {
 		ast_log(LOG_WARNING, "Cannot connect\n");