mirror of
https://github.com/asterisk/asterisk.git
synced 2025-10-12 15:45:18 +00:00
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/branches/1.8@279273 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -6271,17 +6271,15 @@ static int __init_manager(int reload)
|
||||
}
|
||||
}
|
||||
|
||||
if (manager_enabled) {
|
||||
ami_desc_local_address_tmp.sin_family = AF_INET;
|
||||
}
|
||||
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);
|
||||
|
||||
|
Reference in New Issue
Block a user