diff options
author | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-05 19:40:30 +0000 |
---|---|---|
committer | citats <citats@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-04-05 19:40:30 +0000 |
commit | 6710b17d12c2e9cbcaf5a9c344820f2bd7559bb8 (patch) | |
tree | 6c99a5cfbe6ccf118b47a04b05f9b19e55e5d05d /manager.c | |
parent | beea36af83384b010b415d1a86e967403754a9eb (diff) |
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
Diffstat (limited to 'manager.c')
-rwxr-xr-x | manager.c | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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; |