#include "libudev-private.h"
#include "util.h"
#include "bus-util.h"
+#include "net-util.h"
+
+#include "dhcp-lease-internal.h"
int link_new(Manager *manager, struct udev_device *device, Link **ret) {
_cleanup_link_free_ Link *link = NULL;
const char *ifname;
int r;
+ assert(manager);
+ assert(manager->links);
assert(device);
assert(ret);
if (link->ifindex <= 0)
return -EINVAL;
+ r = asprintf(&link->state_file, "/run/systemd/network/links/%u",
+ (unsigned) link->ifindex);
+ if (r < 0)
+ return r;
+
mac = udev_device_get_sysattr_value(device, "address");
if (mac) {
mac_addr = ether_aton(mac);
assert(link->manager);
- if (link->dhcp)
- sd_dhcp_client_free(link->dhcp);
-
- route_free(link->dhcp_route);
- link->dhcp_route = NULL;
-
- address_free(link->dhcp_address);
- link->dhcp_address = NULL;
+ sd_dhcp_client_free(link->dhcp_client);
+ sd_dhcp_lease_unref(link->dhcp_lease);
hashmap_remove(link->manager->links, &link->ifindex);
free(link->ifname);
+ free(link->state_file);
free(link);
}
-int link_add(Manager *m, struct udev_device *device, Link **ret) {
+int link_get(Manager *m, int ifindex, Link **ret) {
Link *link;
+ uint64_t ifindex_64;
+
+ assert(m);
+ assert(m->links);
+ assert(ifindex);
+ assert(ret);
+
+ ifindex_64 = ifindex;
+ link = hashmap_get(m->links, &ifindex_64);
+ if (!link)
+ return -ENODEV;
+
+ *ret = link;
+
+ return 0;
+}
+
+int link_add(Manager *m, struct udev_device *device, Link **ret) {
+ Link *link = NULL;
Network *network;
int r;
- uint64_t ifindex;
- const char *devtype;
assert(m);
assert(device);
- ifindex = udev_device_get_ifindex(device);
- link = hashmap_get(m->links, &ifindex);
- if (link) {
- *ret = link;
- return -EEXIST;
- }
-
r = link_new(m, device, &link);
if (r < 0)
return r;
*ret = link;
- devtype = udev_device_get_devtype(device);
- if (streq_ptr(devtype, "bridge")) {
- r = bridge_set_link(m, link);
- if (r < 0 && r != -ENOENT)
- return r;
- }
-
r = network_get(m, device, &network);
if (r < 0)
return r == -ENOENT ? 0 : r;
link->state = LINK_STATE_CONFIGURED;
+ link_save(link);
+
return 0;
}
log_warning_link(link, "failed");
link->state = LINK_STATE_FAILED;
+
+ link_save(link);
}
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_link(link, "could not set route: %s", strerror(-r));
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not set route: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
/* we might have received an old reply after moving back to SETTING_ADDRESSES,
* ignore it */
}
static int link_enter_set_routes(Link *link) {
- Route *route;
+ Route *rt;
int r;
assert(link);
link->state = LINK_STATE_SETTING_ROUTES;
- if (!link->network->static_routes && !link->dhcp_route)
+ if (!link->network->static_routes && !link->dhcp_lease)
return link_enter_configured(link);
log_debug_link(link, "setting routes");
- LIST_FOREACH(static_routes, route, link->network->static_routes) {
- r = route_configure(route, link, &route_handler);
+ LIST_FOREACH(static_routes, rt, link->network->static_routes) {
+ r = route_configure(rt, link, &route_handler);
if (r < 0) {
log_warning_link(link,
"could not set routes: %s", strerror(-r));
link->route_messages ++;
}
- if (link->dhcp_route) {
- r = route_configure(link->dhcp_route, link, &route_handler);
+ if (link->dhcp_lease) {
+ _cleanup_route_free_ Route *route = NULL;
+ struct in_addr gateway;
+
+ r = sd_dhcp_lease_get_router(link->dhcp_lease, &gateway);
+ if (r < 0) {
+ log_warning_link(link, "DHCP error: no router: %s",
+ strerror(-r));
+ return r;
+ }
+
+ r = route_new_dynamic(&route);
+ if (r < 0) {
+ log_error_link(link, "Could not allocate route: %s",
+ strerror(-r));
+ return r;
+ }
+
+ route->family = AF_INET;
+ route->in_addr.in = gateway;
+
+ r = route_configure(route, link, &route_handler);
if (r < 0) {
log_warning_link(link,
"could not set routes: %s", strerror(-r));
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST)
- log_struct_link(LOG_ERR, link,
+ log_struct_link(LOG_WARNING, link,
"MESSAGE=%s: could not set address: %s",
link->ifname, strerror(-r),
"ERRNO=%d", -r,
}
static int link_enter_set_addresses(Link *link) {
- Address *address;
+ Address *ad;
int r;
assert(link);
link->state = LINK_STATE_SETTING_ADDRESSES;
- if (!link->network->static_addresses && !link->dhcp_address)
+ if (!link->network->static_addresses && !link->dhcp_lease)
return link_enter_set_routes(link);
log_debug_link(link, "setting addresses");
- LIST_FOREACH(static_addresses, address, link->network->static_addresses) {
- r = address_configure(address, link, &address_handler);
+ LIST_FOREACH(static_addresses, ad, link->network->static_addresses) {
+ r = address_configure(ad, link, &address_handler);
if (r < 0) {
log_warning_link(link,
"could not set addresses: %s", strerror(-r));
link->addr_messages ++;
}
- if (link->dhcp_address) {
- r = address_configure(link->dhcp_address, link, &address_handler);
+ if (link->dhcp_lease) {
+ _cleanup_address_free_ Address *address = NULL;
+ struct in_addr addr;
+ struct in_addr netmask;
+ unsigned prefixlen;
+
+ r = sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
+ if (r < 0) {
+ log_warning_link(link, "DHCP error: no address: %s",
+ strerror(-r));
+ return r;
+ }
+
+ r = sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
+ if (r < 0) {
+ log_warning_link(link, "DHCP error: no netmask: %s",
+ strerror(-r));
+ return r;
+ }
+
+ prefixlen = net_netmask_to_prefixlen(&netmask);
+
+ r = address_new_dynamic(&address);
+ if (r < 0) {
+ log_error_link(link, "Could not allocate address: %s",
+ strerror(-r));
+ return r;
+ }
+
+ address->family = AF_INET;
+ address->in_addr.in = addr;
+ address->prefixlen = prefixlen;
+ address->broadcast.s_addr = addr.s_addr | ~netmask.s_addr;
+
+ r = address_configure(address, link, &address_handler);
if (r < 0) {
log_warning_link(link,
"could not set addresses: %s", strerror(-r));
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST)
- log_warning_link(link, "could not drop address: %s", strerror(-r));
+ if (r < 0 && r != -ENOENT)
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not drop address: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
return 1;
}
r = sd_bus_message_new_method_call(
bus,
+ &m,
"org.freedesktop.hostname1",
"/org/freedesktop/hostname1",
"org.freedesktop.hostname1",
- "SetHostname",
- &m);
+ "SetHostname");
if (r < 0)
return r;
return 1;
r = sd_rtnl_message_get_errno(m);
- if (r < 0 && r != -EEXIST)
- log_warning_link(link, "Could not set MTU: %s", strerror(-r));
+ if (r < 0)
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not set MTU: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
return 1;
}
static int link_set_mtu(Link *link, uint32_t mtu) {
- _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(link);
log_debug_link(link, "setting MTU: %" PRIu32, mtu);
- r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_new_link(link->manager->rtnl, &req,
+ RTM_SETLINK, link->ifindex);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
return 0;
}
-static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
- Link *link = userdata;
- struct in_addr address;
+static int dhcp_lease_lost(Link *link) {
+ _cleanup_address_free_ Address *address = NULL;
+ struct in_addr addr;
struct in_addr netmask;
- struct in_addr gateway;
- int prefixlen;
+ unsigned prefixlen;
int r;
assert(link);
- assert(link->network);
- assert(link->manager);
-
- if (link->state == LINK_STATE_FAILED)
- return;
-
- if (event < 0) {
- log_warning_link(link, "DHCP error: %s", strerror(-event));
- link_enter_failed(link);
- return;
- }
+ assert(link->dhcp_lease);
- if (event == DHCP_EVENT_NO_LEASE)
- log_debug_link(link, "IP address in use.");
+ log_warning_link(link, "DHCP lease lost");
- if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_EXPIRED ||
- event == DHCP_EVENT_STOP) {
- if (link->dhcp_address) {
- address_drop(link->dhcp_address, link, address_drop_handler);
+ r = address_new_dynamic(&address);
+ if (r >= 0) {
+ sd_dhcp_lease_get_address(link->dhcp_lease, &addr);
+ sd_dhcp_lease_get_netmask(link->dhcp_lease, &netmask);
+ prefixlen = net_netmask_to_prefixlen(&netmask);
- address_free(link->dhcp_address);
- link->dhcp_address = NULL;
- }
+ address->family = AF_INET;
+ address->in_addr.in = addr;
+ address->prefixlen = prefixlen;
- if (link->dhcp_route) {
- route_free(link->dhcp_route);
- link->dhcp_route = NULL;
- }
+ address_drop(address, link, address_drop_handler);
+ }
- if (link->network->dhcp_mtu) {
- uint16_t mtu;
+ if (link->network->dhcp_mtu) {
+ uint16_t mtu;
- r = sd_dhcp_client_get_mtu(client, &mtu);
- if (r >= 0 && link->original_mtu != mtu) {
- r = link_set_mtu(link, link->original_mtu);
- if (r < 0) {
- log_warning_link(link, "DHCP error: could not reset MTU");
- link_enter_failed(link);
- return;
- }
+ r = sd_dhcp_lease_get_mtu(link->dhcp_lease, &mtu);
+ if (r >= 0 && link->original_mtu != mtu) {
+ r = link_set_mtu(link, link->original_mtu);
+ if (r < 0) {
+ log_warning_link(link, "DHCP error: could not reset MTU");
+ link_enter_failed(link);
+ return r;
}
}
+ }
+
+ if (link->network->dhcp_hostname) {
+ const char *hostname = NULL;
- if (link->network->dhcp_hostname) {
+ r = sd_dhcp_lease_get_hostname(link->dhcp_lease, &hostname);
+ if (r >= 0 && hostname) {
r = set_hostname(link->manager->bus, "");
if (r < 0)
log_error("Failed to reset transient hostname");
}
}
- r = sd_dhcp_client_get_address(client, &address);
+ link->dhcp_lease = sd_dhcp_lease_unref(link->dhcp_lease);
+
+ return 0;
+}
+
+static int dhcp_lease_acquired(sd_dhcp_client *client, Link *link) {
+ sd_dhcp_lease *lease;
+ struct in_addr address;
+ struct in_addr netmask;
+ struct in_addr gateway;
+ unsigned prefixlen;
+ struct in_addr *nameservers;
+ size_t nameservers_size;
+ int r;
+
+ assert(client);
+ assert(link);
+
+ r = sd_dhcp_client_get_lease(client, &lease);
if (r < 0) {
- log_warning_link(link, "DHCP error: no address");
- link_enter_failed(link);
- return;
+ log_warning_link(link, "DHCP error: no lease: %s",
+ strerror(-r));
+ return r;
}
- r = sd_dhcp_client_get_netmask(client, &netmask);
+ r = sd_dhcp_lease_get_address(lease, &address);
if (r < 0) {
- log_warning_link(link, "DHCP error: no netmask");
- link_enter_failed(link);
- return;
+ log_warning_link(link, "DHCP error: no address: %s",
+ strerror(-r));
+ return r;
}
- prefixlen = sd_dhcp_client_prefixlen(&netmask);
- if (prefixlen < 0) {
- log_warning_link(link, "DHCP error: no prefixlen");
- link_enter_failed(link);
- return;
+ r = sd_dhcp_lease_get_netmask(lease, &netmask);
+ if (r < 0) {
+ log_warning_link(link, "DHCP error: no netmask: %s",
+ strerror(-r));
+ return r;
}
- r = sd_dhcp_client_get_router(client, &gateway);
+ prefixlen = net_netmask_to_prefixlen(&netmask);
+
+ r = sd_dhcp_lease_get_router(lease, &gateway);
if (r < 0) {
- log_warning_link(link, "DHCP error: no router");
- link_enter_failed(link);
- return;
+ log_warning_link(link, "DHCP error: no router: %s",
+ strerror(-r));
+ return r;
}
- if (event == DHCP_EVENT_IP_CHANGE || event == DHCP_EVENT_IP_ACQUIRE) {
- _cleanup_address_free_ Address *addr = NULL;
- _cleanup_route_free_ Route *rt = NULL;
- struct in_addr *nameservers;
- size_t nameservers_size;
-
- log_struct_link(LOG_INFO, link,
- "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
- link->ifname,
- ADDRESS_FMT_VAL(address),
- prefixlen,
- ADDRESS_FMT_VAL(gateway),
- "ADDRESS=%u.%u.%u.%u",
- ADDRESS_FMT_VAL(address),
- "PREFIXLEN=%u",
- prefixlen,
- "GATEWAY=%u.%u.%u.%u",
- ADDRESS_FMT_VAL(gateway),
- NULL);
+ log_struct_link(LOG_INFO, link,
+ "MESSAGE=%s: DHCPv4 address %u.%u.%u.%u/%u via %u.%u.%u.%u",
+ link->ifname,
+ ADDRESS_FMT_VAL(address),
+ prefixlen,
+ ADDRESS_FMT_VAL(gateway),
+ "ADDRESS=%u.%u.%u.%u",
+ ADDRESS_FMT_VAL(address),
+ "PREFIXLEN=%u",
+ prefixlen,
+ "GATEWAY=%u.%u.%u.%u",
+ ADDRESS_FMT_VAL(gateway),
+ NULL);
+
+ link->dhcp_lease = lease;
+
+ if (link->network->dhcp_dns) {
+ r = sd_dhcp_lease_get_dns(lease, &nameservers, &nameservers_size);
+ if (r >= 0) {
+ r = manager_update_resolv_conf(link->manager);
+ if (r < 0)
+ log_error("Failed to update resolv.conf");
+ }
+ }
- r = address_new_dynamic(&addr);
- if (r < 0) {
- log_error_link(link, "Could not allocate address");
- link_enter_failed(link);
- return;
+ if (link->network->dhcp_mtu) {
+ uint16_t mtu;
+
+ r = sd_dhcp_lease_get_mtu(lease, &mtu);
+ if (r >= 0) {
+ r = link_set_mtu(link, mtu);
+ if (r < 0)
+ log_error_link(link, "Failed to set MTU "
+ "to %" PRIu16, mtu);
}
+ }
- addr->family = AF_INET;
- addr->in_addr.in = address;
- addr->prefixlen = prefixlen;
- addr->netmask = netmask;
+ if (link->network->dhcp_hostname) {
+ const char *hostname;
- r = route_new_dynamic(&rt);
- if (r < 0) {
- log_error_link(link, "Could not allocate route");
- link_enter_failed(link);
- return;
+ r = sd_dhcp_lease_get_hostname(lease, &hostname);
+ if (r >= 0) {
+ r = set_hostname(link->manager->bus, hostname);
+ if (r < 0)
+ log_error("Failed to set transient hostname "
+ "to '%s'", hostname);
}
+ }
- rt->family = AF_INET;
- rt->in_addr.in = gateway;
+ link_enter_set_addresses(link);
- link->dhcp_address = addr;
- link->dhcp_route = rt;
- addr = NULL;
- rt = NULL;
+ return 0;
+}
- if (link->network->dhcp_dns) {
- r = sd_dhcp_client_get_dns(client, &nameservers, &nameservers_size);
- if (r >= 0) {
- r = manager_update_resolv_conf(link->manager);
- if (r < 0)
- log_error("Failed to update resolv.conf");
- }
- }
+static void dhcp_handler(sd_dhcp_client *client, int event, void *userdata) {
+ Link *link = userdata;
+ int r;
- if (link->network->dhcp_mtu) {
- uint16_t mtu;
-
- r = sd_dhcp_client_get_mtu(client, &mtu);
- if (r >= 0) {
- r = link_set_mtu(link, mtu);
- if (r < 0)
- log_error_link(link, "Failed to set MTU "
- "to %" PRIu16, mtu);
+ assert(link);
+ assert(link->network);
+ assert(link->manager);
+
+ if (link->state == LINK_STATE_FAILED)
+ return;
+
+ switch (event) {
+ case DHCP_EVENT_NO_LEASE:
+ log_debug_link(link, "IP address in use.");
+ break;
+ case DHCP_EVENT_EXPIRED:
+ case DHCP_EVENT_STOP:
+ case DHCP_EVENT_IP_CHANGE:
+ if (link->network->dhcp_critical) {
+ log_error_link(link, "DHCPv4 connection considered system critical, "
+ "ignoring request to reconfigure it.");
+ return;
}
- }
- if (link->network->dhcp_hostname) {
- const char *hostname;
+ if (link->dhcp_lease) {
+ r = dhcp_lease_lost(link);
+ if (r < 0) {
+ link_enter_failed(link);
+ return;
+ }
+ }
- r = sd_dhcp_client_get_hostname(client, &hostname);
- if (r >= 0) {
- r = set_hostname(link->manager->bus, hostname);
- if (r < 0)
- log_error("Failed to set transient hostname "
- "to '%s'", hostname);
+ if (event == DHCP_EVENT_IP_CHANGE) {
+ r = dhcp_lease_acquired(client, link);
+ if (r < 0) {
+ link_enter_failed(link);
+ return;
+ }
}
- }
- link_enter_set_addresses(link);
+ break;
+ case DHCP_EVENT_IP_ACQUIRE:
+ r = dhcp_lease_acquired(client, link);
+ if (r < 0) {
+ link_enter_failed(link);
+ return;
+ }
+ break;
+ default:
+ if (event < 0)
+ log_warning_link(link, "DHCP error: %s", strerror(-event));
+ else
+ log_warning_link(link, "DHCP unknown event: %d", event);
+ break;
}
return;
assert(link->manager);
assert(link->manager->event);
- if (!link->dhcp) {
- r = sd_dhcp_client_new(&link->dhcp);
+ if (!link->dhcp_client) {
+ r = sd_dhcp_client_new(&link->dhcp_client);
if (r < 0)
return r;
- r = sd_dhcp_client_attach_event(link->dhcp, NULL, 0);
+ r = sd_dhcp_client_attach_event(link->dhcp_client, NULL, 0);
if (r < 0)
return r;
- r = sd_dhcp_client_set_index(link->dhcp, link->ifindex);
+ r = sd_dhcp_client_set_index(link->dhcp_client, link->ifindex);
if (r < 0)
return r;
- r = sd_dhcp_client_set_mac(link->dhcp, &link->mac);
+ r = sd_dhcp_client_set_mac(link->dhcp_client, &link->mac);
if (r < 0)
return r;
- r = sd_dhcp_client_set_callback(link->dhcp, dhcp_handler, link);
+ r = sd_dhcp_client_set_callback(link->dhcp_client, dhcp_handler, link);
if (r < 0)
return r;
if (link->network->dhcp_mtu) {
- r = sd_dhcp_client_set_request_option(link->dhcp, 26);
+ r = sd_dhcp_client_set_request_option(link->dhcp_client, 26);
if (r < 0)
return r;
}
log_debug_link(link, "acquiring DHCPv4 lease");
- r = sd_dhcp_client_start(link->dhcp);
+ r = sd_dhcp_client_start(link->dhcp_client);
if (r < 0)
return r;
log_info_link(link, "carrier off");
if (link->network->dhcp) {
- r = sd_dhcp_client_stop(link->dhcp);
+ r = sd_dhcp_client_stop(link->dhcp_client);
if (r < 0) {
log_warning_link(link, "Could not stop DHCPv4 client: %s", strerror(-r));
link_enter_failed(link);
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning_link(link,
- "could not bring up interface: %s", strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not bring up interface: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
link_enter_failed(link);
+ return 1;
}
link_update_flags(link, link->flags | IFF_UP);
}
static int link_up(Link *link) {
- _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(link);
log_debug_link(link, "bringing link up");
- r = sd_rtnl_message_link_new(RTM_SETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_new_link(link->manager->rtnl, &req,
+ RTM_SETLINK, link->ifindex);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
return 0;
}
-static int link_bridge_joined(Link *link) {
+static int link_enslaved(Link *link) {
int r;
assert(link);
- assert(link->state == LINK_STATE_JOINING_BRIDGE);
+ assert(link->state == LINK_STATE_ENSLAVING);
assert(link->network);
r = link_up(link);
return 0;
}
-static int bridge_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
Link *link = userdata;
int r;
assert(link);
- assert(link->state == LINK_STATE_JOINING_BRIDGE || link->state == LINK_STATE_FAILED);
+ assert(link->state == LINK_STATE_ENSLAVING || link->state == LINK_STATE_FAILED);
assert(link->network);
+ link->enslaving --;
+
if (link->state == LINK_STATE_FAILED)
return 1;
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
log_struct_link(LOG_ERR, link,
- "MESSAGE=%s: could not join bridge '%s': %s",
- link->ifname, link->network->bridge->name, strerror(-r),
- BRIDGE(link->network->bridge),
+ "MESSAGE=%s: could not enslave: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
NULL);
link_enter_failed(link);
return 1;
}
- log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: joined bridge '%s'",
- link->network->bridge->name,
- BRIDGE(link->network->bridge),
- NULL);
+ log_debug_link(link, "enslaved");
- link_bridge_joined(link);
+ if (link->enslaving == 0)
+ link_enslaved(link);
return 1;
}
-static int link_enter_join_bridge(Link *link) {
+static int link_enter_enslave(Link *link) {
+ NetDev *vlan, *macvlan;
+ Iterator i;
int r;
assert(link);
assert(link->network);
assert(link->state == _LINK_STATE_INVALID);
- link->state = LINK_STATE_JOINING_BRIDGE;
+ link->state = LINK_STATE_ENSLAVING;
- if (!link->network->bridge)
- return link_bridge_joined(link);
+ link_save(link);
- log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%s: joining bridge '%s'",
- link->network->bridge->name,
- BRIDGE(link->network->bridge),
- NULL);
- log_debug_link(link, "joining bridge");
+ if (!link->network->bridge && !link->network->bond &&
+ hashmap_isempty(link->network->vlans) &&
+ hashmap_isempty(link->network->macvlans))
+ return link_enslaved(link);
- r = bridge_join(link->network->bridge, link, &bridge_handler);
- if (r < 0) {
- log_struct_link(LOG_WARNING, link,
- "MESSAGE=%s: could not join bridge '%s': %s",
- link->network->bridge->name, strerror(-r),
- BRIDGE(link->network->bridge),
+ if (link->network->bridge) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: enslaving by '%s'",
+ link->ifname, link->network->bridge->name,
+ NETDEV(link->network->bridge),
NULL);
- link_enter_failed(link);
- return r;
+
+ r = netdev_enslave(link->network->bridge, link, &enslave_handler);
+ if (r < 0) {
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not enslave by '%s': %s",
+ link->ifname, link->network->bridge->name, strerror(-r),
+ NETDEV(link->network->bridge),
+ NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link->enslaving ++;
+ }
+
+ HASHMAP_FOREACH(vlan, link->network->vlans, i) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: enslaving by '%s'",
+ link->ifname, vlan->name, NETDEV(vlan), NULL);
+
+ r = netdev_enslave(vlan, link, &enslave_handler);
+ if (r < 0) {
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not enslave by '%s': %s",
+ link->ifname, vlan->name, strerror(-r),
+ NETDEV(vlan), NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link->enslaving ++;
+ }
+
+ HASHMAP_FOREACH(macvlan, link->network->macvlans, i) {
+ log_struct_link(LOG_DEBUG, link,
+ "MESSAGE=%s: enslaving by '%s'",
+ link->ifname, macvlan->name, NETDEV(macvlan), NULL);
+
+ r = netdev_enslave(macvlan, link, &enslave_handler);
+ if (r < 0) {
+ log_struct_link(LOG_WARNING, link,
+ "MESSAGE=%s: could not enslave by '%s': %s",
+ link->ifname, macvlan->name, strerror(-r),
+ NETDEV(macvlan), NULL);
+ link_enter_failed(link);
+ return r;
+ }
+
+ link->enslaving ++;
}
return 0;
}
-static int link_get_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int link_getlink_handler(sd_rtnl *rtnl, sd_rtnl_message *m,
+ void *userdata) {
Link *link = userdata;
int r;
r = sd_rtnl_message_get_errno(m);
if (r < 0) {
- log_warning_link(link, "could not get state: %s", strerror(-r));
+ log_struct_link(LOG_ERR, link,
+ "MESSAGE=%s: could not get state: %s",
+ link->ifname, strerror(-r),
+ "ERRNO=%d", -r,
+ NULL);
link_enter_failed(link);
+ return 1;
}
log_debug_link(link, "got link state");
return 1;
}
-static int link_get(Link *link) {
- _cleanup_sd_rtnl_message_unref_ sd_rtnl_message *req = NULL;
+static int link_getlink(Link *link) {
+ _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
int r;
assert(link);
log_debug_link(link, "requesting link status");
- r = sd_rtnl_message_link_new(RTM_GETLINK, link->ifindex, &req);
+ r = sd_rtnl_message_new_link(link->manager->rtnl, &req,
+ RTM_GETLINK, link->ifindex);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;
}
- r = sd_rtnl_call_async(link->manager->rtnl, req, link_get_handler, link, 0, NULL);
+ r = sd_rtnl_call_async(link->manager->rtnl, req, link_getlink_handler,
+ link, 0, NULL);
if (r < 0) {
log_error_link(link,
"Could not send rtnetlink message: %s", strerror(-r));
assert(link->network);
assert(link->state == _LINK_STATE_INVALID);
- r = link_get(link);
+ r = link_getlink(link);
if (r < 0) {
link_enter_failed(link);
return r;
}
- return link_enter_join_bridge(link);
+ return link_enter_enslave(link);
}
int link_update(Link *link, sd_rtnl_message *m) {
return link_update_flags(link, flags);
}
+
+int link_save(Link *link) {
+ _cleanup_free_ char *temp_path = NULL;
+ _cleanup_fclose_ FILE *f = NULL;
+ int r;
+
+ assert(link);
+ assert(link->state_file);
+
+ r = mkdir_safe_label("/run/systemd/network/links", 0755, 0, 0);
+ if (r < 0)
+ goto finish;
+
+ r = fopen_temporary(link->state_file, &f, &temp_path);
+ if (r < 0)
+ goto finish;
+
+ fchmod(fileno(f), 0644);
+
+ fprintf(f,
+ "# This is private data. Do not parse.\n"
+ "STATE=%s\n",
+ link_state_to_string(link->state));
+
+ if (link->dhcp_lease) {
+ const char *lease_file = "/run/systemd/network/leases/test.lease";
+
+ r = dhcp_lease_save(link->dhcp_lease, lease_file);
+ if (r < 0)
+ goto finish;
+
+ fprintf(f, "DHCP_LEASE=%s\n", lease_file);
+ }
+
+ fflush(f);
+
+ if (ferror(f) || rename(temp_path, link->state_file) < 0) {
+ r = -errno;
+ unlink(link->state_file);
+ unlink(temp_path);
+ }
+
+finish:
+ if (r < 0)
+ log_error("Failed to save link data %s: %s", link->state_file, strerror(-r));
+
+ return r;
+}
+
+static const char* const link_state_table[_LINK_STATE_MAX] = {
+ [LINK_STATE_ENSLAVING] = "configuring",
+ [LINK_STATE_SETTING_ADDRESSES] = "configuring",
+ [LINK_STATE_SETTING_ROUTES] = "configuring",
+ [LINK_STATE_CONFIGURED] = "configured",
+ [LINK_STATE_FAILED] = "failed",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(link_state, LinkState);