SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolvectl: for our per-link verbs alternatively accept interface name in -i

Browse Source 
it's a bit confusing that we take two interfaces for verbs such as "dns"
or "domain": once after the verb, and once as --interface=. While
there's logic behind it, let's make this least surprising: if either is
specified be happy.

This means "resolvectl -i foo dns" is now equivalent to "resolvectl dns
foo …". Note that this is a tweak only, to minimize surprises. We don't
document this alternative syntax, and shouldn't to keep things simple.
This commit is contained in:
Lennart Poettering
2018-12-05 18:46:23 +01:00
parent a77081e30f
commit d129304919
1 changed files with 65 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolvectl.c
+65 -46
View File
@@ -1866,14 +1866,16 @@ static int verb_dns(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_DNS);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_DNS, NULL);
r = sd_bus_message_new_method_call(
@@ -1950,14 +1952,16 @@ static int verb_domain(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_DOMAIN);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_DOMAIN, NULL);
r = sd_bus_message_new_method_call(
@@ -2026,14 +2030,16 @@ static int verb_llmnr(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_LLMNR);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_LLMNR, NULL);
r = sd_bus_call_method(bus,
@@ -2065,14 +2071,16 @@ static int verb_mdns(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_MDNS);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_MDNS, NULL);
r = sd_bus_call_method(bus,
@@ -2104,14 +2112,16 @@ static int verb_dns_over_tls(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_PRIVATE);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_PRIVATE, NULL);
r = sd_bus_call_method(bus,
@@ -2143,14 +2153,16 @@ static int verb_dnssec(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_DNSSEC);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_DNSSEC, NULL);
r = sd_bus_call_method(bus,
@@ -2185,14 +2197,16 @@ static int verb_nta(int argc, char **argv, void *userdata) {
assert(bus);
if (argc <= 1)
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return status_all(bus, STATUS_NTA);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc == 2)
if (argc < 3)
return status_ifindex(bus, arg_ifindex, NULL, STATUS_NTA, NULL);
/* If only argument is the empty string, then call SetLinkDNSSECNegativeTrustAnchors()
@@ -2250,9 +2264,14 @@ static int verb_revert_link(int argc, char **argv, void *userdata) {
assert(bus);
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
if (argc >= 2) {
r = ifname_mangle(argv[1], false);
if (r < 0)
return r;
}
if (arg_ifindex <= 0)
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Interface argument required.");
r = sd_bus_call_method(bus,
"org.freedesktop.resolve1",
@@ -2943,7 +2962,7 @@ static int native_main(int argc, char *argv[], sd_bus *bus) {
{ "dnsovertls", VERB_ANY, 3, 0, verb_dns_over_tls },
{ "dnssec", VERB_ANY, 3, 0, verb_dnssec },
{ "nta", VERB_ANY, VERB_ANY, 0, verb_nta },
{ "revert", 2, 2, 0, verb_revert_link },
{ "revert", VERB_ANY, 2, 0, verb_revert_link },
{}
};