#include <resolv.h>
#include <linux/if.h>
+#include <libkmod.h>
#include "path-util.h"
#include "networkd.h"
sd_event_set_watchdog(m->event, true);
- r = sd_rtnl_open(&m->rtnl, RTMGRP_LINK | RTMGRP_IPV4_IFADDR);
+ r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR,
+ RTNLGRP_IPV6_IFADDR);
if (r < 0)
return r;
return -ENOMEM;
}
+ m->kmod_ctx = kmod_new(NULL, NULL);
+ if (!m->kmod_ctx)
+ return -ENOMEM;
+
m->links = hashmap_new(uint64_hash_func, uint64_compare_func);
if (!m->links)
return -ENOMEM;
free(m->state_file);
+ kmod_unref(m->kmod_ctx);
udev_monitor_unref(m->udev_monitor);
udev_unref(m->udev);
sd_bus_unref(m->bus);
static int manager_rtnl_process_link(sd_rtnl *rtnl, sd_rtnl_message *message, void *userdata) {
Manager *m = userdata;
Link *link = NULL;
+ NetDev *netdev = NULL;
uint16_t type;
char *name;
int r, ifindex;
if (r < 0 || ifindex <= 0) {
log_warning("rtnl: received link message without valid ifindex");
return 0;
- }
-
- link_get(m, ifindex, &link);
- if (type == RTM_DELLINK)
- link_drop(link);
- else if (!link) {
- /* link is new, so add it */
- r = link_add(m, message, &link);
- if (r < 0) {
- log_debug("could not add new link");
- return 0;
- }
- }
+ } else
+ link_get(m, ifindex, &link);
r = sd_rtnl_message_read_string(message, IFLA_IFNAME, &name);
- if (r < 0)
+ if (r < 0 || !name) {
log_warning("rtnl: received link message without valid ifname");
- else {
- NetDev *netdev = NULL;
-
+ return 0;
+ } else
netdev_get(m, name, &netdev);
- if (type == RTM_DELLINK)
- netdev_drop(netdev);
- else if (netdev) {
+
+ switch (type) {
+ case RTM_NEWLINK:
+ if (!link) {
+ /* link is new, so add it */
+ r = link_add(m, message, &link);
+ if (r < 0) {
+ log_debug("could not add new link");
+ return 0;
+ }
+ }
+
+ if (netdev) {
+ /* netdev exists, so make sure the ifindex matches */
r = netdev_set_ifindex(netdev, message);
if (r < 0) {
log_debug("could not set ifindex on netdev");
return 0;
}
}
- }
- if (type == RTM_NEWLINK) {
r = link_update(link, message);
if (r < 0)
return 0;
+
+ break;
+
+ case RTM_DELLINK:
+ link_drop(link);
+ netdev_drop(netdev);
+
+ break;
+
+ default:
+ assert_not_reached("Received invalid RTNL message type.");
}
return 1;
if (r < 0)
return r;
+ r = sd_rtnl_add_match(m->rtnl, RTM_NEWADDR, &link_rtnl_process_address, m);
+ if (r < 0)
+ return r;
+
+ r = sd_rtnl_add_match(m->rtnl, RTM_DELADDR, &link_rtnl_process_address, m);
+ if (r < 0)
+ return r;
+
return 0;
}
_cleanup_free_ char *temp_path = NULL;
_cleanup_fclose_ FILE *f = NULL;
const char *oper_state = "unknown";
- bool dormant, carrier;
+ bool dormant = false, carrier = false;
int r;
assert(m);