Skip to content

Commit 6ff79f7

Browse files
yuwatayuwata
committed
resolve: rename Link.name -> Link.ifname
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.
1 parent dc653bf commit 6ff79f7

File tree

7 files changed

+28
-27
lines changed

7 files changed

+28
-27
lines changed

‎src/resolve/resolved-dns-scope.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ int dns_scope_new(Manager *m, DnsScope **ret, Link *l, DnsProtocol protocol, int
6767
dns_scope_llmnr_membership(s, true);
6868
dns_scope_mdns_membership(s, true);
6969

70-
log_debug("New scope on link %s, protocol %s, family %s", l ? l->name : "*", dns_protocol_to_string(protocol), family == AF_UNSPEC ? "*" : af_to_name(family));
70+
log_debug("New scope on link %s, protocol %s, family %s", l ? l->ifname : "*", dns_protocol_to_string(protocol), family == AF_UNSPEC ? "*" : af_to_name(family));
7171

7272
/* Enforce ratelimiting for the multicast protocols */
7373
RATELIMIT_INIT(s->ratelimit, MULTICAST_RATELIMIT_INTERVAL_USEC, MULTICAST_RATELIMIT_BURST);
@@ -98,7 +98,7 @@ DnsScope* dns_scope_free(DnsScope *s) {
9898
if (!s)
9999
return NULL;
100100

101-
log_debug("Removing scope on link %s, protocol %s, family %s", s->link ? s->link->name : "*", dns_protocol_to_string(s->protocol), s->family == AF_UNSPEC ? "*" : af_to_name(s->family));
101+
log_debug("Removing scope on link %s, protocol %s, family %s", s->link ? s->link->ifname : "*", dns_protocol_to_string(s->protocol), s->family == AF_UNSPEC ? "*" : af_to_name(s->family));
102102

103103
dns_scope_llmnr_membership(s, false);
104104
dns_scope_mdns_membership(s, false);
@@ -1137,7 +1137,7 @@ void dns_scope_dump(DnsScope *s, FILE *f) {
11371137

11381138
if (s->link) {
11391139
fputs(" interface=", f);
1140-
fputs(s->link->name, f);
1140+
fputs(s->link->ifname, f);
11411141
}
11421142

11431143
if (s->family != AF_UNSPEC) {

‎src/resolve/resolved-dns-server.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@ void dns_server_dump(DnsServer *s, FILE *f) {
836836
assert(s->link);
837837

838838
fputs(" interface=", f);
839-
fputs(s->link->name, f);
839+
fputs(s->link->ifname, f);
840840
}
841841

842842
fputs("]\n", f);

‎src/resolve/resolved-dns-transaction.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ static void dns_transaction_tentative(DnsTransaction *t, DnsPacket *p) {
268268
t->id,
269269
dns_resource_key_to_string(t->key, key_str, sizeof key_str),
270270
dns_protocol_to_string(t->scope->protocol),
271-
t->scope->link ? t->scope->link->name : "*",
271+
t->scope->link ? t->scope->link->ifname : "*",
272272
af_to_name_short(t->scope->family),
273273
strnull(pretty));
274274

@@ -333,7 +333,7 @@ void dns_transaction_complete(DnsTransaction *t, DnsTransactionState state) {
333333
t->id,
334334
dns_resource_key_to_string(t->key, key_str, sizeof key_str),
335335
dns_protocol_to_string(t->scope->protocol),
336-
t->scope->link ? t->scope->link->name : "*",
336+
t->scope->link ? t->scope->link->ifname : "*",
337337
af_to_name_short(t->scope->family),
338338
st,
339339
t->answer_source < 0 ? "none" : dns_transaction_source_to_string(t->answer_source),
@@ -1648,7 +1648,7 @@ int dns_transaction_go(DnsTransaction *t) {
16481648
t->id,
16491649
dns_resource_key_to_string(t->key, key_str, sizeof key_str),
16501650
dns_protocol_to_string(t->scope->protocol),
1651-
t->scope->link ? t->scope->link->name : "*",
1651+
t->scope->link ? t->scope->link->ifname : "*",
16521652
af_to_name_short(t->scope->family));
16531653

16541654
if (!t->initial_jitter_scheduled &&

‎src/resolve/resolved-link-bus.c‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
/* SPDX-License-Identifier: LGPL-2.1+ */
22

3+
#include <net/if.h>
4+
35
#include "alloc-util.h"
46
#include "bus-common-errors.h"
57
#include "bus-util.h"
@@ -190,9 +192,9 @@ static int verify_unmanaged_link(Link *l, sd_bus_error *error) {
190192
assert(l);
191193

192194
if (l->flags & IFF_LOOPBACK)
193-
return sd_bus_error_setf(error, BUS_ERROR_LINK_BUSY, "Link %s is loopback device.", l->name);
195+
return sd_bus_error_setf(error, BUS_ERROR_LINK_BUSY, "Link %s is loopback device.", l->ifname);
194196
if (l->is_managed)
195-
return sd_bus_error_setf(error, BUS_ERROR_LINK_BUSY, "Link %s is managed.", l->name);
197+
return sd_bus_error_setf(error, BUS_ERROR_LINK_BUSY, "Link %s is managed.", l->ifname);
196198

197199
return 0;
198200
}

‎src/resolve/resolved-link.c‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
/* SPDX-License-Identifier: LGPL-2.1+ */
22

3-
#include <net/if.h>
43
#include <linux/if.h>
54
#include <unistd.h>
65

@@ -98,6 +97,7 @@ Link *link_free(Link *l) {
9897
dns_scope_free(l->mdns_ipv6_scope);
9998

10099
free(l->state_file);
100+
free(l->ifname);
101101

102102
return mfree(l);
103103
}
@@ -239,8 +239,9 @@ int link_process_rtnl(Link *l, sd_netlink_message *m) {
239239
(void) sd_netlink_message_read_u8(m, IFLA_OPERSTATE, &l->operstate);
240240

241241
if (sd_netlink_message_read_string(m, IFLA_IFNAME, &n) >= 0) {
242-
strncpy(l->name, n, sizeof(l->name)-1);
243-
char_array_0(l->name);
242+
r = free_and_strdup(&l->ifname, n);
243+
if (r < 0)
244+
return r;
244245
}
245246

246247
link_allocate_scopes(l);
@@ -596,7 +597,7 @@ static void link_read_settings(Link *l) {
596597

597598
r = link_is_managed(l);
598599
if (r < 0) {
599-
log_warning_errno(r, "Failed to determine whether interface %s is managed: %m", l->name);
600+
log_warning_errno(r, "Failed to determine whether interface %s is managed: %m", l->ifname);
600601
return;
601602
}
602603
if (r == 0) {
@@ -613,35 +614,35 @@ static void link_read_settings(Link *l) {
613614

614615
r = link_update_dns_servers(l);
615616
if (r < 0)
616-
log_warning_errno(r, "Failed to read DNS servers for interface %s, ignoring: %m", l->name);
617+
log_warning_errno(r, "Failed to read DNS servers for interface %s, ignoring: %m", l->ifname);
617618

618619
r = link_update_llmnr_support(l);
619620
if (r < 0)
620-
log_warning_errno(r, "Failed to read LLMNR support for interface %s, ignoring: %m", l->name);
621+
log_warning_errno(r, "Failed to read LLMNR support for interface %s, ignoring: %m", l->ifname);
621622

622623
r = link_update_mdns_support(l);
623624
if (r < 0)
624-
log_warning_errno(r, "Failed to read mDNS support for interface %s, ignoring: %m", l->name);
625+
log_warning_errno(r, "Failed to read mDNS support for interface %s, ignoring: %m", l->ifname);
625626

626627
r = link_update_dns_over_tls_mode(l);
627628
if (r < 0)
628-
log_warning_errno(r, "Failed to read DNS-over-TLS mode for interface %s, ignoring: %m", l->name);
629+
log_warning_errno(r, "Failed to read DNS-over-TLS mode for interface %s, ignoring: %m", l->ifname);
629630

630631
r = link_update_dnssec_mode(l);
631632
if (r < 0)
632-
log_warning_errno(r, "Failed to read DNSSEC mode for interface %s, ignoring: %m", l->name);
633+
log_warning_errno(r, "Failed to read DNSSEC mode for interface %s, ignoring: %m", l->ifname);
633634

634635
r = link_update_dnssec_negative_trust_anchors(l);
635636
if (r < 0)
636-
log_warning_errno(r, "Failed to read DNSSEC negative trust anchors for interface %s, ignoring: %m", l->name);
637+
log_warning_errno(r, "Failed to read DNSSEC negative trust anchors for interface %s, ignoring: %m", l->ifname);
637638

638639
r = link_update_search_domains(l);
639640
if (r < 0)
640-
log_warning_errno(r, "Failed to read search domains for interface %s, ignoring: %m", l->name);
641+
log_warning_errno(r, "Failed to read search domains for interface %s, ignoring: %m", l->ifname);
641642

642643
r = link_update_default_route(l);
643644
if (r < 0)
644-
log_warning_errno(r, "Failed to read default route setting for interface %s, proceeding anyway: %m", l->name);
645+
log_warning_errno(r, "Failed to read default route setting for interface %s, proceeding anyway: %m", l->ifname);
645646
}
646647

647648
int link_update(Link *l) {
@@ -728,7 +729,7 @@ DnsServer* link_set_dns_server(Link *l, DnsServer *s) {
728729
return s;
729730

730731
if (s)
731-
log_debug("Switching to DNS server %s for interface %s.", dns_server_string(s), l->name);
732+
log_debug("Switching to DNS server %s for interface %s.", dns_server_string(s), l->ifname);
732733

733734
dns_server_unref(l->current_dns_server);
734735
l->current_dns_server = dns_server_ref(s);

‎src/resolve/resolved-link.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
/* SPDX-License-Identifier: LGPL-2.1+ */
22
#pragma once
33

4-
#include <net/if.h>
5-
64
#include "in-addr-util.h"
75
#include "ratelimit.h"
86
#include "resolve-util.h"
@@ -67,7 +65,7 @@ struct Link {
6765

6866
bool is_managed;
6967

70-
char name[IF_NAMESIZE];
68+
char *ifname;
7169
uint32_t mtu;
7270
uint8_t operstate;
7371

‎src/resolve/resolved-manager.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,14 @@ static int manager_process_link(sd_netlink *rtnl, sd_netlink_message *mm, void *
8282
goto fail;
8383

8484
if (is_new)
85-
log_debug("Found new link %i/%s", ifindex, l->name);
85+
log_debug("Found new link %i/%s", ifindex, l->ifname);
8686

8787
break;
8888
}
8989

9090
case RTM_DELLINK:
9191
if (l) {
92-
log_debug("Removing link %i/%s", l->ifindex, l->name);
92+
log_debug("Removing link %i/%s", l->ifindex, l->ifname);
9393
link_remove_user(l);
9494
link_free(l);
9595
}

0 commit comments

Comments
 (0)