networkd: netdev - move to separate subdirectory
This could (and should) be made into a separate daemon, at least move the sourcefiles out for now.
This commit is contained in:
Tom Gundersen
+28
-28
@@ -5615,32 +5615,32 @@ libnetworkd_core_la_SOURCES = \
|
||||
src/network/networkd-conf.c \
|
||||
src/network/networkd-link.h \
|
||||
src/network/networkd-link.c \
|
||||
src/network/networkd-netdev.h \
|
||||
src/network/networkd-netdev.c \
|
||||
src/network/networkd-netdev-vrf.h \
|
||||
src/network/networkd-netdev-vrf.c \
|
||||
src/network/networkd-netdev-tunnel.h \
|
||||
src/network/networkd-netdev-tunnel.c \
|
||||
src/network/networkd-netdev-veth.h \
|
||||
src/network/networkd-netdev-veth.c \
|
||||
src/network/networkd-netdev-vxlan.h \
|
||||
src/network/networkd-netdev-vxlan.c \
|
||||
src/network/networkd-netdev-vlan.h \
|
||||
src/network/networkd-netdev-vlan.c \
|
||||
src/network/networkd-netdev-macvlan.h \
|
||||
src/network/networkd-netdev-macvlan.c \
|
||||
src/network/networkd-netdev-ipvlan.h \
|
||||
src/network/networkd-netdev-ipvlan.c \
|
||||
src/network/networkd-netdev-dummy.h \
|
||||
src/network/networkd-netdev-dummy.c \
|
||||
src/network/networkd-netdev-tuntap.h \
|
||||
src/network/networkd-netdev-tuntap.c \
|
||||
src/network/networkd-netdev-bond.h \
|
||||
src/network/networkd-netdev-bond.c \
|
||||
src/network/networkd-netdev-bridge.h \
|
||||
src/network/networkd-netdev-bridge.c \
|
||||
src/network/networkd-netdev-vcan.h \
|
||||
src/network/networkd-netdev-vcan.c \
|
||||
src/network/netdev/netdev.h \
|
||||
src/network/netdev/netdev.c \
|
||||
src/network/netdev/vrf.h \
|
||||
src/network/netdev/vrf.c \
|
||||
src/network/netdev/tunnel.h \
|
||||
src/network/netdev/tunnel.c \
|
||||
src/network/netdev/veth.h \
|
||||
src/network/netdev/veth.c \
|
||||
src/network/netdev/vxlan.h \
|
||||
src/network/netdev/vxlan.c \
|
||||
src/network/netdev/vlan.h \
|
||||
src/network/netdev/vlan.c \
|
||||
src/network/netdev/macvlan.h \
|
||||
src/network/netdev/macvlan.c \
|
||||
src/network/netdev/ipvlan.h \
|
||||
src/network/netdev/ipvlan.c \
|
||||
src/network/netdev/dummy.h \
|
||||
src/network/netdev/dummy.c \
|
||||
src/network/netdev/tuntap.h \
|
||||
src/network/netdev/tuntap.c \
|
||||
src/network/netdev/bond.h \
|
||||
src/network/netdev/bond.c \
|
||||
src/network/netdev/bridge.h \
|
||||
src/network/netdev/bridge.c \
|
||||
src/network/netdev/vcan.h \
|
||||
src/network/netdev/vcan.c \
|
||||
src/network/networkd-link-bus.c \
|
||||
src/network/networkd-ipv4ll.c \
|
||||
src/network/networkd-dhcp4.c \
|
||||
@@ -5670,7 +5670,7 @@ libnetworkd_core_la_SOURCES = \
|
||||
nodist_libnetworkd_core_la_SOURCES = \
|
||||
src/network/networkd-gperf.c \
|
||||
src/network/networkd-network-gperf.c \
|
||||
src/network/networkd-netdev-gperf.c
|
||||
src/network/netdev/netdev-gperf.c
|
||||
|
||||
libnetworkd_core_la_LIBADD = \
|
||||
libsystemd-network.la \
|
||||
@@ -5774,7 +5774,7 @@ endif
|
||||
gperf_gperf_sources += \
|
||||
src/network/networkd-gperf.gperf \
|
||||
src/network/networkd-network-gperf.gperf \
|
||||
src/network/networkd-netdev-gperf.gperf
|
||||
src/network/netdev/netdev-gperf.gperf
|
||||
|
||||
EXTRA_DIST += \
|
||||
units/systemd-networkd.service.m4.in \
|
||||
|
||||
@@ -1,3 +1,2 @@
|
||||
/networkd-network-gperf.c
|
||||
/networkd-netdev-gperf.c
|
||||
/networkd-gperf.c
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/netdev-gperf.c
|
||||
@@ -27,7 +27,7 @@
|
||||
#include "conf-parser.h"
|
||||
#include "extract-word.h"
|
||||
#include "missing.h"
|
||||
#include "networkd-netdev-bond.h"
|
||||
#include "netdev/bond.h"
|
||||
#include "string-table.h"
|
||||
#include "string-util.h"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
#include "in-addr-util.h"
|
||||
#include "list.h"
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
/*
|
||||
* Maximum number of targets supported by the kernel for a single
|
||||
@@ -23,7 +23,7 @@
|
||||
#include "missing.h"
|
||||
#include "netlink-util.h"
|
||||
#include "networkd.h"
|
||||
#include "networkd-netdev-bridge.h"
|
||||
#include "netdev/bridge.h"
|
||||
|
||||
/* callback for brige netdev's parameter set */
|
||||
static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
|
||||
@@ -19,7 +19,7 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
typedef struct Bridge {
|
||||
NetDev meta;
|
||||
@@ -19,7 +19,7 @@
|
||||
***/
|
||||
|
||||
|
||||
#include "networkd-netdev-dummy.h"
|
||||
#include "netdev/dummy.h"
|
||||
|
||||
const NetDevVTable dummy_vtable = {
|
||||
.object_size = sizeof(Dummy),
|
||||
@@ -19,7 +19,7 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
typedef struct Dummy {
|
||||
NetDev meta;
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <net/if.h>
|
||||
|
||||
#include "conf-parser.h"
|
||||
#include "networkd-netdev-ipvlan.h"
|
||||
#include "netdev/ipvlan.h"
|
||||
#include "string-table.h"
|
||||
|
||||
static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {
|
||||
@@ -20,7 +20,7 @@
|
||||
***/
|
||||
|
||||
#include "missing.h"
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
typedef enum IPVlanMode {
|
||||
NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2,
|
||||
@@ -20,7 +20,7 @@
|
||||
#include <net/if.h>
|
||||
|
||||
#include "conf-parser.h"
|
||||
#include "networkd-netdev-macvlan.h"
|
||||
#include "netdev/macvlan.h"
|
||||
#include "string-table.h"
|
||||
|
||||
static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
typedef struct MacVlan MacVlan;
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
typedef enum MacVlanMode {
|
||||
NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE,
|
||||
@@ -2,17 +2,17 @@
|
||||
#include <stddef.h>
|
||||
#include "conf-parser.h"
|
||||
#include "network-internal.h"
|
||||
#include "networkd-netdev-bond.h"
|
||||
#include "networkd-netdev-bridge.h"
|
||||
#include "networkd-netdev-ipvlan.h"
|
||||
#include "networkd-netdev-macvlan.h"
|
||||
#include "networkd-netdev-tunnel.h"
|
||||
#include "networkd-netdev-tuntap.h"
|
||||
#include "networkd-netdev-veth.h"
|
||||
#include "networkd-netdev-vlan.h"
|
||||
#include "networkd-netdev-vxlan.h"
|
||||
#include "networkd-netdev-vrf.h"
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/bond.h"
|
||||
#include "netdev/bridge.h"
|
||||
#include "netdev/ipvlan.h"
|
||||
#include "netdev/macvlan.h"
|
||||
#include "netdev/tunnel.h"
|
||||
#include "netdev/tuntap.h"
|
||||
#include "netdev/veth.h"
|
||||
#include "netdev/vlan.h"
|
||||
#include "netdev/vxlan.h"
|
||||
#include "netdev/vrf.h"
|
||||
#include "netdev/netdev.h"
|
||||
#include "vlan-util.h"
|
||||
%}
|
||||
struct ConfigPerfItem;
|
||||
@@ -26,7 +26,7 @@
|
||||
#include "list.h"
|
||||
#include "netlink-util.h"
|
||||
#include "network-internal.h"
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
#include "networkd.h"
|
||||
#include "siphash24.h"
|
||||
#include "stat-util.h"
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "conf-parser.h"
|
||||
#include "missing.h"
|
||||
#include "networkd-link.h"
|
||||
#include "networkd-netdev-tunnel.h"
|
||||
#include "netdev/tunnel.h"
|
||||
#include "parse-util.h"
|
||||
#include "string-table.h"
|
||||
#include "string-util.h"
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "in-addr-util.h"
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
typedef enum Ip6TnlMode {
|
||||
NETDEV_IP6_TNL_MODE_IP6IP6,
|
||||
@@ -27,7 +27,7 @@
|
||||
|
||||
#include "alloc-util.h"
|
||||
#include "fd-util.h"
|
||||
#include "networkd-netdev-tuntap.h"
|
||||
#include "netdev/tuntap.h"
|
||||
#include "user-util.h"
|
||||
|
||||
#define TUN_DEV "/dev/net/tun"
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
typedef struct TunTap TunTap;
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
struct TunTap {
|
||||
NetDev meta;
|
||||
@@ -17,7 +17,7 @@
|
||||
along with systemd; If not, see <http://www.gnu.org/licenses/>.
|
||||
***/
|
||||
|
||||
#include "networkd-netdev-vcan.h"
|
||||
#include "netdev/vcan.h"
|
||||
|
||||
const NetDevVTable vcan_vtable = {
|
||||
.object_size = sizeof(VCan),
|
||||
@@ -23,7 +23,7 @@ typedef struct VCan VCan;
|
||||
|
||||
#include <linux/can/netlink.h>
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
struct VCan {
|
||||
NetDev meta;
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
#include "sd-netlink.h"
|
||||
|
||||
#include "networkd-netdev-veth.h"
|
||||
#include "netdev/veth.h"
|
||||
|
||||
static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
|
||||
Veth *v;
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
typedef struct Veth Veth;
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
struct Veth {
|
||||
NetDev meta;
|
||||
@@ -19,7 +19,7 @@
|
||||
|
||||
#include <net/if.h>
|
||||
|
||||
#include "networkd-netdev-vlan.h"
|
||||
#include "netdev/vlan.h"
|
||||
#include "vlan-util.h"
|
||||
|
||||
static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) {
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
typedef struct VLan VLan;
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
struct VLan {
|
||||
NetDev meta;
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
#include "sd-netlink.h"
|
||||
#include "missing.h"
|
||||
#include "networkd-netdev-vrf.h"
|
||||
#include "netdev/vrf.h"
|
||||
|
||||
static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
|
||||
Vrf *v;
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
typedef struct Vrf Vrf;
|
||||
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
struct Vrf {
|
||||
NetDev meta;
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "missing.h"
|
||||
|
||||
#include "networkd-link.h"
|
||||
#include "networkd-netdev-vxlan.h"
|
||||
#include "netdev/vxlan.h"
|
||||
|
||||
static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
|
||||
VxLan *v;
|
||||
@@ -22,7 +22,7 @@
|
||||
typedef struct VxLan VxLan;
|
||||
|
||||
#include "in-addr-util.h"
|
||||
#include "networkd-netdev.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
#define VXLAN_VID_MAX (1u << 24) - 1
|
||||
|
||||
@@ -31,9 +31,9 @@
|
||||
#include "networkd-brvlan.h"
|
||||
#include "networkd-fdb.h"
|
||||
#include "networkd-lldp-tx.h"
|
||||
#include "networkd-netdev.h"
|
||||
#include "networkd-route.h"
|
||||
#include "networkd-util.h"
|
||||
#include "netdev/netdev.h"
|
||||
|
||||
#define DHCP_ROUTE_METRIC 1024
|
||||
#define IPV4LL_ROUTE_METRIC 2048
|
||||
|
||||
+12
-12
@@ -32,18 +32,18 @@
|
||||
|
||||
#include "networkd-address-pool.h"
|
||||
#include "networkd-link.h"
|
||||
#include "networkd-netdev-bond.h"
|
||||
#include "networkd-netdev-bridge.h"
|
||||
#include "networkd-netdev-dummy.h"
|
||||
#include "networkd-netdev-ipvlan.h"
|
||||
#include "networkd-netdev-macvlan.h"
|
||||
#include "networkd-netdev-tunnel.h"
|
||||
#include "networkd-netdev-tuntap.h"
|
||||
#include "networkd-netdev-veth.h"
|
||||
#include "networkd-netdev-vlan.h"
|
||||
#include "networkd-netdev-vrf.h"
|
||||
#include "networkd-netdev-vxlan.h"
|
||||
#include "networkd-netdev-vcan.h"
|
||||
#include "netdev/bond.h"
|
||||
#include "netdev/bridge.h"
|
||||
#include "netdev/dummy.h"
|
||||
#include "netdev/ipvlan.h"
|
||||
#include "netdev/macvlan.h"
|
||||
#include "netdev/tunnel.h"
|
||||
#include "netdev/tuntap.h"
|
||||
#include "netdev/veth.h"
|
||||
#include "netdev/vlan.h"
|
||||
#include "netdev/vrf.h"
|
||||
#include "netdev/vxlan.h"
|
||||
#include "netdev/vcan.h"
|
||||
#include "networkd-network.h"
|
||||
#include "networkd-util.h"
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
#include "dhcp6-protocol.h"
|
||||
#include "ethtool-util.h"
|
||||
#include "netlink-internal.h"
|
||||
#include "networkd-netdev-bond.h"
|
||||
#include "networkd-netdev-macvlan.h"
|
||||
#include "netdev/bond.h"
|
||||
#include "netdev/macvlan.h"
|
||||
#include "networkd.h"
|
||||
#include "test-tables.h"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user