chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkd: minor fixes
[elogind.git]
/
src
/
network
/
networkd-link.c
diff --git
a/src/network/networkd-link.c
b/src/network/networkd-link.c
index dcc5cfe65a3a8813f2237d478af7405a9a8e9c74..255b41358646f1f46e61efa37e69b56d87f474d2 100644
(file)
--- a/
src/network/networkd-link.c
+++ b/
src/network/networkd-link.c
@@
-28,8
+28,9
@@
int link_new(Manager *manager, struct udev_device *device, Link **ret) {
_cleanup_link_free_ Link *link = NULL;
int link_new(Manager *manager, struct udev_device *device, Link **ret) {
_cleanup_link_free_ Link *link = NULL;
- uint64_t ifindex;
const char *mac;
const char *mac;
+ struct ether_addr *mac_addr;
+ const char *ifname;
int r;
assert(device);
int r;
assert(device);
@@
-39,20
+40,24
@@
int link_new(Manager *manager, struct udev_device *device, Link **ret) {
if (!link)
return -ENOMEM;
if (!link)
return -ENOMEM;
- ifindex = udev_device_get_ifindex(device);
- if (ifindex <= 0)
+ 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");
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->ifindex = ifindex;
- link->manager = manager;
- link->state = _LINK_STATE_INVALID;
+ ifname = udev_device_get_sysname(device);
+ link->ifname = strdup(ifname);
- r = hashmap_put(manager->links, &ifindex, link);
+ r = hashmap_put(manager->links, &
link->
ifindex, link);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-66,9
+71,11
@@
void link_free(Link *link) {
if (!link)
return;
if (!link)
return;
- network_free(link->network);
+ assert(link->manager);
+
+ hashmap_remove(link->manager->links, &link->ifindex);
-
hashmap_remove(link->manager->links, link
);
+
free(link->ifname
);
free(link);
}
free(link);
}
@@
-89,7
+96,7
@@
int link_add(Manager *m, struct udev_device *device) {
r = link_new(m, device, &link);
if (r < 0) {
r = link_new(m, device, &link);
if (r < 0) {
- log_error("
c
ould not create link: %s", strerror(-r));
+ log_error("
C
ould not create link: %s", strerror(-r));
return r;
}
return r;
}
@@
-105,7
+112,7
@@
int link_add(Manager *m, struct udev_device *device) {
}
static int link_enter_configured(Link *link) {
}
static int link_enter_configured(Link *link) {
- log_info("Link
configured successfully."
);
+ log_info("Link
'%s' configured", link->ifname
);
link->state = LINK_STATE_CONFIGURED;
link->state = LINK_STATE_CONFIGURED;
@@
-113,7
+120,7
@@
static int link_enter_configured(Link *link) {
}
static int link_enter_failed(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;
link->state = LINK_STATE_FAILED;
@@
-125,7
+132,7
@@
static bool link_is_up(Link *link) {
}
static int link_enter_routes_set(Link *link) {
}
static int link_enter_routes_set(Link *link) {
- log_info("Routes set for link
%d", link->ifindex
);
+ log_info("Routes set for link
'%s'", link->ifname
);
if (link_is_up(link))
return link_enter_configured(link);
if (link_is_up(link))
return link_enter_configured(link);
@@
-148,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);
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST) {
- log_warning("Could not set route on interface %d: %s",
- 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);
if (link->rtnl_messages == 0)
return link_enter_routes_set(link);
@@
-177,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)
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) {
}
return 0;
}
static int link_enter_addresses_set(Link *link) {
- log_info("Addresses set for link
%d", link->ifindex
);
+ log_info("Addresses set for link
'%s'", link->ifname
);
link->state = LINK_STATE_ADDRESSES_SET;
link->state = LINK_STATE_ADDRESSES_SET;
@@
-204,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);
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST) {
- log_warning("Could not set address on interface %d: %s",
- 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);
if (link->rtnl_messages == 0)
link_enter_addresses_set(link);
@@
-232,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)
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;
}
return 0;
@@
-243,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);
int r;
r = sd_rtnl_message_get_errno(m);
- if (r < 0) {
- log_warning("Could not bring up interface %d: %s",
- 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;
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);
if (link->state == LINK_STATE_ROUTES_SET)
return link_enter_configured(link);