#include <unistd.h>
#include "networkd.h"
+#include "networkd-netdev.h"
#include "libudev-private.h"
#include "udev-util.h"
#include "util.h"
static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) {
_cleanup_link_unref_ Link *link = NULL;
uint16_t type;
- char *ifname;
+ const char *ifname;
int r, ifindex;
assert(manager);
- assert(manager->links);
assert(message);
assert(ret);
if (r < 0)
log_debug_link(link, "MAC address not found for new device, continuing without");
- r = asprintf(&link->state_file, "/run/systemd/netif/links/%"PRIu64,
- link->ifindex);
+ r = asprintf(&link->state_file, "/run/systemd/netif/links/%d", link->ifindex);
if (r < 0)
return -ENOMEM;
- r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%"PRIu64,
- link->ifindex);
+ r = asprintf(&link->lease_file, "/run/systemd/netif/leases/%d", link->ifindex);
if (r < 0)
return -ENOMEM;
- r = hashmap_put(manager->links, &link->ifindex, link);
+ r = hashmap_ensure_allocated(&manager->links, NULL, NULL);
+ if (r < 0)
+ return r;
+
+ r = hashmap_put(manager->links, INT_TO_PTR(link->ifindex), link);
if (r < 0)
return r;
sd_icmp6_nd_unref(link->icmp6_router_discovery);
if (link->manager)
- hashmap_remove(link->manager->links, &link->ifindex);
+ hashmap_remove(link->manager->links, INT_TO_PTR(link->ifindex));
free(link->ifname);
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);
+ link = hashmap_get(m->links, INT_TO_PTR(ifindex));
if (!link)
return -ENODEV;
static int link_set_dhcp_routes(Link *link) {
struct sd_dhcp_route *static_routes;
- size_t static_routes_size;
- int r;
- unsigned i;
+ int r, n, i;
assert(link);
- r = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes, &static_routes_size);
- if (r < 0) {
- if (r != -ENOENT)
- log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-r));
- return r;
+ n = sd_dhcp_lease_get_routes(link->dhcp_lease, &static_routes);
+ if (n < 0) {
+ if (n != -ENOENT)
+ log_warning_link(link, "DHCP error: could not get routes: %s", strerror(-n));
+ return n;
}
- for (i = 0; i < static_routes_size; i++) {
+ for (i = 0; i < n; i++) {
_cleanup_route_free_ Route *route = NULL;
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_DHCP);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
route->in_addr.in = static_routes[i].gw_addr;
route->dst_addr.in = static_routes[i].dst_addr;
route->dst_prefixlen = static_routes[i].dst_prefixlen;
- route->metrics = DHCP_STATIC_ROUTE_METRIC;
+ route->metrics = DHCP_ROUTE_METRIC;
r = route_configure(route, link, &route_handler);
if (r < 0) {
if (link->ipv4ll && !link->dhcp_lease) {
_cleanup_route_free_ Route *route = NULL;
- struct in_addr addr;
-
- r = sd_ipv4ll_get_address(link->ipv4ll, &addr);
- if (r < 0 && r != -ENOENT) {
- log_warning_link(link, "IPV4LL error: no address: %s",
- strerror(-r));
- return r;
- }
if (r != -ENOENT) {
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_STATIC);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
route->family = AF_INET;
route->scope = RT_SCOPE_LINK;
- route->metrics = 99;
+ route->metrics = IPV4LL_ROUTE_METRIC;
r = route_configure(route, link, &route_handler);
if (r < 0) {
}
if (r >= 0) {
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_DHCP);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
return r;
}
- r = route_new_dynamic(&route_gw);
+ r = route_new_dynamic(&route_gw, RTPROT_DHCP);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
route_gw->dst_addr.in = gateway;
route_gw->dst_prefixlen = 32;
route_gw->scope = RT_SCOPE_LINK;
- route_gw->metrics = DHCP_STATIC_ROUTE_METRIC;
+ route_gw->metrics = DHCP_ROUTE_METRIC;
r = route_configure(route_gw, link, &route_handler);
if (r < 0) {
route->family = AF_INET;
route->in_addr.in = gateway;
- route->metrics = DHCP_STATIC_ROUTE_METRIC;
+ route->metrics = DHCP_ROUTE_METRIC;
r = route_configure(route, link, &route_handler);
if (r < 0) {
"ERRNO=%d", -r,
NULL);
- return 0;
+ return 1;
}
static int link_get_address_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
link->ifname, strerror(-r),
"ERRNO=%d", -r,
NULL);
- if (r >= 0) {
+ else if (r >= 0) {
/* calling handler directly so take a ref */
link_ref(link);
link_get_address_handler(rtnl, m, link);
"ERRNO=%d", -r,
NULL);
- return 0;
+ return 1;
}
static int address_drop_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
"ERRNO=%d", -r,
NULL);
- return 0;
+ return 1;
}
static int set_hostname_handler(sd_bus *bus, sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
r = sd_bus_message_get_errno(m);
if (r < 0)
- log_warning_link(link, "Could not set hostname: %s", strerror(-r));
+ r = -r;
+ if (r > 0)
+ log_warning_link(link, "Could not set hostname: %s", strerror(r));
return 1;
}
struct in_addr netmask;
struct in_addr gateway;
unsigned prefixlen;
- unsigned i;
int r;
assert(link);
if (link->network->dhcp_routes) {
struct sd_dhcp_route *routes;
- size_t routes_size;
+ int n, i;
- r = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes, &routes_size);
- if (r >= 0) {
- for (i = 0; i < routes_size; i++) {
+ n = sd_dhcp_lease_get_routes(link->dhcp_lease, &routes);
+ if (n >= 0) {
+ for (i = 0; i < n; i++) {
_cleanup_route_free_ Route *route = NULL;
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_UNSPEC);
if (r >= 0) {
route->family = AF_INET;
route->in_addr.in = routes[i].gw_addr;
_cleanup_route_free_ Route *route_gw = NULL;
_cleanup_route_free_ Route *route = NULL;
- r = route_new_dynamic(&route_gw);
+ r = route_new_dynamic(&route_gw, RTPROT_UNSPEC);
if (r >= 0) {
route_gw->family = AF_INET;
route_gw->dst_addr.in = gateway;
route_drop(route_gw, link, &route_drop_handler);
}
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_UNSPEC);
if (r >= 0) {
route->family = AF_INET;
route->in_addr.in = gateway;
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:
address_drop(address, link, &address_drop_handler);
- r = route_new_dynamic(&route);
+ r = route_new_dynamic(&route, RTPROT_UNSPEC);
if (r < 0) {
log_error_link(link, "Could not allocate route: %s",
strerror(-r));
return 0;
}
-static int link_enslaved(Link *link) {
+static int link_joined(Link *link) {
int r;
assert(link);
assert(link->state == LINK_STATE_ENSLAVING);
assert(link->network);
- log_debug_link(link, "enslaved");
+ log_debug_link(link, "joined netdev");
if (!(link->flags & IFF_UP)) {
r = link_up(link);
return link_enter_set_addresses(link);
}
-static int enslave_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
+static int netdev_join_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
_cleanup_link_unref_ Link *link = userdata;
int r;
r = sd_rtnl_message_get_errno(m);
if (r < 0 && r != -EEXIST) {
log_struct_link(LOG_ERR, link,
- "MESSAGE=%-*s: could not enslave: %s",
+ "MESSAGE=%-*s: could not join netdev: %s",
IFNAMSIZ,
link->ifname, strerror(-r),
"ERRNO=%d", -r,
}
if (link->enslaving <= 0)
- link_enslaved(link);
+ link_joined(link);
return 1;
}
-static int link_enter_enslave(Link *link) {
- NetDev *vlan, *macvlan, *vxlan;
+static int link_enter_join_netdev(Link *link) {
+ NetDev *netdev;
Iterator i;
int r;
if (!link->network->bridge &&
!link->network->bond &&
- !link->network->tunnel &&
- hashmap_isempty(link->network->vlans) &&
- hashmap_isempty(link->network->macvlans) &&
- hashmap_isempty(link->network->vxlans))
- return link_enslaved(link);
+ hashmap_isempty(link->network->stacked_netdevs))
+ return link_joined(link);
if (link->network->bond) {
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->bond->ifname,
- NETDEV(link->network->bond),
+ NETDEVIF(link->network->bond),
NULL);
- r = netdev_enslave(link->network->bond, link, &enslave_handler);
+ r = netdev_join(link->network->bond, link, &netdev_join_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%-*s: could not enslave by '%s': %s",
+ "MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, link->network->bond->ifname, strerror(-r),
- NETDEV(link->network->bond),
+ NETDEVIF(link->network->bond),
NULL);
link_enter_failed(link);
return r;
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
link->ifname, link->network->bridge->ifname,
- NETDEV(link->network->bridge),
+ NETDEVIF(link->network->bridge),
NULL);
- r = netdev_enslave(link->network->bridge, link, &enslave_handler);
+ r = netdev_join(link->network->bridge, link, &netdev_join_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%-*s: could not enslave by '%s': %s",
+ "MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
link->ifname, link->network->bridge->ifname, strerror(-r),
- NETDEV(link->network->bridge),
- NULL);
- link_enter_failed(link);
- return r;
- }
-
- link->enslaving ++;
- }
-
- if (link->network->tunnel) {
- log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%-*s: enslaving by '%s'",
- IFNAMSIZ,
- link->ifname, link->network->tunnel->ifname,
- NETDEV(link->network->tunnel),
- NULL);
-
- r = netdev_enslave(link->network->tunnel, link, &enslave_handler);
- if (r < 0) {
- log_struct_link(LOG_WARNING, link,
- "MESSAGE=%-*s: could not enslave by '%s': %s",
- IFNAMSIZ,
- link->ifname, link->network->tunnel->ifname, strerror(-r),
- NETDEV(link->network->tunnel),
+ NETDEVIF(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'",
- IFNAMSIZ,
- link->ifname, vlan->ifname, 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",
- IFNAMSIZ,
- link->ifname, vlan->ifname, strerror(-r),
- NETDEV(vlan), NULL);
- link_enter_failed(link);
- return r;
- }
-
- link->enslaving ++;
- }
-
- HASHMAP_FOREACH(macvlan, link->network->macvlans, i) {
+ HASHMAP_FOREACH(netdev, link->network->stacked_netdevs, i) {
log_struct_link(LOG_DEBUG, link,
"MESSAGE=%-*s: enslaving by '%s'",
IFNAMSIZ,
- link->ifname, macvlan->ifname, NETDEV(macvlan), NULL);
+ link->ifname, netdev->ifname, NETDEVIF(netdev), NULL);
- r = netdev_enslave(macvlan, link, &enslave_handler);
+ r = netdev_join(netdev, link, &netdev_join_handler);
if (r < 0) {
log_struct_link(LOG_WARNING, link,
- "MESSAGE=%-*s: could not enslave by '%s': %s",
+ "MESSAGE=%-*s: could not join netdev '%s': %s",
IFNAMSIZ,
- link->ifname, macvlan->ifname, strerror(-r),
- NETDEV(macvlan), NULL);
- link_enter_failed(link);
- return r;
- }
-
- link->enslaving ++;
- }
-
- HASHMAP_FOREACH(vxlan, link->network->vxlans, i) {
- log_struct_link(LOG_DEBUG, link,
- "MESSAGE=%*s: enslaving by '%s'",
- IFNAMSIZ,
- link->ifname, vxlan->ifname, NETDEV(vxlan), NULL);
-
- r = netdev_enslave(vxlan, link, &enslave_handler);
- if (r < 0) {
- log_struct_link(LOG_WARNING, link,
- "MESSAGE=%*s: could not enslave by '%s': %s",
- IFNAMSIZ,
- link->ifname, vxlan->ifname, strerror(-r),
- NETDEV(vxlan), NULL);
+ link->ifname, netdev->ifname, strerror(-r),
+ NETDEVIF(netdev), NULL);
link_enter_failed(link);
return r;
}
if (r < 0)
return r;
+ r = sd_dhcp_client_set_request_broadcast(link->dhcp_client, link->network->dhcp_broadcast);
+ if (r < 0)
+ return r;
+
if (link->network->dhcp_mtu) {
r = sd_dhcp_client_set_request_option(link->dhcp_client, 26);
if (r < 0)
return r;
}
}
+
+ if (link->network->dhcp_vendor_class_identifier) {
+ r = sd_dhcp_client_set_vendor_class_identifier(link->dhcp_client,
+ link->network->dhcp_vendor_class_identifier);
+ if (r < 0)
+ return r;
+ }
}
if (link->network->dhcp_server) {
return r;
}
- return link_enter_enslave(link);
+ return link_enter_join_netdev(link);
}
static int link_initialized_and_synced(sd_rtnl *rtnl, sd_rtnl_message *m, void *userdata) {
if (link->state != LINK_STATE_INITIALIZING)
return 0;
+ if (link->udev_device)
+ return 0;
+
log_debug_link(link, "udev initialized link");
link->udev_device = udev_device_ref(device);
link = *ret;
- log_debug_link(link, "link %"PRIu64" added", link->ifindex);
+ log_debug_link(link, "link %d added", link->ifindex);
r = sd_rtnl_message_new_addr(m->rtnl, &req, RTM_GETADDR, link->ifindex, 0);
if (r < 0)
if (detect_container(NULL) <= 0) {
/* not in a container, udev will be around */
- sprintf(ifindex_str, "n%"PRIu64, link->ifindex);
+ sprintf(ifindex_str, "n%d", link->ifindex);
device = udev_device_new_from_device_id(m->udev, ifindex_str);
if (!device) {
log_warning_link(link, "could not find udev device");
int link_update(Link *link, sd_rtnl_message *m) {
struct ether_addr mac;
- char *ifname;
+ const char *ifname;
int r;
assert(link);
return link_update_flags(link, m);
}
-static void serialize_addresses(FILE *f, const char *key, Address *address) {
- Address *ad;
-
- assert(f);
- assert(key);
-
- if (!address)
- return;
-
- fprintf(f, "%s=", key);
-
- LIST_FOREACH(addresses, ad, address) {
- char buf[INET6_ADDRSTRLEN];
-
- if (inet_ntop(ad->family, &ad->in_addr, buf, INET6_ADDRSTRLEN))
- fprintf(f, "%s%s", buf, (ad->addresses_next) ? " ": "");
- }
-
- fputs("\n", f);
-}
-
static void link_update_operstate(Link *link) {
assert(link);
fprintf(f,
"# This is private data. Do not parse.\n"
"ADMIN_STATE=%s\n"
- "OPER_STATE=%s\n"
- "FLAGS=%u\n",
- admin_state, oper_state, link->flags);
+ "OPER_STATE=%s\n",
+ admin_state, oper_state);
if (link->network) {
- serialize_addresses(f, "DNS", link->network->dns);
- serialize_addresses(f, "NTP", link->network->ntp);
+ char **address;
+
+ fputs("DNS=", f);
+
+ if (link->network->dhcp_dns &&
+ link->dhcp_lease) {
+ const struct in_addr *addresses;
+
+ r = sd_dhcp_lease_get_dns(link->dhcp_lease, &addresses);
+ if (r > 0) {
+ serialize_in_addrs(f, addresses, r);
+ if (link->network->dns)
+ fputs(" ", f);
+ }
+ }
+
+ STRV_FOREACH(address, link->network->dns)
+ fprintf(f, "%s%s", *address,
+ (address + 1 ? " " : ""));
+
+ fputs("\n", f);
+
+ fprintf(f, "NTP=");
+
+ if (link->network->dhcp_ntp &&
+ link->dhcp_lease) {
+ const struct in_addr *addresses;
+
+ r = sd_dhcp_lease_get_ntp(link->dhcp_lease, &addresses);
+ if (r > 0) {
+ serialize_in_addrs(f, addresses, r);
+ if (link->network->ntp)
+ fputs(" ", f);
+ }
+ }
+
+ STRV_FOREACH(address, link->network->ntp)
+ fprintf(f, "%s%s", *address,
+ (address + 1 ? " " : ""));
+
+ fputs("\n", f);
}
if (link->dhcp_lease) {
goto finish;
fprintf(f,
- "DHCP_LEASE=%s\n"
- "DHCP_USE_DNS=%s\n"
- "DHCP_USE_NTP=%s\n",
- link->lease_file,
- yes_no(link->network->dhcp_dns),
- yes_no(link->network->dhcp_ntp));
+ "DHCP_LEASE=%s\n",
+ link->lease_file);
} else
unlink(link->lease_file);
~ianmdlvl / elogind.git / blobdiff