[asterisk-commits] russell: trunk r316337 - in /trunk: ./ channels/ pbx/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue May  3 17:16:23 2011
New Revision: 316337

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=316337
Log:
Merged revisions 316336 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r316336 | russell | 2011-05-03 17:13:31 -0500 (Tue, 03 May 2011) | 8 lines
  
  Use htons() instead of ntohs() in some places.
  
  (closes issue #19200)
  Reported by: wdoekes
  Patches:
        issue19200-trunk.patch uploaded by wdoekes (license 717)
        issue19200-1.8.x.patch uploaded by wdoekes (license 717)
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_mgcp.c
    trunk/channels/chan_skinny.c
    trunk/pbx/pbx_dundi.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_mgcp.c?view=diff&rev=316337&r1=316336&r2=316337
==============================================================================
--- trunk/channels/chan_mgcp.c (original)
+++ trunk/channels/chan_mgcp.c Tue May  3 17:16:23 2011
@@ -4746,7 +4746,7 @@
 		memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
 	}
 	if (!ntohs(bindaddr.sin_port))
-		bindaddr.sin_port = ntohs(DEFAULT_MGCP_CA_PORT);
+		bindaddr.sin_port = htons(DEFAULT_MGCP_CA_PORT);
 	bindaddr.sin_family = AF_INET;
 	ast_mutex_lock(&netlock);
 	if (mgcpsock > -1)

Modified: trunk/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_skinny.c?view=diff&rev=316337&r1=316336&r2=316337
==============================================================================
--- trunk/channels/chan_skinny.c (original)
+++ trunk/channels/chan_skinny.c Tue May  3 17:16:23 2011
@@ -7204,7 +7204,7 @@
 		memcpy(&__ourip, hp->h_addr, sizeof(__ourip));
 	}
 	if (!ntohs(bindaddr.sin_port)) {
-		bindaddr.sin_port = ntohs(DEFAULT_SKINNY_PORT);
+		bindaddr.sin_port = htons(DEFAULT_SKINNY_PORT);
 	}
 	bindaddr.sin_family = AF_INET;
 

Modified: trunk/pbx/pbx_dundi.c
URL: http://svnview.digium.com/svn/asterisk/trunk/pbx/pbx_dundi.c?view=diff&rev=316337&r1=316336&r2=316337
==============================================================================
--- trunk/pbx/pbx_dundi.c (original)
+++ trunk/pbx/pbx_dundi.c Tue May  3 17:16:23 2011
@@ -4678,7 +4678,7 @@
 	v = ast_variable_browse(cfg, "general");
 	while(v) {
 		if (!strcasecmp(v->name, "port")){
-			sin->sin_port = ntohs(atoi(v->value));
+			sin->sin_port = htons(atoi(v->value));
 			if(last_port==0){
 				last_port=sin->sin_port;
 			} else if(sin->sin_port != last_port)
@@ -4831,7 +4831,7 @@
 	dundi_set_error(dundi_error_output);
 
 	sin.sin_family = AF_INET;
-	sin.sin_port = ntohs(DUNDI_PORT);
+	sin.sin_port = htons(DUNDI_PORT);
 	sin.sin_addr.s_addr = INADDR_ANY;
 
 	/* Make a UDP socket */