Allow manager.conf to use port and portno, but log that portno is deprecated.

(bug 1343)


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@2627 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 7 insertions, 1 deletions

diff --git a/manager.c b/manager.c
index cbd641c5b..b46685e3c 100755
--- a/manager.c
+++ b/manager.c
@@ -976,11 +976,17 @@ int init_manager(void)
 	if(val)
 		block_sockets = ast_true(val);
 
-	if ((val = ast_variable_retrieve(cfg, "general", "portno"))) {
+	if ((val = ast_variable_retrieve(cfg, "general", "port"))) {
 		if (sscanf(val, "%d", &portno) != 1) {
 			ast_log(LOG_WARNING, "Invalid port number '%s'\n", val);
 			portno = DEFAULT_MANAGER_PORT;
 		}
+	} else if ((val = ast_variable_retrieve(cfg, "general", "portno"))) {
+		if (sscanf(val, "%d", &portno) != 1) {
+			ast_log(LOG_WARNING, "Invalid port number '%s'\n", val);
+			portno = DEFAULT_MANAGER_PORT;
+		}
+		ast_log(LOG_NOTICE, "Use of portno in manager.conf deprecated.  Please use 'port=%s' instead.\n", val);
 	}
 	
 	ba.sin_family = AF_INET;