Resolve alternative ifnames wherever we would resolve an interface name
To keep the names manageable, "ifname_or_ifindex" is replaced by "interface".
This commit is contained in:
@@ -93,23 +93,6 @@ int parse_ifindex(const char *s) {
|
||||
return ifi;
|
||||
}
|
||||
|
||||
int parse_ifindex_or_ifname(const char *s) {
|
||||
int r;
|
||||
|
||||
assert(s);
|
||||
|
||||
r = parse_ifindex(s);
|
||||
if (r > 0)
|
||||
return r;
|
||||
assert(r < 0);
|
||||
|
||||
r = (int) if_nametoindex(s);
|
||||
if (r <= 0)
|
||||
return -errno;
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
int parse_mtu(int family, const char *s, uint32_t *ret) {
|
||||
uint64_t u;
|
||||
size_t m;
|
||||
|
||||
@@ -14,7 +14,6 @@ int parse_dev(const char *s, dev_t *ret);
|
||||
int parse_pid(const char *s, pid_t* ret_pid);
|
||||
int parse_mode(const char *s, mode_t *ret);
|
||||
int parse_ifindex(const char *s);
|
||||
int parse_ifindex_or_ifname(const char *s);
|
||||
int parse_mtu(int family, const char *s, uint32_t *ret);
|
||||
|
||||
int parse_size(const char *t, uint64_t base, uint64_t *size);
|
||||
|
||||
Reference in New Issue
Block a user