kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 08:13:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 316336 via svnmerge from

Browse Source 
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)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@316337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2011-05-03 22:16:23 +00:00
parent f4417923ce
commit 95561bd37a
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_mgcp.c
View File

@@ -4746,7 +4746,7 @@ static int reload_config(int reload)
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)

2
channels/chan_skinny.c
View File

@@ -7204,7 +7204,7 @@ static struct ast_channel *skinny_request(const char *type, struct ast_format_ca
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;

4
pbx/pbx_dundi.c
View File

@@ -4678,7 +4678,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin, int reload)
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 @@ static int load_module(void)
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 */