Skip to content

Commit 9e36970

Browse files
keszybzkeszybz
committed
network: simplify logging in macsec netdev code
1 parent b471fc9 commit 9e36970

File tree

1 file changed

+23
-23
lines changed

1 file changed

+23
-23
lines changed

‎src/network/netdev/macsec.c‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ static int macsec_transmit_association_new_static(MACsec *s, const char *filenam
218218
return 0;
219219
}
220220

221-
static int netdev_macsec_fill_message(NetDev *netdev, int command, sd_netlink_message **ret) {
221+
static int netdev_macsec_create_message(NetDev *netdev, int command, sd_netlink_message **ret) {
222222
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
223223
int r;
224224

@@ -227,11 +227,11 @@ static int netdev_macsec_fill_message(NetDev *netdev, int command, sd_netlink_me
227227

228228
r = sd_genl_message_new(netdev->manager->genl, MACSEC_GENL_NAME, command, &m);
229229
if (r < 0)
230-
return log_netdev_error_errno(netdev, r, "Failed to create generic netlink message: %m");
230+
return r;
231231

232232
r = sd_netlink_message_append_u32(m, MACSEC_ATTR_IFINDEX, netdev->ifindex);
233233
if (r < 0)
234-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_ATTR_IFINDEX attribute: %m");
234+
return r;
235235

236236
*ret = TAKE_PTR(m);
237237

@@ -247,15 +247,15 @@ static int netdev_macsec_fill_message_sci(NetDev *netdev, MACsecSCI *sci, sd_net
247247

248248
r = sd_netlink_message_open_container(m, MACSEC_ATTR_RXSC_CONFIG);
249249
if (r < 0)
250-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_ATTR_RXSC_CONFIG attribute: %m");
250+
return r;
251251

252252
r = sd_netlink_message_append_u64(m, MACSEC_RXSC_ATTR_SCI, sci->as_uint64);
253253
if (r < 0)
254-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_RXSC_ATTR_SCI attribute: %m");
254+
return r;
255255

256256
r = sd_netlink_message_close_container(m);
257257
if (r < 0)
258-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_ATTR_RXSC_CONFIG attribute: %m");
258+
return r;
259259

260260
return 0;
261261
}
@@ -269,37 +269,37 @@ static int netdev_macsec_fill_message_sa(NetDev *netdev, SecurityAssociation *a,
269269

270270
r = sd_netlink_message_open_container(m, MACSEC_ATTR_SA_CONFIG);
271271
if (r < 0)
272-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_ATTR_SA_CONFIG attribute: %m");
272+
return r;
273273

274274
r = sd_netlink_message_append_u8(m, MACSEC_SA_ATTR_AN, a->association_number);
275275
if (r < 0)
276-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_SA_ATTR_AN attribute: %m");
276+
return r;
277277

278278
if (a->packet_number > 0) {
279279
r = sd_netlink_message_append_u32(m, MACSEC_SA_ATTR_PN, a->packet_number);
280280
if (r < 0)
281-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_SA_ATTR_PN attribute: %m");
281+
return r;
282282
}
283283

284284
if (a->key_len > 0) {
285285
r = sd_netlink_message_append_data(m, MACSEC_SA_ATTR_KEYID, a->key_id, MACSEC_KEYID_LEN);
286286
if (r < 0)
287-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_SA_ATTR_KEYID attribute: %m");
287+
return r;
288288

289289
r = sd_netlink_message_append_data(m, MACSEC_SA_ATTR_KEY, a->key, a->key_len);
290290
if (r < 0)
291-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_SA_ATTR_KEY attribute: %m");
291+
return r;
292292
}
293293

294294
if (a->activate >= 0) {
295295
r = sd_netlink_message_append_u8(m, MACSEC_SA_ATTR_ACTIVE, a->activate);
296296
if (r < 0)
297-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_SA_ATTR_ACTIVE attribute: %m");
297+
return r;
298298
}
299299

300300
r = sd_netlink_message_close_container(m);
301301
if (r < 0)
302-
return log_netdev_error_errno(netdev, r, "Could not append MACSEC_ATTR_SA_CONFIG attribute: %m");
302+
return r;
303303

304304
return 0;
305305
}
@@ -335,17 +335,17 @@ static int netdev_macsec_configure_receive_association(NetDev *netdev, ReceiveAs
335335
assert(netdev);
336336
assert(a);
337337

338-
r = netdev_macsec_fill_message(netdev, MACSEC_CMD_ADD_RXSA, &m);
338+
r = netdev_macsec_create_message(netdev, MACSEC_CMD_ADD_RXSA, &m);
339339
if (r < 0)
340-
return r;
340+
return log_netdev_error_errno(netdev, r, "Failed to create netlink message: %m");
341341

342342
r = netdev_macsec_fill_message_sa(netdev, &a->sa, m);
343343
if (r < 0)
344-
return r;
344+
return log_netdev_error_errno(netdev, r, "Failed to fill netlink message: %m");
345345

346346
r = netdev_macsec_fill_message_sci(netdev, &a->sci, m);
347347
if (r < 0)
348-
return r;
348+
return log_netdev_error_errno(netdev, r, "Failed to fill netlink message: %m");
349349

350350
r = netlink_call_async(netdev->manager->genl, NULL, m, macsec_receive_association_handler,
351351
netdev_destroy_callback, netdev);
@@ -410,13 +410,13 @@ static int netdev_macsec_configure_receive_channel(NetDev *netdev, ReceiveChanne
410410
assert(netdev);
411411
assert(c);
412412

413-
r = netdev_macsec_fill_message(netdev, MACSEC_CMD_ADD_RXSC, &m);
413+
r = netdev_macsec_create_message(netdev, MACSEC_CMD_ADD_RXSC, &m);
414414
if (r < 0)
415-
return r;
415+
return log_netdev_error_errno(netdev, r, "Failed to create netlink message: %m");
416416

417417
r = netdev_macsec_fill_message_sci(netdev, &c->sci, m);
418418
if (r < 0)
419-
return r;
419+
return log_netdev_error_errno(netdev, r, "Failed to fill netlink message: %m");
420420

421421
r = netlink_call_async(netdev->manager->genl, NULL, m, macsec_receive_channel_handler,
422422
receive_channel_destroy_callback, c);
@@ -459,13 +459,13 @@ static int netdev_macsec_configure_transmit_association(NetDev *netdev, Transmit
459459
assert(netdev);
460460
assert(a);
461461

462-
r = netdev_macsec_fill_message(netdev, MACSEC_CMD_ADD_TXSA, &m);
462+
r = netdev_macsec_create_message(netdev, MACSEC_CMD_ADD_TXSA, &m);
463463
if (r < 0)
464-
return r;
464+
return log_netdev_error_errno(netdev, r, "Failed to create netlink message: %m");
465465

466466
r = netdev_macsec_fill_message_sa(netdev, &a->sa, m);
467467
if (r < 0)
468-
return r;
468+
return log_netdev_error_errno(netdev, r, "Failed to fill netlink message: %m");
469469

470470
r = netlink_call_async(netdev->manager->genl, NULL, m, macsec_transmit_association_handler,
471471
netdev_destroy_callback, netdev);

0 commit comments

Comments
 (0)