diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-01-10 17:22:37 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-01-11 12:07:28 +0100 |
| commit | 5c3fa98db68fbcf1f559b16238a5aba429a56448 (patch) | |
| tree | 2c981f25abac971657f88b70b2bc25b2ee09b704 /src/resolve | |
| parent | 955bb7fac3bc4704b98b87206ec44e2ae464861b (diff) | |
| download | systemd-5c3fa98db68fbcf1f559b16238a5aba429a56448.tar.gz | |
util-lib: move things that parse ifnames to shared/
In subsequent commits, calls to if_nametoindex() will be replaced by a wrapper
that falls back to alternative name resolution over netlink. netlink support
requires libsystemd (for sd-netlink), and we don't want to add any functions
that require netlink in basic/. So stuff that calls if_nametoindex() for user
supplied interface names, and everything that depends on that, needs to be
moved.
Diffstat (limited to 'src/resolve')
| -rw-r--r-- | src/resolve/resolvectl.c | 2 | ||||
| -rw-r--r-- | src/resolve/resolved-bus.c | 1 | ||||
| -rw-r--r-- | src/resolve/resolved-etc-hosts.c | 1 | ||||
| -rw-r--r-- | src/resolve/resolved-util.c | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c index 87ecd519d5..cabb3f6c69 100644 --- a/src/resolve/resolvectl.c +++ b/src/resolve/resolvectl.c @@ -16,7 +16,6 @@ #include "escape.h" #include "format-util.h" #include "gcrypt-util.h" -#include "in-addr-util.h" #include "main-func.h" #include "missing_network.h" #include "netlink-util.h" @@ -27,6 +26,7 @@ #include "resolvectl.h" #include "resolved-def.h" #include "resolved-dns-packet.h" +#include "socket-netlink.h" #include "string-table.h" #include "strv.h" #include "terminal-util.h" diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 2c1aba911a..ff6acb2eac 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -12,6 +12,7 @@ #include "resolved-dnssd-bus.h" #include "resolved-dnssd.h" #include "resolved-link-bus.h" +#include "socket-netlink.h" #include "stdio-util.h" #include "strv.h" #include "user-util.h" diff --git a/src/resolve/resolved-etc-hosts.c b/src/resolve/resolved-etc-hosts.c index 6a23d2bb8e..e6bf20db54 100644 --- a/src/resolve/resolved-etc-hosts.c +++ b/src/resolve/resolved-etc-hosts.c @@ -9,6 +9,7 @@ #include "hostname-util.h" #include "resolved-dns-synthesize.h" #include "resolved-etc-hosts.h" +#include "socket-netlink.h" #include "string-util.h" #include "strv.h" #include "time-util.h" diff --git a/src/resolve/resolved-util.c b/src/resolve/resolved-util.c index 2f18f8c19d..ac8df63513 100644 --- a/src/resolve/resolved-util.c +++ b/src/resolve/resolved-util.c @@ -1,9 +1,9 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #include "alloc-util.h" -#include "in-addr-util.h" #include "macro.h" #include "resolved-util.h" +#include "socket-netlink.h" int in_addr_ifindex_name_from_string_auto(const char *s, int *family, union in_addr_union *ret, int *ifindex, char **server_name) { _cleanup_free_ char *buf = NULL, *name = NULL; |