diff options
author | Lennart Poettering <lennart@poettering.net> | 2020-06-16 20:35:18 +0200 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2020-06-18 06:08:18 +0200 |
commit | 2a71d57f4e63e4492a7c2d6d747e498d0c5521cd (patch) | |
tree | b685e5b5c57b1f950e4920fd1322fd456977ad1a /src/libsystemd/sd-network | |
parent | Merge pull request #16061 from filbranden/standalone1 (diff) | |
download | systemd-2a71d57f4e63e4492a7c2d6d747e498d0c5521cd.tar.xz systemd-2a71d57f4e63e4492a7c2d6d747e498d0c5521cd.zip |
network: clean-up DHCP lease server data configuration
This is an attempt to clean up the POP3/SMTP/LPR/… DHCP lease server
data logic in networkd. This reduces code duplication and fixes a number
of bugs.
This removes any support for collecting POP3/SMPT/LPR servers acquired
via local DHCP client releases since noone uses that, and given how old
these protocols are I doubt this will change. It keeps support for
configuring them for the dhcp server however.
The differences between the DNS/NTP/SIP/POP3/SMTP/LPR configuration
logics are minimized.
This removes the relevant symbols from sd-network.h (which is an
internal API only at this point after all).
This is unfortunately not well test, given the old code for this had
barely any tests. But the new code should not perform worse at least,
and allow us to release, since it corrects some interfaces visible in
the .network configuration format.
Fixes: #15943
Diffstat (limited to 'src/libsystemd/sd-network')
-rw-r--r-- | src/libsystemd/sd-network/sd-network.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 2fde4fbb64..30f47244ad 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -264,22 +264,6 @@ _public_ int sd_network_link_get_route_domains(int ifindex, char ***ret) { return network_link_get_strv(ifindex, "ROUTE_DOMAINS", ret); } -_public_ int sd_network_link_get_sip_servers(int ifindex, char ***ret) { - return network_link_get_strv(ifindex, "SIP", ret); -} - -_public_ int sd_network_link_get_pop3_servers(int ifindex, char ***pop3) { - return network_link_get_strv(ifindex, "POP3_SERVERS", pop3); -} - -_public_ int sd_network_link_get_smtp_servers(int ifindex, char ***ret) { - return network_link_get_strv(ifindex, "SMTP_SERVERS", ret); -} - -_public_ int sd_network_link_get_lpr_servers(int ifindex, char ***ret) { - return network_link_get_strv(ifindex, "LPR_SERVERS", ret); -} - _public_ int sd_network_link_get_dns_default_route(int ifindex) { char path[STRLEN("/run/systemd/netif/links/") + DECIMAL_STR_MAX(ifindex) + 1]; _cleanup_free_ char *s = NULL; |