picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

networkd: netdev - split out bridge creation

This commit is contained in:
Tom Gundersen 2014-07-05 15:00:59 +02:00
parent 3f26503776
commit 6235b3def8
4 changed files with 119 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -4600,6 +4600,7 @@ libsystemd_networkd_core_la_SOURCES = \
src/network/networkd-dummy.c \
src/network/networkd-tuntap.c \
src/network/networkd-bond.c \
src/network/networkd-bridge.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \

116
src/network/networkd-bridge.c Normal file
View File

@ -0,0 +1,116 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
Copyright 2014 Tom Gundersen <teg@jklm.no>
Copyright 2014 Susant Sahani
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include <netinet/ether.h>
#include <arpa/inet.h>
#include <net/if.h>
#include "sd-rtnl.h"
#include "networkd.h"
#include "missing.h"
static int netdev_fill_bridge_rtnl_message(NetDev *netdev, sd_rtnl_message *m) {
int r;
assert(m);
r = sd_rtnl_message_append_string(m, IFLA_IFNAME, netdev->ifname);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_IFNAME, attribute: %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_open_container(m, IFLA_LINKINFO);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_LINKINFO attribute: %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA,
netdev_kind_to_string(netdev->kind));
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_INFO_DATA attribute: %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_LINKINFO attribute: %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_close_container(m);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_LINKINFO attribute: %s",
strerror(-r));
return r;
}
return r;
}
int netdev_create_bridge(NetDev *netdev, sd_rtnl_message_handler_t callback) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL;
int r;
assert(netdev);
assert(netdev->kind == NETDEV_KIND_BRIDGE);
assert(netdev->ifname);
assert(netdev->manager);
assert(netdev->manager->rtnl);
r = sd_rtnl_message_new_link(netdev->manager->rtnl, &m, RTM_NEWLINK, 0);
if (r < 0) {
log_error_netdev(netdev,
"Could not allocate RTM_NEWLINK message: %s",
strerror(-r));
return r;
}
r = netdev_fill_bridge_rtnl_message(netdev, m);
if(r < 0)
return r;
r = sd_rtnl_call_async(netdev->manager->rtnl, m, callback, netdev, 0, NULL);
if (r < 0) {
log_error_netdev(netdev,
"Could not send rtnetlink message: %s", strerror(-r));
return r;
}
netdev_ref(netdev);
log_debug_netdev(netdev, "Creating bridge netdev.");
netdev->state = NETDEV_STATE_CREATING;
return 0;
}

102
src/network/networkd-netdev.c
View File

@ -246,106 +246,6 @@ static int netdev_create_handler(sd_rtnl *rtnl, sd_rtnl_message *m, void *userda
return 1;
}
static int netdev_create(NetDev *netdev) {
_cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL;
const char *kind;
int r;
assert(netdev);
assert(netdev->ifname);
assert(netdev->manager);
assert(netdev->manager->rtnl);
r = sd_rtnl_message_new_link(netdev->manager->rtnl, &req, RTM_NEWLINK, 0);
if (r < 0) {
log_error_netdev(netdev,
"Could not allocate RTM_NEWLINK message: %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_append_string(req, IFLA_IFNAME, netdev->ifname);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_IFNAME attribute: %s",
strerror(-r));
return r;
}
if (netdev->mtu) {
r = sd_rtnl_message_append_u32(req, IFLA_MTU, netdev->mtu);
if (r < 0) {
log_error_netdev(netdev,
"Could not append IFLA_MTU attribute: %s",
strerror(-r));
return r;
}
}
if (netdev->mac) {
r = sd_rtnl_message_append_ether_addr(req, IFLA_ADDRESS, netdev->mac);
if (r < 0) {
log_error_netdev(netdev,
"Colud not append IFLA_ADDRESS attribute: %s",
strerror(-r));
return r;
}
}
r = sd_rtnl_message_open_container(req, IFLA_LINKINFO);
if (r < 0) {
log_error_netdev(netdev,
"Could not open IFLA_LINKINFO container: %s",
strerror(-r));
return r;
}
kind = netdev_kind_to_string(netdev->kind);
if (!kind) {
log_error_netdev(netdev, "Invalid kind");
return -EINVAL;
}
r = sd_rtnl_message_open_container_union(req, IFLA_INFO_DATA, kind);
if (r < 0) {
log_error_netdev(netdev,
"Could not open IFLA_INFO_DATA container: %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_close_container(req);
if (r < 0) {
log_error_netdev(netdev,
"Could not close IFLA_INFO_DATA container %s",
strerror(-r));
return r;
}
r = sd_rtnl_message_close_container(req);
if (r < 0) {
log_error_netdev(netdev,
"Could not close IFLA_LINKINFO container %s",
strerror(-r));
return r;
}
r = sd_rtnl_call_async(netdev->manager->rtnl, req, &netdev_create_handler, netdev, 0, NULL);
if (r < 0) {
log_error_netdev(netdev,
"Could not send rtnetlink message: %s", strerror(-r));
return r;
}
netdev_ref(netdev);
log_debug_netdev(netdev, "creating netdev");
netdev->state = NETDEV_STATE_CREATING;
return 0;
}
static int netdev_enslave(NetDev *netdev, Link *link, sd_rtnl_message_handler_t callback) {
int r;
@ -710,7 +610,7 @@ static int netdev_load_one(Manager *manager, const char *filename) {
break;
case NETDEV_KIND_BRIDGE:
r = netdev_create(netdev);
r = netdev_create_bridge(netdev, netdev_create_handler);
if (r < 0)
return r;
break;

1
src/network/networkd.h
View File

@ -387,6 +387,7 @@ int netdev_create_macvlan(NetDev *netdev, Link *link, sd_rtnl_message_handler_t
int netdev_create_dummy(NetDev *netdev, sd_rtnl_message_handler_t callback);
int netdev_create_tuntap(NetDev *netdev);
int netdev_create_bond(NetDev *netdev, sd_rtnl_message_handler_t callback);
int netdev_create_bridge(NetDev *netdev, sd_rtnl_message_handler_t callback);
const char *netdev_kind_to_string(NetDevKind d) _const_;