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

networkd: netdev - move to separate subdirectory

Browse source 
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 2016-11-13 02:01:19 +01:00
parent c5fcf6e470
commit 441e9ae4d9
33 changed files with 80 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
Makefile.am
View file

@ -5615,32 +5615,32 @@ libnetworkd_core_la_SOURCES = \
src/network/networkd-conf.c \ src/network/networkd-conf.c \
src/network/networkd-link.h \ src/network/networkd-link.h \
src/network/networkd-link.c \ src/network/networkd-link.c \
src/network/networkd-netdev.h \ src/network/netdev/netdev.h \
src/network/networkd-netdev.c \ src/network/netdev/netdev.c \
src/network/networkd-netdev-vrf.h \ src/network/netdev/vrf.h \
src/network/networkd-netdev-vrf.c \ src/network/netdev/vrf.c \
src/network/networkd-netdev-tunnel.h \ src/network/netdev/tunnel.h \
src/network/networkd-netdev-tunnel.c \ src/network/netdev/tunnel.c \
src/network/networkd-netdev-veth.h \ src/network/netdev/veth.h \
src/network/networkd-netdev-veth.c \ src/network/netdev/veth.c \
src/network/networkd-netdev-vxlan.h \ src/network/netdev/vxlan.h \
src/network/networkd-netdev-vxlan.c \ src/network/netdev/vxlan.c \
src/network/networkd-netdev-vlan.h \ src/network/netdev/vlan.h \
src/network/networkd-netdev-vlan.c \ src/network/netdev/vlan.c \
src/network/networkd-netdev-macvlan.h \ src/network/netdev/macvlan.h \
src/network/networkd-netdev-macvlan.c \ src/network/netdev/macvlan.c \
src/network/networkd-netdev-ipvlan.h \ src/network/netdev/ipvlan.h \
src/network/networkd-netdev-ipvlan.c \ src/network/netdev/ipvlan.c \
src/network/networkd-netdev-dummy.h \ src/network/netdev/dummy.h \
src/network/networkd-netdev-dummy.c \ src/network/netdev/dummy.c \
src/network/networkd-netdev-tuntap.h \ src/network/netdev/tuntap.h \
src/network/networkd-netdev-tuntap.c \ src/network/netdev/tuntap.c \
src/network/networkd-netdev-bond.h \ src/network/netdev/bond.h \
src/network/networkd-netdev-bond.c \ src/network/netdev/bond.c \
src/network/networkd-netdev-bridge.h \ src/network/netdev/bridge.h \
src/network/networkd-netdev-bridge.c \ src/network/netdev/bridge.c \
src/network/networkd-netdev-vcan.h \ src/network/netdev/vcan.h \
src/network/networkd-netdev-vcan.c \ src/network/netdev/vcan.c \
src/network/networkd-link-bus.c \ src/network/networkd-link-bus.c \
src/network/networkd-ipv4ll.c \ src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \ src/network/networkd-dhcp4.c \
@ -5670,7 +5670,7 @@ libnetworkd_core_la_SOURCES = \
nodist_libnetworkd_core_la_SOURCES = \ nodist_libnetworkd_core_la_SOURCES = \
src/network/networkd-gperf.c \ src/network/networkd-gperf.c \
src/network/networkd-network-gperf.c \ src/network/networkd-network-gperf.c \
src/network/networkd-netdev-gperf.c src/network/netdev/netdev-gperf.c
libnetworkd_core_la_LIBADD = \ libnetworkd_core_la_LIBADD = \
libsystemd-network.la \ libsystemd-network.la \
@ -5774,7 +5774,7 @@ endif
gperf_gperf_sources += \ gperf_gperf_sources += \
src/network/networkd-gperf.gperf \ src/network/networkd-gperf.gperf \
src/network/networkd-network-gperf.gperf \ src/network/networkd-network-gperf.gperf \
src/network/networkd-netdev-gperf.gperf src/network/netdev/netdev-gperf.gperf
EXTRA_DIST += \ EXTRA_DIST += \
units/systemd-networkd.service.m4.in \ units/systemd-networkd.service.m4.in \

1
src/network/.gitignore vendored
View file

@ -1,3 +1,2 @@
/networkd-network-gperf.c /networkd-network-gperf.c
/networkd-netdev-gperf.c
/networkd-gperf.c /networkd-gperf.c

1
src/network/netdev/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/netdev-gperf.c

