From e0dc0a7428b589e824b015a1d55ede4d725fbe39 Mon Sep 17 00:00:00 2001 From: Paul Belanger Date: Sat, 24 Jul 2010 17:54:03 +0000 Subject: [PATCH] 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 --- main/manager.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/main/manager.c b/main/manager.c index 9d31eebdab..e9007d8044 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);