dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-25 00:35:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

resolve-host: support parsing numeric interface names

Browse Source 
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.
This commit is contained in:
Lennart Poettering
2015-08-24 23:46:24 +02:00
parent d634711b26
commit 3fa4999b5d
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/resolve-host/resolve-host.c
View File

@@ -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")) {