diff options
| -rw-r--r-- | mausezahn.8 | 2 | ||||
| -rw-r--r-- | staging/cli.c | 13 | ||||
| -rw-r--r-- | staging/mausezahn.c | 4 |
3 files changed, 12 insertions, 7 deletions
diff --git a/mausezahn.8 b/mausezahn.8 index 6614407..2873e9d 100644 --- a/mausezahn.8 +++ b/mausezahn.8 @@ -230,6 +230,7 @@ Options supported in the configuration file are: user Username for authentication (default: mz) password Password for authentication (default: mz) enable Password to enter privilege mode (default: mops) + port The listening port for the CLI (default: 25542) cli-device Interface to bind to (default: all) *not fully implemented* .SS Example: @@ -238,6 +239,7 @@ Options supported in the configuration file are: user = mzadmin password = mzpasswd enable = privilege-mode-passwd + port = 65000 .PP .SH INTERACTIVE MODE HOWTO .PP diff --git a/staging/cli.c b/staging/cli.c index 9abc648..a5ce174 100644 --- a/staging/cli.c +++ b/staging/cli.c @@ -56,7 +56,7 @@ int cli_read_cfg(char *str) char dev[256]; FILE *fd; int i, j=0, len, found=0, nonspc=0; - int user=0, pass=0, ena=0, amp=0, mgmt_only=0, cli=0; + int user=0, pass=0, ena=0, amp=0, mgmt_only=0, cli=0, port=0; strncpy(filename, str, 255); @@ -79,6 +79,7 @@ int cli_read_cfg(char *str) if (!user) user = sscanf(line, " user = %s ", mz_username); if (!pass) pass = sscanf(line, " password = %s ", mz_password); if (!ena) ena = sscanf(line, " enable = %s ", mz_enable); + if (!port) port = sscanf(line, " port = %i ", &mz_port); if (!cli) cli = sscanf(line, " cli-device = %s ", dev); if (cli==1) { for (i=0; i<device_list_entries; i++) { @@ -131,7 +132,7 @@ int cli_read_cfg(char *str) } } fclose(fd); - + if (verbose) { if (user!=1) fprintf(stderr, "%s: No user name specified - will use default.\n", filename); @@ -141,6 +142,9 @@ int cli_read_cfg(char *str) if (ena!=1) fprintf(stderr, "%s: No enable password specified - will use default.\n", filename); + + if (port!=1) + fprintf(stderr, "%s: No port specified - will use default.\n", filename); } cli_debug = 0; @@ -528,7 +532,6 @@ int cli() } } - // Listen on port mz_port (default: 25542, towel day) memset(&servaddr, 0, sizeof(servaddr)); servaddr.sin_family = AF_INET; @@ -536,6 +539,10 @@ int cli() servaddr.sin_port = htons(mz_port); bind(s, (struct sockaddr *)&servaddr, sizeof(servaddr)); + if (!quiet) { + fprintf(stderr, "Mausezahn accepts incoming Telnet connections on %s:%i.\n", mz_listen_addr, mz_port); + } + // Wait for a connection listen(s, 50); diff --git a/staging/mausezahn.c b/staging/mausezahn.c index 0c0296e..46b7428 100644 --- a/staging/mausezahn.c +++ b/staging/mausezahn.c @@ -727,10 +727,6 @@ int getopts (int argc, char *argv[]) mz_port = (int) str2int (tx.arg_string); } - if (!quiet) { - fprintf(stderr, "Mausezahn accepts incoming Telnet connections on port %i.\n", mz_port); - } - mz_cli_init(); cli(); } |