Merge pull request #171 from teg/rtnl-broadcast-2
sd-rtnl: make joining broadcast groups implicit
This commit is contained in:
@@ -199,7 +199,7 @@ static int list_links(int argc, char *argv[], void *userdata) {
|
||||
|
||||
pager_open_if_enabled();
|
||||
|
||||
r = sd_rtnl_open(&rtnl, 0);
|
||||
r = sd_rtnl_open(&rtnl);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to connect to netlink: %m");
|
||||
|
||||
@@ -670,7 +670,7 @@ static int link_status(int argc, char *argv[], void *userdata) {
|
||||
char **name;
|
||||
int r;
|
||||
|
||||
r = sd_rtnl_open(&rtnl, 0);
|
||||
r = sd_rtnl_open(&rtnl);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to connect to netlink: %m");
|
||||
|
||||
@@ -910,7 +910,7 @@ static int link_lldp_status(int argc, char *argv[], void *userdata) {
|
||||
|
||||
pager_open_if_enabled();
|
||||
|
||||
r = sd_rtnl_open(&rtnl, 0);
|
||||
r = sd_rtnl_open(&rtnl);
|
||||
if (r < 0)
|
||||
return log_error_errno(r, "Failed to connect to netlink: %m");
|
||||
|
||||
|
||||
@@ -385,9 +385,9 @@ static int manager_connect_rtnl(Manager *m) {
|
||||
|
||||
fd = systemd_netlink_fd();
|
||||
if (fd < 0)
|
||||
r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, RTNLGRP_IPV6_IFADDR);
|
||||
r = sd_rtnl_open(&m->rtnl);
|
||||
else
|
||||
r = sd_rtnl_open_fd(&m->rtnl, fd, 0);
|
||||
r = sd_rtnl_open_fd(&m->rtnl, fd);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
||||
@@ -177,7 +177,7 @@ static int manager_rtnl_listen(Manager *m) {
|
||||
assert(m);
|
||||
|
||||
/* First, subscribe to interfaces coming and going */
|
||||
r = sd_rtnl_open(&m->rtnl, 3, RTNLGRP_LINK, RTNLGRP_IPV4_IFADDR, RTNLGRP_IPV6_IFADDR);
|
||||
r = sd_rtnl_open(&m->rtnl);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user