Index: manager.c =================================================================== RCS file: /usr/cvsroot/asterisk/manager.c,v retrieving revision 1.47 diff -u -r1.47 manager.c --- manager.c 1 May 2004 23:52:27 -0000 1.47 +++ manager.c 17 May 2004 19:34:18 -0000 @@ -1041,18 +1041,11 @@ if(val) block_sockets = ast_true(val); - if ((val = ast_variable_retrieve(cfg, "general", "port"))) { + 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; ba.sin_port = htons(portno); @@ -1100,7 +1093,7 @@ return -1; } if (option_verbose) - ast_verbose("Asterisk Management interface listening on port %d\n", portno); + ast_verbose("Asterisk Manager listening on interface %s:%d\n", inet_ntoa(ba.sin_addr), portno); pthread_create(&t, NULL, accept_thread, NULL); } return 0;