diff options
| author | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-24 17:36:42 +0000 |
|---|---|---|
| committer | pabelanger <pabelanger@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-24 17:36:42 +0000 |
| commit | cc98f5c62720faa5de5791a9154597d6ec79bb35 (patch) | |
| tree | 8c3bb05211693bc9f5c1350a76bec4b9e28564e1 /main | |
| parent | c47d8f7e2176414481a1f804ce2de1022a4a80cc (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.8@279273 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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); |