[svn-commits] twilson: branch 1.8 r288572 - /branches/1.8/main/manager.c

[SVN commits to the Digium repositories]

Author: twilson
Date: Thu Sep 23 13:05:16 2010
New Revision: 288572

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=288572
Log:
Make AMI honor enabled=no

Modified:
    branches/1.8/main/manager.c

Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=288572&r1=288571&r2=288572
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Thu Sep 23 13:05:16 2010
@@ -6215,6 +6215,8 @@
 
 	/* 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);
 
@@ -6299,8 +6301,10 @@
 		    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);