From 737f14054649db6bec5d73108db0675fe3fec3d1 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 30 Oct 2019 17:02:15 +0900 Subject: [PATCH] network: cleanup header inclusion --- meson.build | 2 +- src/network/meson.build | 21 ++++++----- src/network/netdev/bond.c | 2 -- src/network/netdev/bridge.c | 2 +- src/network/netdev/dummy.c | 2 +- src/network/netdev/dummy.h | 2 +- src/network/netdev/fou-tunnel.c | 4 +-- src/network/netdev/fou-tunnel.h | 2 +- src/network/netdev/geneve.c | 6 ++-- src/network/netdev/geneve.h | 1 - src/network/netdev/ipvlan.c | 2 +- src/network/netdev/ipvlan.h | 2 +- src/network/netdev/l2tp-tunnel.c | 2 -- src/network/netdev/macsec.c | 1 - src/network/netdev/macvlan.c | 2 +- src/network/netdev/macvlan.h | 2 +- src/network/netdev/netdev-gperf.gperf | 38 ++++++++++---------- src/network/netdev/netdev.c | 45 ++++++++++++------------ src/network/netdev/netdev.h | 2 +- src/network/netdev/netdevsim.c | 2 +- src/network/netdev/netdevsim.h | 2 +- src/network/netdev/nlmon.c | 2 +- src/network/netdev/nlmon.h | 2 +- src/network/netdev/tunnel.c | 5 +-- src/network/netdev/tunnel.h | 4 +-- src/network/netdev/tuntap.c | 2 +- src/network/netdev/tuntap.h | 2 +- src/network/netdev/vcan.c | 2 +- src/network/netdev/vcan.h | 2 +- src/network/netdev/veth.c | 4 +-- src/network/netdev/veth.h | 2 +- src/network/netdev/vlan.c | 2 +- src/network/netdev/vlan.h | 2 +- src/network/netdev/vrf.c | 3 +- src/network/netdev/vrf.h | 2 +- src/network/netdev/vxcan.c | 2 +- src/network/netdev/vxcan.h | 2 +- src/network/netdev/vxlan.c | 6 +--- src/network/netdev/vxlan.h | 2 +- src/network/netdev/wireguard.c | 1 - src/network/netdev/xfrm.c | 2 +- src/network/netdev/xfrm.h | 2 +- src/network/networkd-fdb.c | 4 +-- src/network/networkd-link.c | 10 +++--- src/network/networkd-network-gperf.gperf | 4 +-- src/network/networkd-network.h | 6 ++-- src/network/tc/netem.h | 8 ++--- src/network/tc/qdisc.h | 11 +++--- src/network/test-network-tables.c | 8 ++--- 49 files changed, 114 insertions(+), 134 deletions(-) diff --git a/meson.build b/meson.build index a7a92225829..56b7bfea704 100644 --- a/meson.build +++ b/meson.build @@ -2704,7 +2704,7 @@ public_programs += exe if conf.get('ENABLE_NETWORKD') == 1 executable('systemd-networkd', systemd_networkd_sources, - include_directories : includes, + include_directories : network_include_dir, link_with : [libnetworkd_core, libsystemd_network, libudev_static, diff --git a/src/network/meson.build b/src/network/meson.build index 06b6ec64a27..d502279151c 100644 --- a/src/network/meson.build +++ b/src/network/meson.build @@ -131,7 +131,7 @@ network_generator_sources = files(''' generator/network-generator.h '''.split()) -network_include_dir = include_directories('.') +network_include_dir = [includes, include_directories(['.', 'netdev', 'tc'])] if conf.get('ENABLE_NETWORKD') == 1 networkd_gperf_c = custom_target( @@ -159,7 +159,7 @@ if conf.get('ENABLE_NETWORKD') == 1 networkd_gperf_c, networkd_network_gperf_c, netdev_gperf_c, - include_directories : includes, + include_directories : network_include_dir, link_with : [libshared]) install_data('org.freedesktop.network1.conf', @@ -187,7 +187,9 @@ if conf.get('ENABLE_NETWORKD') == 1 libudev_static, libsystemd_network, libshared], - [threads]], + [threads], + [], + network_include_dir], [['src/network/fuzz-network-parser.c', 'src/fuzz/fuzz.h'], @@ -195,7 +197,9 @@ if conf.get('ENABLE_NETWORKD') == 1 libudev_static, libsystemd_network, libshared], - [threads]] + [threads], + [], + network_include_dir], ] tests += [ @@ -203,20 +207,21 @@ if conf.get('ENABLE_NETWORKD') == 1 [libnetworkd_core, libsystemd_network, libudev], - []], + [], '', '', [], network_include_dir], [['src/network/test-network.c'], [libnetworkd_core, libudev_static, libsystemd_network, libshared], - [threads]], + [threads], + '', '', [], network_include_dir], [['src/network/test-routing-policy-rule.c'], [libnetworkd_core, libsystemd_network, libudev], - []], + [], '', '', [], network_include_dir], [['src/network/test-network-tables.c', test_tables_h], @@ -233,6 +238,6 @@ if conf.get('ENABLE_NETWORKD') == 1 'src/network/generator/network-generator.c', 'src/network/generator/network-generator.h'], [libshared], - []], + [], '', '', [], network_include_dir], ] endif diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c index a85c9e33ec2..185b155440e 100644 --- a/src/network/netdev/bond.c +++ b/src/network/netdev/bond.c @@ -1,7 +1,5 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include "sd-netlink.h" - #include "alloc-util.h" #include "bond.h" #include "conf-parser.h" diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c index 011c2c3040f..fc9d6c2352c 100644 --- a/src/network/netdev/bridge.c +++ b/src/network/netdev/bridge.c @@ -2,9 +2,9 @@ #include +#include "bridge.h" #include "missing.h" #include "netlink-util.h" -#include "netdev/bridge.h" #include "network-internal.h" #include "networkd-manager.h" #include "string-table.h" diff --git a/src/network/netdev/dummy.c b/src/network/netdev/dummy.c index 091a54ff39e..23c733cbe7b 100644 --- a/src/network/netdev/dummy.c +++ b/src/network/netdev/dummy.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include "netdev/dummy.h" +#include "dummy.h" const NetDevVTable dummy_vtable = { .object_size = sizeof(Dummy), diff --git a/src/network/netdev/dummy.h b/src/network/netdev/dummy.h index 93e0651f7d7..f935414772b 100644 --- a/src/network/netdev/dummy.h +++ b/src/network/netdev/dummy.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #pragma once -#include "netdev/netdev.h" +#include "netdev.h" typedef struct Dummy { NetDev meta; diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c index 772f3db5e7b..4db5caa0f24 100644 --- a/src/network/netdev/fou-tunnel.c +++ b/src/network/netdev/fou-tunnel.c @@ -6,14 +6,12 @@ #include #include "conf-parser.h" +#include "fou-tunnel.h" #include "ip-protocol-list.h" #include "missing.h" -#include "netdev/fou-tunnel.h" #include "netlink-util.h" -#include "networkd-link.h" #include "networkd-manager.h" #include "parse-util.h" -#include "sd-netlink.h" #include "string-table.h" #include "string-util.h" #include "util.h" diff --git a/src/network/netdev/fou-tunnel.h b/src/network/netdev/fou-tunnel.h index 6304e6b5492..caa3b7600e2 100644 --- a/src/network/netdev/fou-tunnel.h +++ b/src/network/netdev/fou-tunnel.h @@ -5,7 +5,7 @@ #include #include "in-addr-util.h" -#include "netdev/netdev.h" +#include "netdev.h" typedef enum FooOverUDPEncapType { NETDEV_FOO_OVER_UDP_ENCAP_UNSPEC = FOU_ENCAP_UNSPEC, diff --git a/src/network/netdev/geneve.c b/src/network/netdev/geneve.c index 611f9b2f6d8..69d43b6a194 100644 --- a/src/network/netdev/geneve.c +++ b/src/network/netdev/geneve.c @@ -2,19 +2,17 @@ #include -#include "sd-netlink.h" - #include "alloc-util.h" #include "conf-parser.h" #include "extract-word.h" #include "geneve.h" +#include "missing.h" #include "netlink-util.h" +#include "networkd-manager.h" #include "parse-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" -#include "missing.h" -#include "networkd-manager.h" #define GENEVE_FLOW_LABEL_MAX_MASK 0xFFFFFU #define DEFAULT_GENEVE_DESTINATION_PORT 6081 diff --git a/src/network/netdev/geneve.h b/src/network/netdev/geneve.h index 32f7f038ba0..2ac3c1e8352 100644 --- a/src/network/netdev/geneve.h +++ b/src/network/netdev/geneve.h @@ -5,7 +5,6 @@ typedef struct Geneve Geneve; #include "in-addr-util.h" #include "netdev.h" -#include "networkd-link.h" #include "networkd-network.h" #define GENEVE_VID_MAX (1u << 24) - 1 diff --git a/src/network/netdev/ipvlan.c b/src/network/netdev/ipvlan.c index 45dfe17777a..53b4bc944fd 100644 --- a/src/network/netdev/ipvlan.c +++ b/src/network/netdev/ipvlan.c @@ -3,7 +3,7 @@ #include #include "conf-parser.h" -#include "netdev/ipvlan.h" +#include "ipvlan.h" #include "networkd-link.h" #include "string-table.h" diff --git a/src/network/netdev/ipvlan.h b/src/network/netdev/ipvlan.h index 3bad56d500c..171407b7c4b 100644 --- a/src/network/netdev/ipvlan.h +++ b/src/network/netdev/ipvlan.h @@ -4,7 +4,7 @@ #include #include -#include "netdev/netdev.h" +#include "netdev.h" typedef enum IPVlanMode { NETDEV_IPVLAN_MODE_L2 = IPVLAN_MODE_L2, diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index 6ac23052bb3..e51bd1f2063 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -4,8 +4,6 @@ #include #include -#include "sd-netlink.h" - #include "conf-parser.h" #include "hashmap.h" #include "l2tp-tunnel.h" diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index d1d65a69bfa..8ea7d889b4a 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -17,7 +17,6 @@ #include "networkd-address.h" #include "networkd-manager.h" #include "path-util.h" -#include "sd-netlink.h" #include "socket-util.h" #include "string-table.h" #include "string-util.h" diff --git a/src/network/netdev/macvlan.c b/src/network/netdev/macvlan.c index e13c3af9fd8..fe596c295ac 100644 --- a/src/network/netdev/macvlan.c +++ b/src/network/netdev/macvlan.c @@ -3,7 +3,7 @@ #include #include "conf-parser.h" -#include "netdev/macvlan.h" +#include "macvlan.h" #include "string-table.h" static const char* const macvlan_mode_table[_NETDEV_MACVLAN_MODE_MAX] = { diff --git a/src/network/netdev/macvlan.h b/src/network/netdev/macvlan.h index b473f1e19fa..5d81be32da2 100644 --- a/src/network/netdev/macvlan.h +++ b/src/network/netdev/macvlan.h @@ -3,7 +3,7 @@ typedef struct MacVlan MacVlan; -#include "netdev/netdev.h" +#include "netdev.h" typedef enum MacVlanMode { NETDEV_MACVLAN_MODE_PRIVATE = MACVLAN_MODE_PRIVATE, diff --git a/src/network/netdev/netdev-gperf.gperf b/src/network/netdev/netdev-gperf.gperf index 47566f63a8a..09a5f4822e0 100644 --- a/src/network/netdev/netdev-gperf.gperf +++ b/src/network/netdev/netdev-gperf.gperf @@ -3,27 +3,27 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") #endif #include +#include "bond.h" +#include "bridge.h" #include "conf-parser.h" -#include "network-internal.h" -#include "netdev/bond.h" -#include "netdev/bridge.h" -#include "netdev/geneve.h" -#include "netdev/ipvlan.h" -#include "netdev/macsec.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 "netdev/vxcan.h" -#include "netdev/wireguard.h" -#include "netdev/fou-tunnel.h" -#include "netdev/l2tp-tunnel.h" -#include "netdev/xfrm.h" +#include "geneve.h" +#include "ipvlan.h" +#include "macsec.h" +#include "macvlan.h" +#include "tunnel.h" +#include "tuntap.h" +#include "veth.h" #include "vlan-util.h" +#include "vlan.h" +#include "vxlan.h" +#include "vrf.h" +#include "netdev.h" +#include "network-internal.h" +#include "vxcan.h" +#include "wireguard.h" +#include "fou-tunnel.h" +#include "l2tp-tunnel.h" +#include "xfrm.h" %} struct ConfigPerfItem; %null_strings diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c index 9b5d3c0df38..6908c4e811b 100644 --- a/src/network/netdev/netdev.c +++ b/src/network/netdev/netdev.c @@ -4,41 +4,40 @@ #include #include "alloc-util.h" +#include "bond.h" +#include "bridge.h" #include "conf-files.h" #include "conf-parser.h" +#include "dummy.h" #include "fd-util.h" +#include "fou-tunnel.h" +#include "geneve.h" +#include "ipvlan.h" +#include "l2tp-tunnel.h" #include "list.h" -#include "netdev/bond.h" -#include "netdev/bridge.h" -#include "netdev/dummy.h" -#include "netdev/fou-tunnel.h" -#include "netdev/geneve.h" -#include "netdev/ipvlan.h" -#include "netdev/l2tp-tunnel.h" -#include "netdev/macsec.h" -#include "netdev/macvlan.h" -#include "netdev/netdev.h" -#include "netdev/netdevsim.h" -#include "netdev/nlmon.h" -#include "netdev/tunnel.h" -#include "netdev/tuntap.h" -#include "netdev/vcan.h" -#include "netdev/veth.h" -#include "netdev/vlan.h" -#include "netdev/vrf.h" -#include "netdev/vxcan.h" -#include "netdev/vxlan.h" -#include "netdev/wireguard.h" -#include "netdev/xfrm.h" +#include "macsec.h" +#include "macvlan.h" +#include "netdev.h" +#include "netdevsim.h" #include "netlink-util.h" #include "network-internal.h" -#include "networkd-link.h" #include "networkd-manager.h" +#include "nlmon.h" #include "siphash24.h" #include "stat-util.h" #include "string-table.h" #include "string-util.h" #include "strv.h" +#include "tunnel.h" +#include "tuntap.h" +#include "vcan.h" +#include "veth.h" +#include "vlan.h" +#include "vrf.h" +#include "vxcan.h" +#include "vxlan.h" +#include "wireguard.h" +#include "xfrm.h" const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = { [NETDEV_KIND_BRIDGE] = &bridge_vtable, diff --git a/src/network/netdev/netdev.h b/src/network/netdev/netdev.h index 77cd15d8bfd..8d16ec57696 100644 --- a/src/network/netdev/netdev.h +++ b/src/network/netdev/netdev.h @@ -5,7 +5,7 @@ #include "conf-parser.h" #include "list.h" -#include "../networkd-link.h" +#include "networkd-link.h" #include "time-util.h" typedef struct netdev_join_callback netdev_join_callback; diff --git a/src/network/netdev/netdevsim.c b/src/network/netdev/netdevsim.c index 3b9d875183e..ee2632b62de 100644 --- a/src/network/netdev/netdevsim.c +++ b/src/network/netdev/netdevsim.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include "netdev/netdevsim.h" #include "missing.h" +#include "netdevsim.h" const NetDevVTable netdevsim_vtable = { .object_size = sizeof(NetDevSim), diff --git a/src/network/netdev/netdevsim.h b/src/network/netdev/netdevsim.h index d3ed0c0d4f5..4622f4a0c56 100644 --- a/src/network/netdev/netdevsim.h +++ b/src/network/netdev/netdevsim.h @@ -3,7 +3,7 @@ typedef struct NetDevSim NetDevSim; -#include "netdev/netdev.h" +#include "netdev.h" struct NetDevSim { NetDev meta; diff --git a/src/network/netdev/nlmon.c b/src/network/netdev/nlmon.c index c58a6b51ca8..3a6179f5037 100644 --- a/src/network/netdev/nlmon.c +++ b/src/network/netdev/nlmon.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include "netdev/nlmon.h" +#include "nlmon.h" static int netdev_nlmon_verify(NetDev *netdev, const char *filename) { assert(netdev); diff --git a/src/network/netdev/nlmon.h b/src/network/netdev/nlmon.h index 590b62d8631..b5f65f6140d 100644 --- a/src/network/netdev/nlmon.h +++ b/src/network/netdev/nlmon.h @@ -3,7 +3,7 @@ typedef struct NLMon NLMon; -#include "netdev/netdev.h" +#include "netdev.h" struct NLMon { NetDev meta; diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index de7367f714c..2f08fda3bcc 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -6,16 +6,13 @@ #include #include -#include "sd-netlink.h" - #include "conf-parser.h" #include "missing.h" #include "netlink-util.h" -#include "networkd-link.h" -#include "netdev/tunnel.h" #include "parse-util.h" #include "string-table.h" #include "string-util.h" +#include "tunnel.h" #include "util.h" #define DEFAULT_TNL_HOP_LIMIT 64 diff --git a/src/network/netdev/tunnel.h b/src/network/netdev/tunnel.h index 681e80b0159..6480d93e65d 100644 --- a/src/network/netdev/tunnel.h +++ b/src/network/netdev/tunnel.h @@ -4,8 +4,8 @@ #include "in-addr-util.h" #include "conf-parser.h" -#include "netdev/netdev.h" -#include "netdev/fou-tunnel.h" +#include "fou-tunnel.h" +#include "netdev.h" typedef enum Ip6TnlMode { NETDEV_IP6_TNL_MODE_IP6IP6, diff --git a/src/network/netdev/tuntap.c b/src/network/netdev/tuntap.c index 5b799e73a35..ce69ef4124a 100644 --- a/src/network/netdev/tuntap.c +++ b/src/network/netdev/tuntap.c @@ -11,7 +11,7 @@ #include "alloc-util.h" #include "fd-util.h" -#include "netdev/tuntap.h" +#include "tuntap.h" #include "user-util.h" #define TUN_DEV "/dev/net/tun" diff --git a/src/network/netdev/tuntap.h b/src/network/netdev/tuntap.h index 1a1600b0552..8a80b633da7 100644 --- a/src/network/netdev/tuntap.h +++ b/src/network/netdev/tuntap.h @@ -3,7 +3,7 @@ typedef struct TunTap TunTap; -#include "netdev/netdev.h" +#include "netdev.h" struct TunTap { NetDev meta; diff --git a/src/network/netdev/vcan.c b/src/network/netdev/vcan.c index f6a4dbb098d..9b3ab48f1af 100644 --- a/src/network/netdev/vcan.c +++ b/src/network/netdev/vcan.c @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ -#include "netdev/vcan.h" +#include "vcan.h" const NetDevVTable vcan_vtable = { .object_size = sizeof(VCan), diff --git a/src/network/netdev/vcan.h b/src/network/netdev/vcan.h index 671b5cb6390..d8af07e3cec 100644 --- a/src/network/netdev/vcan.h +++ b/src/network/netdev/vcan.h @@ -6,7 +6,7 @@ typedef struct VCan VCan; #include #include -#include "netdev/netdev.h" +#include "netdev.h" struct VCan { NetDev meta; diff --git a/src/network/netdev/veth.c b/src/network/netdev/veth.c index e996b49b0a9..4ed9e81511d 100644 --- a/src/network/netdev/veth.c +++ b/src/network/netdev/veth.c @@ -4,9 +4,7 @@ #include #include -#include "sd-netlink.h" - -#include "netdev/veth.h" +#include "veth.h" static int netdev_veth_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { Veth *v; diff --git a/src/network/netdev/veth.h b/src/network/netdev/veth.h index 0bb9947bbd7..6a0728b1c47 100644 --- a/src/network/netdev/veth.h +++ b/src/network/netdev/veth.h @@ -3,7 +3,7 @@ typedef struct Veth Veth; -#include "netdev/netdev.h" +#include "netdev.h" struct Veth { NetDev meta; diff --git a/src/network/netdev/vlan.c b/src/network/netdev/vlan.c index 4d939ab0456..1b4e5bc2d38 100644 --- a/src/network/netdev/vlan.c +++ b/src/network/netdev/vlan.c @@ -4,8 +4,8 @@ #include #include -#include "netdev/vlan.h" #include "vlan-util.h" +#include "vlan.h" static int netdev_vlan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *req) { struct ifla_vlan_flags flags = {}; diff --git a/src/network/netdev/vlan.h b/src/network/netdev/vlan.h index b815e03dc54..7f6cb14787d 100644 --- a/src/network/netdev/vlan.h +++ b/src/network/netdev/vlan.h @@ -3,7 +3,7 @@ typedef struct VLan VLan; -#include "netdev/netdev.h" +#include "netdev.h" struct VLan { NetDev meta; diff --git a/src/network/netdev/vrf.c b/src/network/netdev/vrf.c index 596a91453c0..76b8f69d951 100644 --- a/src/network/netdev/vrf.c +++ b/src/network/netdev/vrf.c @@ -2,9 +2,8 @@ #include -#include "sd-netlink.h" #include "missing.h" -#include "netdev/vrf.h" +#include "vrf.h" static int netdev_vrf_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { Vrf *v; diff --git a/src/network/netdev/vrf.h b/src/network/netdev/vrf.h index 05b3937856e..a0bff913bd5 100644 --- a/src/network/netdev/vrf.h +++ b/src/network/netdev/vrf.h @@ -3,7 +3,7 @@ typedef struct Vrf Vrf; -#include "netdev/netdev.h" +#include "netdev.h" struct Vrf { NetDev meta; diff --git a/src/network/netdev/vxcan.c b/src/network/netdev/vxcan.c index 79f47690adb..d1c3f091c35 100644 --- a/src/network/netdev/vxcan.c +++ b/src/network/netdev/vxcan.c @@ -2,7 +2,7 @@ #include -#include "netdev/vxcan.h" +#include "vxcan.h" static int netdev_vxcan_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *m) { VxCan *v; diff --git a/src/network/netdev/vxcan.h b/src/network/netdev/vxcan.h index b5de19740f2..4531a673707 100644 --- a/src/network/netdev/vxcan.h +++ b/src/network/netdev/vxcan.h @@ -3,7 +3,7 @@ typedef struct VxCan VxCan; -#include "netdev/netdev.h" +#include "netdev.h" struct VxCan { NetDev meta; diff --git a/src/network/netdev/vxlan.c b/src/network/netdev/vxlan.c index bba58e8aaf4..afff53ae32c 100644 --- a/src/network/netdev/vxlan.c +++ b/src/network/netdev/vxlan.c @@ -2,8 +2,6 @@ #include -#include "sd-netlink.h" - #include "conf-parser.h" #include "alloc-util.h" #include "extract-word.h" @@ -12,9 +10,7 @@ #include "strv.h" #include "parse-util.h" #include "missing.h" - -#include "networkd-link.h" -#include "netdev/vxlan.h" +#include "vxlan.h" static const char* const df_table[_NETDEV_VXLAN_DF_MAX] = { [NETDEV_VXLAN_DF_NO] = "no", diff --git a/src/network/netdev/vxlan.h b/src/network/netdev/vxlan.h index 0c61bba2b89..cf8ae8845e8 100644 --- a/src/network/netdev/vxlan.h +++ b/src/network/netdev/vxlan.h @@ -6,7 +6,7 @@ typedef struct VxLan VxLan; #include #include "in-addr-util.h" -#include "netdev/netdev.h" +#include "netdev.h" #define VXLAN_VID_MAX (1u << 24) - 1 #define VXLAN_FLOW_LABEL_MAX_MASK 0xFFFFFU diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c index a40b32d148e..4a1228584d7 100644 --- a/src/network/netdev/wireguard.c +++ b/src/network/netdev/wireguard.c @@ -15,7 +15,6 @@ #include "hexdecoct.h" #include "memory-util.h" #include "netlink-util.h" -#include "networkd-link.h" #include "networkd-manager.h" #include "networkd-util.h" #include "parse-util.h" diff --git a/src/network/netdev/xfrm.c b/src/network/netdev/xfrm.c index afedb4b4247..7157af4df3e 100644 --- a/src/network/netdev/xfrm.c +++ b/src/network/netdev/xfrm.c @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #include "missing_network.h" -#include "netdev/xfrm.h" +#include "xfrm.h" static int xfrm_fill_message_create(NetDev *netdev, Link *link, sd_netlink_message *message) { Xfrm *x; diff --git a/src/network/netdev/xfrm.h b/src/network/netdev/xfrm.h index 47355a53d89..889d3619b16 100644 --- a/src/network/netdev/xfrm.h +++ b/src/network/netdev/xfrm.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #pragma once -#include "netdev/netdev.h" +#include "netdev.h" typedef struct Xfrm { NetDev meta; diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c index 1f688d6716f..07c77a3fa3e 100644 --- a/src/network/networkd-fdb.c +++ b/src/network/networkd-fdb.c @@ -7,9 +7,8 @@ #include #include "alloc-util.h" +#include "bridge.h" #include "conf-parser.h" -#include "netdev/bridge.h" -#include "netdev/vxlan.h" #include "netlink-util.h" #include "networkd-fdb.h" #include "networkd-manager.h" @@ -18,6 +17,7 @@ #include "string-table.h" #include "util.h" #include "vlan-util.h" +#include "vxlan.h" #define STATIC_FDB_ENTRIES_PER_NETWORK_MAX 1024U diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index 91de2be61fc..279f9025ede 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -6,17 +6,16 @@ #include #include "alloc-util.h" +#include "bond.h" +#include "bridge.h" #include "bus-util.h" #include "dhcp-identifier.h" #include "dhcp-lease-internal.h" #include "env-file.h" #include "fd-util.h" #include "fileio.h" +#include "ipvlan.h" #include "missing_network.h" -#include "netdev/bond.h" -#include "netdev/bridge.h" -#include "netdev/ipvlan.h" -#include "netdev/vrf.h" #include "netlink-util.h" #include "network-internal.h" #include "networkd-can.h" @@ -34,6 +33,7 @@ #include "networkd-radv.h" #include "networkd-routing-policy-rule.h" #include "networkd-wifi.h" +#include "qdisc.h" #include "set.h" #include "socket-util.h" #include "stdio-util.h" @@ -43,8 +43,8 @@ #include "tmpfile-util.h" #include "udev-util.h" #include "util.h" -#include "tc/qdisc.h" #include "virt.h" +#include "vrf.h" uint32_t link_get_vrf_table(Link *link) { return link->network->vrf ? VRF(link->network->vrf)->table : RT_TABLE_MAIN; diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 870a4c8886b..446ba9f084b 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -4,6 +4,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") #endif #include #include "conf-parser.h" +#include "netem.h" #include "network-internal.h" #include "networkd-conf.h" #include "networkd-dhcp-common.h" @@ -12,9 +13,8 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") #include "networkd-ipv4ll.h" #include "networkd-ndisc.h" #include "networkd-network.h" +#include "qdisc.h" #include "vlan-util.h" -#include "tc/qdisc.h" -#include "tc/netem.h" %} struct ConfigPerfItem; %null_strings diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index 9820d6af299..0d4559774cb 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -6,11 +6,11 @@ #include "sd-bus.h" #include "sd-device.h" +#include "bridge.h" #include "condition.h" #include "conf-parser.h" #include "hashmap.h" -#include "netdev/bridge.h" -#include "netdev/netdev.h" +#include "netdev.h" #include "networkd-address-label.h" #include "networkd-address.h" #include "networkd-brvlan.h" @@ -27,8 +27,8 @@ #include "networkd-routing-policy-rule.h" #include "networkd-util.h" #include "ordered-set.h" +#include "qdisc.h" #include "resolve-util.h" -#include "tc/qdisc.h" typedef enum IPv6PrivacyExtensions { /* The values map to the kernel's /proc/sys/net/ipv6/conf/xxx/use_tempaddr values */ diff --git a/src/network/tc/netem.h b/src/network/tc/netem.h index 33dfdd85881..4bac44ca5a5 100644 --- a/src/network/tc/netem.h +++ b/src/network/tc/netem.h @@ -5,20 +5,18 @@ #include "sd-netlink.h" #include "conf-parser.h" -#include "macro.h" -#include "../networkd-link.h" +#include "networkd-link.h" #include "time-util.h" -typedef struct NetworkEmulator NetworkEmulator; typedef struct QDiscs QDiscs; -struct NetworkEmulator { +typedef struct NetworkEmulator { usec_t delay; usec_t jitter; uint32_t limit; uint32_t loss; -}; +} NetworkEmulator; int network_emulator_new(NetworkEmulator **ret); int network_emulator_fill_message(Link *link, QDiscs *qdisc, sd_netlink_message *req); diff --git a/src/network/tc/qdisc.h b/src/network/tc/qdisc.h index 80b893b8377..95ff829b9e3 100644 --- a/src/network/tc/qdisc.h +++ b/src/network/tc/qdisc.h @@ -3,13 +3,12 @@ #pragma once #include "conf-parser.h" -#include "macro.h" #include "netem.h" -#include "../networkd-util.h" +#include "networkd-link.h" +#include "networkd-network.h" +#include "networkd-util.h" -typedef struct QDiscs QDiscs; - -struct QDiscs { +typedef struct QDiscs { NetworkConfigSection *section; Network *network; @@ -23,7 +22,7 @@ struct QDiscs { bool has_network_emulator:1; NetworkEmulator ne; -}; +} QDiscs; void qdisc_free(QDiscs *qdisc); int qdisc_new_static(Network *network, const char *filename, unsigned section_line, QDiscs **ret); diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c index 56932ba15c4..25b93963977 100644 --- a/src/network/test-network-tables.c +++ b/src/network/test-network-tables.c @@ -1,17 +1,17 @@ +#include "bond.h" #include "dhcp6-internal.h" #include "dhcp6-protocol.h" #include "ethtool-util.h" +#include "ipvlan.h" #include "lldp-internal.h" +#include "macvlan.h" #include "ndisc-internal.h" -#include "netdev/bond.h" -#include "netdev/ipvlan.h" -#include "netdev/macvlan.h" -#include "netdev/tunnel.h" #include "netlink-internal.h" #include "networkd-link.h" #include "networkd-network.h" #include "networkd-util.h" #include "test-tables.h" +#include "tunnel.h" int main(int argc, char **argv) { test_table(bond_ad_select, NETDEV_BOND_AD_SELECT); -- 2.39.5