SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-rtnl-message: store reference to the bus in the message

Browse Source 
This mimics the sd-bus api, as we may need it in the future.
This commit is contained in:
Tom Gundersen
2014-02-18 11:21:22 +01:00
parent c0c5af00be
commit 4fb7242cbb
11 changed files with 60 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-address.c
+4 -3
View File
@@ -105,7 +105,8 @@ int address_drop(Address *address, Link *link,
assert(link->manager);
assert(link->manager->rtnl);
r = sd_rtnl_message_new_addr(RTM_DELADDR, link->ifindex, address->family, &req);
r = sd_rtnl_message_new_addr(link->manager->rtnl, RTM_DELADDR,
link->ifindex, address->family, &req);
if (r < 0) {
log_error("Could not allocate RTM_DELADDR message: %s",
strerror(-r));
@@ -149,8 +150,8 @@ int address_configure(Address *address, Link *link,
assert(link->manager);
assert(link->manager->rtnl);
r = sd_rtnl_message_new_addr(RTM_NEWADDR, link->ifindex,
address->family, &req);
r = sd_rtnl_message_new_addr(link->manager->rtnl, RTM_NEWADDR,
link->ifindex, address->family, &req);
if (r < 0) {
log_error("Could not allocate RTM_NEWADDR message: %s",
strerror(-r));
src/network/networkd-link.c
+6 -3
View File
@@ -435,7 +435,8 @@ static int link_set_mtu(Link *link, uint32_t mtu) {
log_debug_link(link, "setting MTU: %" PRIu32, mtu);
r = sd_rtnl_message_new_link(RTM_SETLINK, link->ifindex, &req);
r = sd_rtnl_message_new_link(link->manager->rtnl, RTM_SETLINK,
link->ifindex, &req);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
@@ -794,7 +795,8 @@ static int link_up(Link *link) {
log_debug_link(link, "bringing link up");
r = sd_rtnl_message_new_link(RTM_SETLINK, link->ifindex, &req);
r = sd_rtnl_message_new_link(link->manager->rtnl, RTM_SETLINK,
link->ifindex, &req);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_SETLINK message");
return r;
@@ -961,7 +963,8 @@ static int link_get(Link *link) {
log_debug_link(link, "requesting link status");
r = sd_rtnl_message_new_link(RTM_GETLINK, link->ifindex, &req);
r = sd_rtnl_message_new_link(link->manager->rtnl, RTM_GETLINK,
link->ifindex, &req);
if (r < 0) {
log_error_link(link, "Could not allocate RTM_GETLINK message");
return r;
src/network/networkd-netdev.c
+7 -3
View File
@@ -89,10 +89,13 @@ static int netdev_enslave_ready(NetDev *netdev, Link* link, sd_rtnl_message_hand
assert(netdev);
assert(netdev->state == NETDEV_STATE_READY);
assert(netdev->manager);
assert(netdev->manager->rtnl);
assert(link);
assert(callback);
r = sd_rtnl_message_new_link(RTM_SETLINK, link->ifindex, &req);
r = sd_rtnl_message_new_link(netdev->manager->rtnl, RTM_SETLINK,
link->ifindex, &req);
if (r < 0) {
log_error_netdev(netdev,
"Could not allocate RTM_SETLINK message: %s",
@@ -163,12 +166,13 @@ static int netdev_create(NetDev *netdev, Link *link, sd_rtnl_message_handler_t c
int r;
assert(netdev);
assert(!(netdev->kind == NETDEV_KIND_VLAN) || (link && callback && netdev->vlanid <= VLANID_MAX));
assert(!(netdev->kind == NETDEV_KIND_VLAN) ||
(link && callback && netdev->vlanid <= VLANID_MAX));
assert(netdev->name);
assert(netdev->manager);
assert(netdev->manager->rtnl);
r = sd_rtnl_message_new_link(RTM_NEWLINK, 0, &req);
r = sd_rtnl_message_new_link(netdev->manager->rtnl, RTM_NEWLINK, 0, &req);
if (r < 0) {
log_error_netdev(netdev,
"Could not allocate RTM_NEWLINK message: %s",
src/network/networkd-route.c
+2 -1
View File
@@ -105,7 +105,8 @@ int route_configure(Route *route, Link *link,
assert(link->ifindex > 0);
assert(route->family == AF_INET || route->family == AF_INET6);
r = sd_rtnl_message_new_route(RTM_NEWROUTE, route->family, &req);
r = sd_rtnl_message_new_route(link->manager->rtnl, RTM_NEWROUTE,
route->family, &req);
if (r < 0) {
log_error("Could not create RTM_NEWROUTE message: %s", strerror(-r));
return r;