diff options
| author | Paul Belanger <paul.belanger@polybeacon.com> | 2010-07-24 17:54:03 +0000 |
|---|---|---|
| committer | Paul Belanger <paul.belanger@polybeacon.com> | 2010-07-24 17:54:03 +0000 |
| commit | e0dc0a7428b589e824b015a1d55ede4d725fbe39 (patch) | |
| tree | 749f810724bd73874569f1acf82c94c8e091874c /main/manager.c | |
| parent | ff2dc29d882e12817995ffeec8cd124151415bfa (diff) | |
Merged revisions 279273 via svnmerge from
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
Diffstat (limited to 'main/manager.c')
| -rw-r--r-- | main/manager.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/main/manager.c b/main/manager.c index 9d31eebda..e9007d804 100644 --- a/main/manager.c +++ b/main/manager.c @@ -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); |