From 74bd6ad016ded9be76838b8963c1ed8719cc53b6 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 16 Apr 2021 09:54:52 +0900 Subject: [PATCH] network: update log message In some optimization level with gcc, including netdev->ifname in log message causes error. --- src/network/netdev/netdev.c | 7 +++---- src/network/netdev/wireguard.c | 7 +++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index b31f0fa81ab..81d9260c123 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -747,8 +747,7 @@ int netdev_load_one(Manager *manager, const char *filename) { r = netdev_get_mac(netdev->ifname, &netdev->mac); if (r < 0) return log_netdev_error_errno(netdev, r, - "Failed to generate predictable MAC address for %s: %m", - netdev->ifname); + "Failed to generate predictable MAC address: %m"); } r = hashmap_ensure_put(&netdev->manager->netdevs, &string_hash_ops, netdev->ifname, netdev); @@ -760,8 +759,8 @@ int netdev_load_one(Manager *manager, const char *filename) { assert(n); if (!streq(netdev->filename, n->filename)) log_netdev_warning_errno(netdev, r, - "The setting Name=%s in %s conflicts with the one in %s, ignoring", - netdev->ifname, netdev->filename, n->filename); + "Device was already configured by file %s, ignoring %s.", + n->filename, netdev->filename); /* Clear ifname before netdev_free() is called. Otherwise, the NetDev object 'n' is * removed from the hashmap 'manager->netdevs'. */ diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c index 75d6d376a53..b8fc492d4fc 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c @@ -914,14 +914,13 @@ static int wireguard_verify(NetDev *netdev, const char *filename) { r = wireguard_read_key_file(w->private_key_file, w->private_key); if (r < 0) return log_netdev_error_errno(netdev, r, - "Failed to read private key from %s. Dropping network device %s.", - w->private_key_file, netdev->ifname); + "Failed to read private key from %s. Ignoring network device.", + w->private_key_file); if (eqzero(w->private_key)) return log_netdev_error_errno(netdev, SYNTHETIC_ERRNO(EINVAL), "%s: Missing PrivateKey= or PrivateKeyFile=, " - "Dropping network device %s.", - filename, netdev->ifname); + "Ignoring network device.", filename); LIST_FOREACH_SAFE(peers, peer, peer_next, w->peers) if (wireguard_peer_verify(peer) < 0) -- 2.47.3