kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 279273 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r279273 | pabelanger | 2010-07-24 13:36:42 -0400 (Sat, 24 Jul 2010) | 6 lines
  
  Default sin_family to AF_INET for TCP / TLS Bindaddress. 
  
  Otherwise, 'manager show settings' will generate errors
  if manager is not enabled.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@279274 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Paul Belanger
2010-07-24 17:54:03 +00:00
parent ff2dc29d88
commit e0dc0a7428
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
main/manager.c
View File

@@ -6271,17 +6271,15 @@ static int __init_manager(int reload)
}
}
if (manager_enabled) {
ami_desc_local_address_tmp.sin_family = AF_INET;
}
amis_desc_local_address_tmp.sin_family = AF_INET;
/* if the amis address has not been set, default is the same as non secure ami */
if (!amis_desc_local_address_tmp.sin_addr.s_addr) {
amis_desc_local_address_tmp.sin_addr =
ami_desc_local_address_tmp.sin_addr;
}
if (ami_tls_cfg.enabled) {
amis_desc_local_address_tmp.sin_family = AF_INET;
}
ast_sockaddr_from_sin(&ami_desc.local_address, &ami_desc_local_address_tmp);
ast_sockaddr_from_sin(&amis_desc.local_address, &amis_desc_local_address_tmp);