From 9c1c787c360795f2419ed9d863a01d3495e57d50 Mon Sep 17 00:00:00 2001
From: Terry Wilson <twilson@digium.com>
Date: Thu, 23 Sep 2010 18:08:23 +0000
Subject: [PATCH] Merged revisions 288572 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r288572 | twilson | 2010-09-23 13:05:16 -0500 (Thu, 23 Sep 2010) | 2 lines
Make AMI honor enabled=no
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@288573 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/manager.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/main/manager.c b/main/manager.c
index d3c46d1226..493b843603 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -6205,6 +6205,8 @@ static int __init_manager(int reload)
/* default values */
ast_copy_string(global_realm, S_OR(ast_config_AST_SYSTEM_NAME, DEFAULT_REALM), sizeof(global_realm));
+ memset(&ami_desc.local_address, 0, sizeof(struct sockaddr_in));
+ memset(&amis_desc.local_address, 0, sizeof(amis_desc.local_address));
amis_desc_local_address_tmp.sin_port = htons(5039);
ami_desc_local_address_tmp.sin_port = htons(DEFAULT_MANAGER_PORT);
@@ -6289,8 +6291,10 @@ static int __init_manager(int reload)
ami_desc_local_address_tmp.sin_addr;
}
- 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);
+ if (manager_enabled) {
+ 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);
+ }
AST_RWLIST_WRLOCK(&users);
--
GitLab