X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd-link.c;h=255b41358646f1f46e61efa37e69b56d87f474d2;hp=d41fe80f208e62f170bc2fe79799716729a1b3d6;hb=c166a070553511e402de5ad216d3fb62b49bdacb;hpb=0617ffabe86a6d366252477eafbe59a888b149d4

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index d41fe80f2..255b41358 100644
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -29,6 +29,8 @@
 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;
+        const char *ifname;
         int r;
 
         assert(device);
@@ -38,17 +40,22 @@ 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;
+        if (mac) {
+                mac_addr = ether_aton(mac);
+                if (mac_addr)
+                        memcpy(&link->mac, mac_addr, sizeof(struct ether_addr));
+        }
 
-        memcpy(&link->mac.ether_addr_octet[0], ether_aton(mac), ETH_ALEN);
-        link->manager = manager;
-        link->state = _LINK_STATE_INVALID;
+        ifname = udev_device_get_sysname(device);
+        link->ifname = strdup(ifname);
 
         r = hashmap_put(manager->links, &link->ifindex, link);
         if (r < 0)
@@ -68,6 +75,8 @@ void link_free(Link *link) {
 
         hashmap_remove(link->manager->links, &link->ifindex);
 
+        free(link->ifname);
+
         free(link);
 }
 
@@ -87,7 +96,7 @@ int link_add(Manager *m, struct udev_device *device) {
 
         r = link_new(m, device, &link);
         if (r < 0) {
-                log_error("could not create link: %s", strerror(-r));
+                log_error("Could not create link: %s", strerror(-r));
                 return r;
         }
 
@@ -103,7 +112,7 @@ int link_add(Manager *m, struct udev_device *device) {
 }
 
 static int link_enter_configured(Link *link) {
-        log_info("Link configured successfully.");
+        log_info("Link '%s' configured", link->ifname);
 
         link->state = LINK_STATE_CONFIGURED;
 
@@ -111,7 +120,7 @@ static int link_enter_configured(Link *link) {
 }
 
 static int link_enter_failed(Link *link) {
-        log_warning("Could not configure link.");
+        log_warning("Could not configure link '%s'", link->ifname);
 
         link->state = LINK_STATE_FAILED;
 
@@ -123,7 +132,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 '%s'", link->ifname);
 
         if (link_is_up(link))
                 return link_enter_configured(link);
@@ -146,11 +155,9 @@ static int route_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         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));
-                return link_enter_failed(link);
-        }
+        if (r < 0 && r != -EEXIST)
+                log_warning("Could not set route on interface '%s': %s",
+                            link->ifname, strerror(-r));
 
         if (link->rtnl_messages == 0)
                 return link_enter_routes_set(link);
@@ -175,14 +182,16 @@ static int link_enter_set_routes(Link *link) {
         LIST_FOREACH(routes, route, link->network->routes) {
                 r = route_configure(route, link, &route_handler);
                 if (r < 0)
-                        link_enter_failed(link);
+                        return link_enter_failed(link);
+
+                link->rtnl_messages ++;
         }
 
         return 0;
 }
 
 static int link_enter_addresses_set(Link *link) {
-        log_info("Addresses set for link %u", (unsigned)link->ifindex);
+        log_info("Addresses set for link '%s'", link->ifname);
 
         link->state = LINK_STATE_ADDRESSES_SET;
 
@@ -202,11 +211,9 @@ static int address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
                 return 1;
 
         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));
-                link_enter_failed(link);
-        }
+        if (r < 0 && r != -EEXIST)
+                log_warning("Could not set address on interface '%s': %s",
+                            link->ifname, strerror(-r));
 
         if (link->rtnl_messages == 0)
                 link_enter_addresses_set(link);
@@ -230,7 +237,9 @@ static int link_enter_set_addresses(Link *link) {
         LIST_FOREACH(addresses, address, link->network->addresses) {
                 r = address_configure(address, link, &address_handler);
                 if (r < 0)
-                        link_enter_failed(link);
+                        return link_enter_failed(link);
+
+                link->rtnl_messages ++;
         }
 
         return 0;
@@ -241,15 +250,13 @@ static int link_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
         int r;
 
         r = sd_rtnl_message_get_errno(m);
-        if (r < 0) {
-                log_warning("Could not bring up interface %u: %s",
-                            (unsigned)link->ifindex, strerror(-r));
-                return link_enter_failed(link);
-        }
+        if (r < 0)
+                log_warning("Could not bring up interface '%s': %s",
+                            link->ifname, strerror(-r));
 
         link->flags |= IFF_UP;
 
-        log_info("Link is UP.");
+        log_info("Link '%s' is up", link->ifname);
 
         if (link->state == LINK_STATE_ROUTES_SET)
                 return link_enter_configured(link);