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

resolve: rename Link.name -> Link.ifname

Browse Source 
This also changes the type from char[IF_NAMESIZE] to char*.
By changing the type, now resolved-link.h can drop the dependency to
the header net/if.h.
This commit is contained in:
Yu Watanabe
2019-04-13 17:51:59 +09:00
parent dc653bf487
commit 6ff79f7640
7 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-link.c
+14 -13
View File
@@ -1,6 +1,5 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#include <net/if.h>
#include <linux/if.h>
#include <unistd.h>
@@ -98,6 +97,7 @@ Link *link_free(Link *l) {
dns_scope_free(l->mdns_ipv6_scope);
free(l->state_file);
free(l->ifname);
return mfree(l);
}
@@ -239,8 +239,9 @@ int link_process_rtnl(Link *l, sd_netlink_message *m) {
(void) sd_netlink_message_read_u8(m, IFLA_OPERSTATE, &l->operstate);
if (sd_netlink_message_read_string(m, IFLA_IFNAME, &n) >= 0) {
strncpy(l->name, n, sizeof(l->name)-1);
char_array_0(l->name);
r = free_and_strdup(&l->ifname, n);
if (r < 0)
return r;
}
link_allocate_scopes(l);
@@ -596,7 +597,7 @@ static void link_read_settings(Link *l) {
r = link_is_managed(l);
if (r < 0) {
log_warning_errno(r, "Failed to determine whether interface %s is managed: %m", l->name);
log_warning_errno(r, "Failed to determine whether interface %s is managed: %m", l->ifname);
return;
}
if (r == 0) {
@@ -613,35 +614,35 @@ static void link_read_settings(Link *l) {
r = link_update_dns_servers(l);
if (r < 0)
log_warning_errno(r, "Failed to read DNS servers for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read DNS servers for interface %s, ignoring: %m", l->ifname);
r = link_update_llmnr_support(l);
if (r < 0)
log_warning_errno(r, "Failed to read LLMNR support for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read LLMNR support for interface %s, ignoring: %m", l->ifname);
r = link_update_mdns_support(l);
if (r < 0)
log_warning_errno(r, "Failed to read mDNS support for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read mDNS support for interface %s, ignoring: %m", l->ifname);
r = link_update_dns_over_tls_mode(l);
if (r < 0)
log_warning_errno(r, "Failed to read DNS-over-TLS mode for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read DNS-over-TLS mode for interface %s, ignoring: %m", l->ifname);
r = link_update_dnssec_mode(l);
if (r < 0)
log_warning_errno(r, "Failed to read DNSSEC mode for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read DNSSEC mode for interface %s, ignoring: %m", l->ifname);
r = link_update_dnssec_negative_trust_anchors(l);
if (r < 0)
log_warning_errno(r, "Failed to read DNSSEC negative trust anchors for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read DNSSEC negative trust anchors for interface %s, ignoring: %m", l->ifname);
r = link_update_search_domains(l);
if (r < 0)
log_warning_errno(r, "Failed to read search domains for interface %s, ignoring: %m", l->name);
log_warning_errno(r, "Failed to read search domains for interface %s, ignoring: %m", l->ifname);
r = link_update_default_route(l);
if (r < 0)
log_warning_errno(r, "Failed to read default route setting for interface %s, proceeding anyway: %m", l->name);
log_warning_errno(r, "Failed to read default route setting for interface %s, proceeding anyway: %m", l->ifname);
}
int link_update(Link *l) {
@@ -728,7 +729,7 @@ DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
return s;
if (s)
log_debug("Switching to DNS server %s for interface %s.", dns_server_string(s), l->name);
log_debug("Switching to DNS server %s for interface %s.", dns_server_string(s), l->ifname);
dns_server_unref(l->current_dns_server);
l->current_dns_server = dns_server_ref(s);