X Tutup
Skip to content

Commit a79a8d1

Browse files
yuwatayuwata
committed
network: drop detailed log messages
This also renames netlink message `req` -> `m` for preparation of later commits. Follow-ups for systemd#22014.
1 parent cae162a commit a79a8d1

10 files changed

+224
-191
lines changed

‎src/network/networkd-address-label.c‎

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static int address_label_configure_handler(sd_netlink *rtnl, sd_netlink_message
9696
}
9797

9898
static int address_label_configure(AddressLabel *label, Link *link, link_netlink_message_handler_t callback) {
99-
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
99+
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
100100
int r;
101101

102102
assert(label);
@@ -106,31 +106,30 @@ static int address_label_configure(AddressLabel *label, Link *link, link_netlink
106106
assert(link->manager->rtnl);
107107
assert(callback);
108108

109-
r = sd_rtnl_message_new_addrlabel(link->manager->rtnl, &req, RTM_NEWADDRLABEL,
109+
r = sd_rtnl_message_new_addrlabel(link->manager->rtnl, &m, RTM_NEWADDRLABEL,
110110
link->ifindex, AF_INET6);
111111
if (r < 0)
112-
return log_link_error_errno(link, r, "Could not allocate RTM_NEWADDR message: %m");
112+
return r;
113113

114-
r = sd_rtnl_message_addrlabel_set_prefixlen(req, label->prefixlen);
114+
r = sd_rtnl_message_addrlabel_set_prefixlen(m, label->prefixlen);
115115
if (r < 0)
116-
return log_link_error_errno(link, r, "Could not set prefixlen: %m");
116+
return r;
117117

118-
r = sd_netlink_message_append_u32(req, IFAL_LABEL, label->label);
118+
r = sd_netlink_message_append_u32(m, IFAL_LABEL, label->label);
119119
if (r < 0)
120-
return log_link_error_errno(link, r, "Could not append IFAL_LABEL attribute: %m");
120+
return r;
121121

122-
r = sd_netlink_message_append_in6_addr(req, IFA_ADDRESS, &label->prefix);
122+
r = sd_netlink_message_append_in6_addr(m, IFA_ADDRESS, &label->prefix);
123123
if (r < 0)
124-
return log_link_error_errno(link, r, "Could not append IFA_ADDRESS attribute: %m");
124+
return r;
125125

126-
r = netlink_call_async(link->manager->rtnl, NULL, req, callback,
126+
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
127127
link_netlink_destroy_callback, link);
128128
if (r < 0)
129-
return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
129+
return r;
130130

131131
link_ref(link);
132-
133-
return 1;
132+
return 0;
134133
}
135134

136135
int link_request_static_address_labels(Link *link) {
@@ -161,15 +160,23 @@ int link_request_static_address_labels(Link *link) {
161160
}
162161

163162
int request_process_address_label(Request *req) {
163+
Link *link;
164+
int r;
165+
164166
assert(req);
165-
assert(req->link);
166167
assert(req->label);
167168
assert(req->type == REQUEST_TYPE_ADDRESS_LABEL);
168169

169-
if (!link_is_ready_to_configure(req->link, false))
170+
link = ASSERT_PTR(req->link);
171+
172+
if (!link_is_ready_to_configure(link, false))
170173
return 0;
171174

172-
return address_label_configure(req->label, req->link, req->netlink_handler);
175+
r = address_label_configure(req->label, link, req->netlink_handler);
176+
if (r < 0)
177+
return log_link_warning_errno(link, r, "Failed to configure address label: %m");
178+
179+
return 1;
173180
}
174181

175182
static int address_label_section_verify(AddressLabel *label) {

‎src/network/networkd-address.c‎

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -656,36 +656,36 @@ static void log_address_debug(const Address *address, const char *str, const Lin
656656
strna(flags_str), strna(scope_str));
657657
}
658658

659-
static int address_set_netlink_message(const Address *address, sd_netlink_message *req, Link *link) {
659+
static int address_set_netlink_message(const Address *address, sd_netlink_message *m, Link *link) {
660660
uint32_t flags;
661661
int r;
662662

663663
assert(address);
664-
assert(req);
664+
assert(m);
665665
assert(link);
666666

667-
r = sd_rtnl_message_addr_set_prefixlen(req, address->prefixlen);
667+
r = sd_rtnl_message_addr_set_prefixlen(m, address->prefixlen);
668668
if (r < 0)
669-
return log_link_error_errno(link, r, "Could not set prefixlen: %m");
669+
return r;
670670

671671
/* On remove, only IFA_F_MANAGETEMPADDR flag for IPv6 addresses are used. But anyway, set all
672672
* flags except tentative flag here unconditionally. Without setting the flag, the template
673673
* addresses generated by kernel will not be removed automatically when the main address is
674674
* removed. */
675675
flags = address->flags & ~IFA_F_TENTATIVE;
676-
r = sd_rtnl_message_addr_set_flags(req, flags & 0xff);
676+
r = sd_rtnl_message_addr_set_flags(m, flags & 0xff);
677677
if (r < 0)
678-
return log_link_error_errno(link, r, "Could not set flags: %m");
678+
return r;
679679

680680
if ((flags & ~0xff) != 0) {
681-
r = sd_netlink_message_append_u32(req, IFA_FLAGS, flags);
681+
r = sd_netlink_message_append_u32(m, IFA_FLAGS, flags);
682682
if (r < 0)
683-
return log_link_error_errno(link, r, "Could not set extended flags: %m");
683+
return r;
684684
}
685685

686-
r = netlink_message_append_in_addr_union(req, IFA_LOCAL, address->family, &address->in_addr);
686+
r = netlink_message_append_in_addr_union(m, IFA_LOCAL, address->family, &address->in_addr);
687687
if (r < 0)
688-
return log_link_error_errno(link, r, "Could not append IFA_LOCAL attribute: %m");
688+
return r;
689689

690690
return 0;
691691
}
@@ -707,7 +707,7 @@ static int address_remove_handler(sd_netlink *rtnl, sd_netlink_message *m, Link
707707
}
708708

709709
int address_remove(Address *address) {
710-
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
710+
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
711711
Link *link;
712712
int r;
713713

@@ -722,20 +722,20 @@ int address_remove(Address *address) {
722722

723723
log_address_debug(address, "Removing", link);
724724

725-
r = sd_rtnl_message_new_addr(link->manager->rtnl, &req, RTM_DELADDR,
725+
r = sd_rtnl_message_new_addr(link->manager->rtnl, &m, RTM_DELADDR,
726726
link->ifindex, address->family);
727727
if (r < 0)
728-
return log_link_error_errno(link, r, "Could not allocate RTM_DELADDR message: %m");
728+
return log_link_warning_errno(link, r, "Could not allocate RTM_DELADDR message: %m");
729729

730-
r = address_set_netlink_message(address, req, link);
730+
r = address_set_netlink_message(address, m, link);
731731
if (r < 0)
732-
return r;
732+
return log_link_warning_errno(link, r, "Could not set netlink attributes: %m");
733733

734-
r = netlink_call_async(link->manager->rtnl, NULL, req,
734+
r = netlink_call_async(link->manager->rtnl, NULL, m,
735735
address_remove_handler,
736736
link_netlink_destroy_callback, link);
737737
if (r < 0)
738-
return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
738+
return log_link_warning_errno(link, r, "Could not send rtnetlink message: %m");
739739

740740
link_ref(link);
741741

@@ -1025,7 +1025,7 @@ static int address_configure(
10251025
Link *link,
10261026
link_netlink_message_handler_t callback) {
10271027

1028-
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
1028+
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
10291029
int r;
10301030

10311031
assert(address);
@@ -1038,47 +1038,46 @@ static int address_configure(
10381038

10391039
log_address_debug(address, "Configuring", link);
10401040

1041-
r = sd_rtnl_message_new_addr_update(link->manager->rtnl, &req,
1042-
link->ifindex, address->family);
1041+
r = sd_rtnl_message_new_addr_update(link->manager->rtnl, &m, link->ifindex, address->family);
10431042
if (r < 0)
1044-
return log_link_error_errno(link, r, "Could not allocate RTM_NEWADDR message: %m");
1043+
return r;
10451044

1046-
r = address_set_netlink_message(address, req, link);
1045+
r = address_set_netlink_message(address, m, link);
10471046
if (r < 0)
10481047
return r;
10491048

1050-
r = sd_rtnl_message_addr_set_scope(req, address->scope);
1049+
r = sd_rtnl_message_addr_set_scope(m, address->scope);
10511050
if (r < 0)
1052-
return log_link_error_errno(link, r, "Could not set scope: %m");
1051+
return r;
10531052

10541053
if (in_addr_is_set(address->family, &address->in_addr_peer)) {
1055-
r = netlink_message_append_in_addr_union(req, IFA_ADDRESS, address->family, &address->in_addr_peer);
1054+
r = netlink_message_append_in_addr_union(m, IFA_ADDRESS, address->family, &address->in_addr_peer);
10561055
if (r < 0)
1057-
return log_link_error_errno(link, r, "Could not append IFA_ADDRESS attribute: %m");
1056+
return r;
10581057
} else if (in4_addr_is_set(&address->broadcast)) {
1059-
r = sd_netlink_message_append_in_addr(req, IFA_BROADCAST, &address->broadcast);
1058+
r = sd_netlink_message_append_in_addr(m, IFA_BROADCAST, &address->broadcast);
10601059
if (r < 0)
1061-
return log_link_error_errno(link, r, "Could not append IFA_BROADCAST attribute: %m");
1060+
return r;
10621061
}
10631062

10641063
if (address->family == AF_INET && address->label) {
1065-
r = sd_netlink_message_append_string(req, IFA_LABEL, address->label);
1064+
r = sd_netlink_message_append_string(m, IFA_LABEL, address->label);
10661065
if (r < 0)
1067-
return log_link_error_errno(link, r, "Could not append IFA_LABEL attribute: %m");
1066+
return r;
10681067
}
10691068

1070-
r = sd_netlink_message_append_cache_info(req, IFA_CACHEINFO,
1069+
r = sd_netlink_message_append_cache_info(m, IFA_CACHEINFO,
10711070
address_set_cinfo(address, &(struct ifa_cacheinfo) {}));
10721071
if (r < 0)
1073-
return log_link_error_errno(link, r, "Could not append IFA_CACHEINFO attribute: %m");
1072+
return r;
10741073

1075-
r = sd_netlink_message_append_u32(req, IFA_RT_PRIORITY, address->route_metric);
1074+
r = sd_netlink_message_append_u32(m, IFA_RT_PRIORITY, address->route_metric);
10761075
if (r < 0)
1077-
return log_link_error_errno(link, r, "Could not append IFA_RT_PRIORITY attribute: %m");
1076+
return r;
10781077

1079-
r = netlink_call_async(link->manager->rtnl, NULL, req, callback, link_netlink_destroy_callback, link);
1078+
r = netlink_call_async(link->manager->rtnl, NULL, m, callback, link_netlink_destroy_callback, link);
10801079
if (r < 0)
1081-
return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
1080+
return r;
10821081

10831082
link_ref(link);
10841083
return 0;

‎src/network/networkd-bridge-fdb.c‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,32 @@ static int bridge_fdb_configure_message(const BridgeFDB *fdb, Link *link, sd_net
168168
return 0;
169169
}
170170

171+
static int bridge_fdb_configure(BridgeFDB *fdb, Link *link, link_netlink_message_handler_t callback) {
172+
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
173+
int r;
174+
175+
assert(fdb);
176+
assert(link);
177+
assert(link->manager);
178+
assert(callback);
179+
180+
r = sd_rtnl_message_new_neigh(link->manager->rtnl, &m, RTM_NEWNEIGH, link->ifindex, AF_BRIDGE);
181+
if (r < 0)
182+
return r;
183+
184+
r = bridge_fdb_configure_message(fdb, link, m);
185+
if (r < 0)
186+
return r;
187+
188+
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
189+
link_netlink_destroy_callback, link);
190+
if (r < 0)
191+
return r;
192+
193+
link_ref(link);
194+
return 0;
195+
}
196+
171197
int link_request_static_bridge_fdb(Link *link) {
172198
BridgeFDB *fdb;
173199
int r;
@@ -221,34 +247,21 @@ static bool bridge_fdb_is_ready_to_configure(BridgeFDB *fdb, Link *link) {
221247
}
222248

223249
int request_process_bridge_fdb(Request *req) {
250+
BridgeFDB *fdb;
224251
Link *link;
225252
int r;
226253

227254
assert(req);
228-
assert(req->fdb);
229255
assert(req->type == REQUEST_TYPE_BRIDGE_FDB);
230256
assert_se(link = req->link);
257+
assert_se(fdb = req->fdb);
231258

232-
if (!bridge_fdb_is_ready_to_configure(req->fdb, link))
259+
if (!bridge_fdb_is_ready_to_configure(fdb, link))
233260
return 0;
234261

235-
/* create new RTM message */
236-
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
237-
r = sd_rtnl_message_new_neigh(link->manager->rtnl, &m, RTM_NEWNEIGH, link->ifindex, AF_BRIDGE);
238-
if (r < 0)
239-
return log_link_error_errno(link, r, "Could not allocate netlink message: %m");
240-
241-
r = bridge_fdb_configure_message(req->fdb, link, m);
242-
if (r < 0)
243-
return log_link_error_errno(link, r, "Could not create netlink message: %m");
244-
245-
/* send message to the kernel to update its internal static MAC table. */
246-
r = netlink_call_async(link->manager->rtnl, NULL, m, req->netlink_handler,
247-
link_netlink_destroy_callback, link);
262+
r = bridge_fdb_configure(fdb, link, req->netlink_handler);
248263
if (r < 0)
249-
return log_link_error_errno(link, r, "Could not send netlink message: %m");
250-
251-
link_ref(link);
264+
return log_link_warning_errno(link, r, "Failed to configure bridge FDB: %m");
252265

253266
return 1;
254267
}

‎src/network/networkd-bridge-mdb.c‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ static int bridge_mdb_configure_handler(sd_netlink *rtnl, sd_netlink_message *m,
115115

116116
/* send a request to the kernel to add an MDB entry */
117117
static int bridge_mdb_configure(BridgeMDB *mdb, Link *link, link_netlink_message_handler_t callback) {
118-
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
118+
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
119119
struct br_mdb_entry entry;
120120
int r;
121121

@@ -156,24 +156,22 @@ static int bridge_mdb_configure(BridgeMDB *mdb, Link *link, link_netlink_message
156156
assert_not_reached();
157157
}
158158

159-
/* create new RTM message */
160-
r = sd_rtnl_message_new_mdb(link->manager->rtnl, &req, RTM_NEWMDB,
159+
r = sd_rtnl_message_new_mdb(link->manager->rtnl, &m, RTM_NEWMDB,
161160
link->master_ifindex > 0 ? link->master_ifindex : link->ifindex);
162161
if (r < 0)
163-
return log_link_error_errno(link, r, "Could not create RTM_NEWMDB message: %m");
162+
return r;
164163

165-
r = sd_netlink_message_append_data(req, MDBA_SET_ENTRY, &entry, sizeof(entry));
164+
r = sd_netlink_message_append_data(m, MDBA_SET_ENTRY, &entry, sizeof(entry));
166165
if (r < 0)
167-
return log_link_error_errno(link, r, "Could not append MDBA_SET_ENTRY attribute: %m");
166+
return r;
168167

169-
r = netlink_call_async(link->manager->rtnl, NULL, req, callback,
168+
r = netlink_call_async(link->manager->rtnl, NULL, m, callback,
170169
link_netlink_destroy_callback, link);
171170
if (r < 0)
172-
return log_link_error_errno(link, r, "Could not send rtnetlink message: %m");
171+
return r;
173172

174173
link_ref(link);
175-
176-
return 1;
174+
return 0;
177175
}
178176

179177
int link_request_static_bridge_mdb(Link *link) {
@@ -241,15 +239,22 @@ static bool bridge_mdb_is_ready_to_configure(Link *link) {
241239
}
242240

243241
int request_process_bridge_mdb(Request *req) {
242+
Link *link;
243+
int r;
244+
244245
assert(req);
245-
assert(req->link);
246246
assert(req->mdb);
247247
assert(req->type == REQUEST_TYPE_BRIDGE_MDB);
248+
assert_se(link = req->link);
248249

249-
if (!bridge_mdb_is_ready_to_configure(req->link))
250+
if (!bridge_mdb_is_ready_to_configure(link))
250251
return 0;
251252

252-
return bridge_mdb_configure(req->mdb, req->link, req->netlink_handler);
253+
r = bridge_mdb_configure(req->mdb, link, req->netlink_handler);
254+
if (r < 0)
255+
return log_link_warning_errno(link, r, "Failed to configure bridge MDB: %m");
256+
257+
return 1;
253258
}
254259

255260
static int bridge_mdb_verify(BridgeMDB *mdb) {

0 commit comments

Comments
 (0)
X Tutup