diff options
| author | Jon Schipp <jonschipp@gmail.com> | 2014-08-04 20:39:13 +0000 |
|---|---|---|
| committer | Tobias Klauser <tklauser@distanz.ch> | 2014-08-05 08:55:33 +0200 |
| commit | 815dcd255ea9da8b23e8e7c839545d5d41eee336 (patch) | |
| tree | 589fce4d2be463ee759692bfcab155c947bf5845 /staging | |
| parent | eb9d3eeea59be2618598ada24a1f24deaae57c3d (diff) | |
mausezahn: provide listen-addr option to configuration file
Specify the listen-addr for the CLI in /etc/netsniff-ng/mausezahn.conf
and remove the message, "mz: device not given, will use eth0" since
we're listening by IP, rather than interface now, and this shows continues
to show.
$ grep listen-addr /etc/netsniff-ng/mausezahn.conf
listen-addr = 127.0.0.1
$ mausezahn -V -x
mz: device eth0 got assigned 10.0.2.15 and is a possible candidate.
mz: device lo got assigned 127.0.0.1 (loopback)
Opening config file /etc/netsniff-ng/mausezahn.conf...
...
Mausezahn accepts incoming Telnet connections on 127.0.0.1:25542.
Signed-off-by: Jon Schipp <jonschipp@gmail.com>
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Diffstat (limited to 'staging')
| -rw-r--r-- | staging/cli.c | 10 | ||||
| -rw-r--r-- | staging/mausezahn.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/staging/cli.c b/staging/cli.c index a5ce174..3d39bd3 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, port=0; + int user=0, pass=0, ena=0, amp=0, mgmt_only=0, cli=0, port=0, addr=0; strncpy(filename, str, 255); @@ -78,9 +78,10 @@ int cli_read_cfg(char *str) if (nonspc==0) continue; else nonspc=0; 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 (!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 (!addr) addr = sscanf(line, " listen-addr = %s ", mz_listen_addr); + if (!cli) cli = sscanf(line, " cli-device = %s ", dev); if (cli==1) { for (i=0; i<device_list_entries; i++) { if (strncmp(device_list[i].dev, dev, 16)==0) { @@ -145,6 +146,9 @@ int cli_read_cfg(char *str) if (port!=1) fprintf(stderr, "%s: No port specified - will use default.\n", filename); + + if (addr!=1) + fprintf(stderr, "%s: No listen address specified - will use default.\n", filename); } cli_debug = 0; diff --git a/staging/mausezahn.c b/staging/mausezahn.c index 46b7428..6edef71 100644 --- a/staging/mausezahn.c +++ b/staging/mausezahn.c @@ -563,8 +563,6 @@ int getopts (int argc, char *argv[]) if (verbose) fprintf(stderr, " mz: no active interfaces found!\n"); strcpy(tx.device, "lo"); } - if (verbose) // device found - fprintf(stderr," mz: device not given, will use %s\n",tx.device); break; case 1: // arg_string OR device given => find out! if ( (strncmp(argv[optind],"eth",3)==0) |