diff options
| author | Lennart Poettering <lennart@poettering.net> | 2015-08-24 23:46:24 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2015-08-24 23:46:24 +0200 |
| commit | 3fa4999b5d29e6ee368ed2fd5d65928cfae9435e (patch) | |
| tree | 5dcdbeef36db6c248adde42f89075497b9e15e69 /src | |
| parent | resolved: remove duplicate handling of "no servers" query result (diff) | |
| download | systemd-3fa4999b5d29e6ee368ed2fd5d65928cfae9435e.tar.xz systemd-3fa4999b5d29e6ee368ed2fd5d65928cfae9435e.zip | |
resolve-host: support parsing numeric interface names
If the user specifies an interface by its ifindex we should handle this
nicely. Hence let's try to parse the ifindex as a number before we try
to resolve it as an interface name.
Diffstat (limited to 'src')
| -rw-r--r-- | src/resolve-host/resolve-host.c | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c index 4a7d1e3173..9847effb53 100644 --- a/src/resolve-host/resolve-host.c +++ b/src/resolve-host/resolve-host.c @@ -490,7 +490,7 @@ static int parse_argv(int argc, char *argv[]) { { "version", no_argument, NULL, ARG_VERSION }, { "type", required_argument, NULL, 't' }, { "class", required_argument, NULL, 'c' }, - { "legend", optional_argument, NULL, ARG_LEGEND }, + { "legend", optional_argument, NULL, ARG_LEGEND }, { "protocol", required_argument, NULL, 'p' }, {} }; @@ -520,11 +520,21 @@ static int parse_argv(int argc, char *argv[]) { arg_family = AF_INET6; break; - case 'i': - arg_ifindex = if_nametoindex(optarg); - if (arg_ifindex <= 0) - return log_error_errno(errno, "Unknown interfaces %s: %m", optarg); + case 'i': { + int ifi; + + if (safe_atoi(optarg, &ifi) >= 0 && ifi > 0) + arg_ifindex = ifi; + else { + ifi = if_nametoindex(optarg); + if (ifi <= 0) + return log_error_errno(errno, "Unknown interface %s: %m", optarg); + + arg_ifindex = ifi; + } + break; + } case 't': if (streq(optarg, "help")) { |