2
src/network/networkd-netdev-bond.c → src/network/netdev/bond.c
View file

@ -27,7 +27,7 @@
#include "conf-parser.h" #include "conf-parser.h"
#include "extract-word.h" #include "extract-word.h"
#include "missing.h" #include "missing.h"
#include "networkd-netdev-bond.h" #include "netdev/bond.h"
#include "string-table.h" #include "string-table.h"
#include "string-util.h" #include "string-util.h"

2
src/network/networkd-netdev-bond.h → src/network/netdev/bond.h
View file

@ -22,7 +22,7 @@
#include "in-addr-util.h" #include "in-addr-util.h"
#include "list.h" #include "list.h"
#include "networkd-netdev.h" #include "netdev/netdev.h"
/* /*
* Maximum number of targets supported by the kernel for a single * Maximum number of targets supported by the kernel for a single

2
src/network/networkd-netdev-bridge.c → src/network/netdev/bridge.c
View file

@ -23,7 +23,7 @@
#include "missing.h" #include "missing.h"
#include "netlink-util.h" #include "netlink-util.h"
#include "networkd.h" #include "networkd.h"
#include "networkd-netdev-bridge.h" #include "netdev/bridge.h"
/* callback for brige netdev's parameter set */ /* callback for brige netdev's parameter set */
static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) { static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {

2
src/network/networkd-netdev-bridge.h → src/network/netdev/bridge.h
View file

@ -19,7 +19,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include "networkd-netdev.h" #include "netdev/netdev.h"
typedef struct Bridge { typedef struct Bridge {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-dummy.c → src/network/netdev/dummy.c
View file

@ -19,7 +19,7 @@
***/ ***/
#include "networkd-netdev-dummy.h" #include "netdev/dummy.h"
const NetDevVTable dummy_vtable = { const NetDevVTable dummy_vtable = {
.object_size = sizeof(Dummy), .object_size = sizeof(Dummy),

2
src/network/networkd-netdev-dummy.h → src/network/netdev/dummy.h
View file

@ -19,7 +19,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include "networkd-netdev.h" #include "netdev/netdev.h"
typedef struct Dummy { typedef struct Dummy {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-ipvlan.c → src/network/netdev/ipvlan.c
View file

@ -20,7 +20,7 @@
#include <net/if.h> #include <net/if.h>
#include "conf-parser.h" #include "conf-parser.h"
#include "networkd-netdev-ipvlan.h" #include "netdev/ipvlan.h"
#include "string-table.h" #include "string-table.h"
static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = { static const char* const ipvlan_mode_table[_NETDEV_IPVLAN_MODE_MAX] = {

2
src/network/networkd-netdev-ipvlan.h → src/network/netdev/ipvlan.h
View file

@ -20,7 +20,7 @@
***/ ***/
#include "missing.h" #include "missing.h"
#include "networkd-netdev.h" #include "netdev/netdev.h"
typedef enum IPVlanMode { typedef enum IPVlanMode {
NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2, NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2,

2
src/network/networkd-netdev-macvlan.c → src/network/netdev/macvlan.c
View file

@ -20,7 +20,7 @@
#include <net/if.h> #include <net/if.h>
#include "conf-parser.h" #include "conf-parser.h"
#include "networkd-netdev-macvlan.h" #include "netdev/macvlan.h"
#include "string-table.h" #include "string-table.h"
static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = { static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = {

2
src/network/networkd-netdev-macvlan.h → src/network/netdev/macvlan.h
View file

@ -21,7 +21,7 @@
typedef struct MacVlan MacVlan; typedef struct MacVlan MacVlan;
#include "networkd-netdev.h" #include "netdev/netdev.h"
typedef enum MacVlanMode { typedef enum MacVlanMode {
NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE, NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE,

22
src/network/networkd-netdev-gperf.gperf → src/network/netdev/netdev-gperf.gperf
View file

@ -2,17 +2,17 @@
#include <stddef.h> #include <stddef.h>
#include "conf-parser.h" #include "conf-parser.h"
#include "network-internal.h" #include "network-internal.h"
#include "networkd-netdev-bond.h" #include "netdev/bond.h"
#include "networkd-netdev-bridge.h" #include "netdev/bridge.h"
#include "networkd-netdev-ipvlan.h" #include "netdev/ipvlan.h"
#include "networkd-netdev-macvlan.h" #include "netdev/macvlan.h"
#include "networkd-netdev-tunnel.h" #include "netdev/tunnel.h"
#include "networkd-netdev-tuntap.h" #include "netdev/tuntap.h"
#include "networkd-netdev-veth.h" #include "netdev/veth.h"
#include "networkd-netdev-vlan.h" #include "netdev/vlan.h"
#include "networkd-netdev-vxlan.h" #include "netdev/vxlan.h"
#include "networkd-netdev-vrf.h" #include "netdev/vrf.h"
#include "networkd-netdev.h" #include "netdev/netdev.h"
#include "vlan-util.h" #include "vlan-util.h"
%} %}
struct ConfigPerfItem; struct ConfigPerfItem;

2
src/network/networkd-netdev.c → src/network/netdev/netdev.c
View file

@ -26,7 +26,7 @@
#include "list.h" #include "list.h"
#include "netlink-util.h" #include "netlink-util.h"
#include "network-internal.h" #include "network-internal.h"
#include "networkd-netdev.h" #include "netdev/netdev.h"
#include "networkd.h" #include "networkd.h"
#include "siphash24.h" #include "siphash24.h"
#include "stat-util.h" #include "stat-util.h"

0
src/network/networkd-netdev.h → src/network/netdev/netdev.h
View file

2
src/network/networkd-netdev-tunnel.c → src/network/netdev/tunnel.c
View file

@ -28,7 +28,7 @@
#include "conf-parser.h" #include "conf-parser.h"
#include "missing.h" #include "missing.h"
#include "networkd-link.h" #include "networkd-link.h"
#include "networkd-netdev-tunnel.h" #include "netdev/tunnel.h"
#include "parse-util.h" #include "parse-util.h"
#include "string-table.h" #include "string-table.h"
#include "string-util.h" #include "string-util.h"

2
src/network/networkd-netdev-tunnel.h → src/network/netdev/tunnel.h
View file

@ -21,7 +21,7 @@
#include "in-addr-util.h" #include "in-addr-util.h"
#include "networkd-netdev.h" #include "netdev/netdev.h"
typedef enum Ip6TnlMode { typedef enum Ip6TnlMode {
NETDEV_IP6_TNL_MODE_IP6IP6, NETDEV_IP6_TNL_MODE_IP6IP6,

2
src/network/networkd-netdev-tuntap.c → src/network/netdev/tuntap.c
View file

@ -27,7 +27,7 @@
#include "alloc-util.h" #include "alloc-util.h"
#include "fd-util.h" #include "fd-util.h"
#include "networkd-netdev-tuntap.h" #include "netdev/tuntap.h"
#include "user-util.h" #include "user-util.h"
#define TUN_DEV "/dev/net/tun" #define TUN_DEV "/dev/net/tun"

2
src/network/networkd-netdev-tuntap.h → src/network/netdev/tuntap.h
View file

@ -21,7 +21,7 @@
typedef struct TunTap TunTap; typedef struct TunTap TunTap;
#include "networkd-netdev.h" #include "netdev/netdev.h"
struct TunTap { struct TunTap {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-vcan.c → src/network/netdev/vcan.c
View file

@ -17,7 +17,7 @@
along with systemd; If not, see <http://www.gnu.org/licenses/>. along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/ ***/
#include "networkd-netdev-vcan.h" #include "netdev/vcan.h"
const NetDevVTable vcan_vtable = { const NetDevVTable vcan_vtable = {
.object_size = sizeof(VCan), .object_size = sizeof(VCan),

2
src/network/networkd-netdev-vcan.h → src/network/netdev/vcan.h
View file

@ -23,7 +23,7 @@ typedef struct VCan VCan;
#include <linux/can/netlink.h> #include <linux/can/netlink.h>
#include "networkd-netdev.h" #include "netdev/netdev.h"
struct VCan { struct VCan {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-veth.c → src/network/netdev/veth.c
View file

@ -22,7 +22,7 @@
#include "sd-netlink.h" #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) { static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
Veth *v; Veth *v;

2
src/network/networkd-netdev-veth.h → src/network/netdev/veth.h
View file

@ -21,7 +21,7 @@
typedef struct Veth Veth; typedef struct Veth Veth;
#include "networkd-netdev.h" #include "netdev/netdev.h"
struct Veth { struct Veth {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-vlan.c → src/network/netdev/vlan.c
View file

@ -19,7 +19,7 @@
#include <net/if.h> #include <net/if.h>
#include "networkd-netdev-vlan.h" #include "netdev/vlan.h"
#include "vlan-util.h" #include "vlan-util.h"
static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) { static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) {

2
src/network/networkd-netdev-vlan.h → src/network/netdev/vlan.h
View file

@ -21,7 +21,7 @@
typedef struct VLan VLan; typedef struct VLan VLan;
#include "networkd-netdev.h" #include "netdev/netdev.h"
struct VLan { struct VLan {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-vrf.c → src/network/netdev/vrf.c
View file

@ -21,7 +21,7 @@
#include "sd-netlink.h" #include "sd-netlink.h"
#include "missing.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) { static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
Vrf *v; Vrf *v;

2
src/network/networkd-netdev-vrf.h → src/network/netdev/vrf.h
View file

@ -21,7 +21,7 @@
typedef struct Vrf Vrf; typedef struct Vrf Vrf;
#include "networkd-netdev.h" #include "netdev/netdev.h"
struct Vrf { struct Vrf {
NetDev meta; NetDev meta;

2
src/network/networkd-netdev-vxlan.c → src/network/netdev/vxlan.c
View file

@ -28,7 +28,7 @@
#include "missing.h" #include "missing.h"
#include "networkd-link.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) { static int netdev_vxlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
VxLan *v; VxLan *v;

2
src/network/networkd-netdev-vxlan.h → src/network/netdev/vxlan.h
View file

@ -22,7 +22,7 @@
typedef struct VxLan VxLan; typedef struct VxLan VxLan;
#include "in-addr-util.h" #include "in-addr-util.h"
#include "networkd-netdev.h" #include "netdev/netdev.h"
#define VXLAN_VID_MAX (1u << 24) - 1 #define VXLAN_VID_MAX (1u << 24) - 1

2
src/network/networkd-network.h
View file

@ -31,9 +31,9 @@
#include "networkd-brvlan.h" #include "networkd-brvlan.h"
#include "networkd-fdb.h" #include "networkd-fdb.h"
#include "networkd-lldp-tx.h" #include "networkd-lldp-tx.h"
#include "networkd-netdev.h"
#include "networkd-route.h" #include "networkd-route.h"
#include "networkd-util.h" #include "networkd-util.h"
#include "netdev/netdev.h"
#define DHCP_ROUTE_METRIC 1024 #define DHCP_ROUTE_METRIC 1024
#define IPV4LL_ROUTE_METRIC 2048 #define IPV4LL_ROUTE_METRIC 2048

24
src/network/networkd.h
View file

@ -32,18 +32,18 @@
#include "networkd-address-pool.h" #include "networkd-address-pool.h"
#include "networkd-link.h" #include "networkd-link.h"
#include "networkd-netdev-bond.h" #include "netdev/bond.h"
#include "networkd-netdev-bridge.h" #include "netdev/bridge.h"
#include "networkd-netdev-dummy.h" #include "netdev/dummy.h"
#include "networkd-netdev-ipvlan.h" #include "netdev/ipvlan.h"
#include "networkd-netdev-macvlan.h" #include "netdev/macvlan.h"
#include "networkd-netdev-tunnel.h" #include "netdev/tunnel.h"
#include "networkd-netdev-tuntap.h" #include "netdev/tuntap.h"
#include "networkd-netdev-veth.h" #include "netdev/veth.h"
#include "networkd-netdev-vlan.h" #include "netdev/vlan.h"
#include "networkd-netdev-vrf.h" #include "netdev/vrf.h"
#include "networkd-netdev-vxlan.h" #include "netdev/vxlan.h"
#include "networkd-netdev-vcan.h" #include "netdev/vcan.h"
#include "networkd-network.h" #include "networkd-network.h"
#include "networkd-util.h" #include "networkd-util.h"

4
src/network/test-network-tables.c
View file

@ -2,8 +2,8 @@
#include "dhcp6-protocol.h" #include "dhcp6-protocol.h"
#include "ethtool-util.h" #include "ethtool-util.h"
#include "netlink-internal.h" #include "netlink-internal.h"
#include "networkd-netdev-bond.h" #include "netdev/bond.h"
#include "networkd-netdev-macvlan.h" #include "netdev/macvlan.h"
#include "networkd.h" #include "networkd.h"
#include "test-tables.h" #include "test-tables.h"