networkd: use correct printf formatter

[elogind.git] / src / network / networkd-link.c

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d41fe80f208e62f170bc2fe79799716729a1b3d6..ab5da3612e4623aedba5b2651c9f5e18f4ae8355 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -29,6 +29,7 @@
 int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         _cleanup_link_free_ Link *link = NULL;
         const char *mac;
+        struct ether_addr *mac_addr;
         int r;
 
         assert(device);
@@ -38,17 +39,19 @@ int link_new(Manager *manager, struct udev_device *device, Link **ret) {
         if (!link)
                 return -ENOMEM;
 
+        link->manager = manager;
+        link->state = _LINK_STATE_INVALID;
+
         link->ifindex = udev_device_get_ifindex(device);
         if (link->ifindex <= 0)
                 return -EINVAL;
 
         mac = udev_device_get_sysattr_value(device, "address");
-        if (!mac)
-                return -EINVAL;
-
-        memcpy(&link->mac.ether_addr_octet[0], ether_aton(mac), ETH_ALEN);
-        link->manager = manager;
-        link->state = _LINK_STATE_INVALID;
+        if (mac) {
+                mac_addr = ether_aton(mac);
+                if (mac_addr)
+                        memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
+        }
 
         r = hashmap_put(manager->links, &link->ifindex, link);
         if (r < 0)
@@ -123,7 +126,7 @@ static bool link_is_up(Link *link) {
 }
 
 static int link_enter_routes_set(Link *link) {
-        log_info("Routes set for link %u", (unsigned)link->ifindex);
+        log_info("Routes set for link %ju", link->ifindex);
 
         if (link_is_up(link))
                 return link_enter_configured(link);
@@ -147,8 +150,8 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST) {
-                log_warning("Could not set route on interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
+                log_warning("Could not set route on interface %ju: %s",
+                            link->ifindex, strerror(-r));
                 return link_enter_failed(link);
         }
 
@@ -182,7 +185,7 @@ static int link_enter_set_routes(Link *link) {
 }
 
 static int link_enter_addresses_set(Link *link) {
-        log_info("Addresses set for link %u", (unsigned)link->ifindex);
+        log_info("Addresses set for link %ju", link->ifindex);
 
         link->state = LINK_STATE_ADDRESSES_SET;
 
@@ -203,8 +206,8 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0 && r != -EEXIST) {
-                log_warning("Could not set address on interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
+                log_warning("Could not set address on interface %ju: %s",
+                            link->ifindex, strerror(-r));
                 link_enter_failed(link);
         }
 
@@ -242,8 +245,8 @@ static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
 
         r = sd_rtnl_message_get_errno(m);
         if (r < 0) {
-                log_warning("Could not bring up interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
+                log_warning("Could not bring up interface %ju: %s",
+                            link->ifindex, strerror(-r));
                 return link_enter_failed(link);
         }