From b5da1073b09942c77dbfd39335d0c93c544d4e57 Mon Sep 17 00:00:00 2001
From: James Golovich <james@gnuinter.net>
Date: Mon, 5 Apr 2004 19:40:30 +0000
Subject: [PATCH] Allow manager.conf to use port and portno, but log that
portno is deprecated. (bug 1343)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2627 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
manager.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/manager.c b/manager.c
index cbd641c5b2..b46685e3c9 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;
--
GitLab