network: cleanup header inclusion

diff --git a/meson.build b/meson.build
index a7a92225829e9be6bc5442c8bad3737ad83d2804..56b7bfea7046d3e3766527d0698a73b23b8eeecd 100644 (file)
--- 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 06b6ec64a27ba87ce927f9fbc49cd4accf0acb1d..d502279151cfc855918fc46cfde50bdc17aeacaf 100644 (file)
--- 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 a85c9e33ec266e1f1ed9abf83d7edcc26c3baaf1..185b155440e77e6d2bce4413ed45805a71028b69 100644 (file)
--- 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 011c2c3040f1907e075359361d86526c29f61a89..fc9d6c2352c2a8a3bcd5199bba38845957080a80 100644 (file)
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -2,9 +2,9 @@
 
 #include <net/if.h>
 
+#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 091a54ff39e82ac4786012c53bbd6c767345563c..23c733cbe7b64d00018c7ff15253209df2c744dc 100644 (file)
--- 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 93e0651f7d788d3e65353abe8404b7f99f7032ca..f935414772becd16497544c21b66f102f82bd7ed 100644 (file)
--- 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 772f3db5e7b483584695b788ba5268966bc19cc7..4db5caa0f24d08305abe797f95d41ad994837de2 100644 (file)
--- a/src/network/netdev/fou-tunnel.c
+++ b/src/network/netdev/fou-tunnel.c
@@ -6,14 +6,12 @@
 #include <linux/ip.h>
 
 #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 6304e6b54927ea7ac6bae6d417ce376d90190a9f..caa3b7600e270629bc2c77e3cd9a79bced78e260 100644 (file)
--- a/src/network/netdev/fou-tunnel.h
+++ b/src/network/netdev/fou-tunnel.h
@@ -5,7 +5,7 @@
 #include <linux/fou.h>
 
 #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 611f9b2f6d8bed7a96f37cbfcd2450c90b0be0cf..69d43b6a194d6b914a92accd1441bd3da6d46e61 100644 (file)
--- a/src/network/netdev/geneve.c
+++ b/src/network/netdev/geneve.c
@@ -2,19 +2,17 @@
 
 #include <net/if.h>
 
-#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 32f7f038ba05551ab01a7b024a9b58b57ba8f3d6..2ac3c1e8352f0076d36b6fd037dfcbfc627a7f54 100644 (file)
--- 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 45dfe17777a6bcd207ceab467ca9b813ea01c73a..53b4bc944fd4692db3b06e436c271d298c8d64fa 100644 (file)
--- a/src/network/netdev/ipvlan.c
+++ b/src/network/netdev/ipvlan.c
@@ -3,7 +3,7 @@
 #include <net/if.h>
 
 #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 3bad56d500cf518f8043db8b663b20354a49b4dd..171407b7c4bfb17c3cd526c3ec2aed7bde5e8e26 100644 (file)
--- a/src/network/netdev/ipvlan.h
+++ b/src/network/netdev/ipvlan.h
@@ -4,7 +4,7 @@
 #include <netinet/in.h>
 #include <linux/if_link.h>
 
-#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 6ac23052bb3ce94ed37a6ba4852ac62869d63468..e51bd1f206377734eeb1beb32b3c1cc457a95f27 100644 (file)
--- a/src/network/netdev/l2tp-tunnel.c
+++ b/src/network/netdev/l2tp-tunnel.c
@@ -4,8 +4,6 @@
 #include <linux/l2tp.h>
 #include <linux/genetlink.h>
 
-#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 d1d65a69bfa010136ac7756d452759931672336f..8ea7d889b4ab8caa74e0656a931c5e11d985caef 100644 (file)
--- 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 e13c3af9fd863f48a55d899bb9a58ea0224b8c7d..fe596c295ac60180cf1d8f54ab2c1f63fbcd5108 100644 (file)
--- a/src/network/netdev/macvlan.c
+++ b/src/network/netdev/macvlan.c
@@ -3,7 +3,7 @@
 #include <net/if.h>
 
 #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 b473f1e19fa8617d1f2d8f6121aee5c667f4a866..5d81be32da291e038bc556c7a7912eb09cc04d93 100644 (file)
--- 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 47566f63a8a4c0d23b9f32cfd0128d7b854a5640..09a5f4822e03dc39b32e7fe8072ecaf89bc2cc04 100644 (file)
--- 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 <stddef.h>
+#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 9b5d3c0df3885b00aac1c074e1b8a27462ba1da2..6908c4e811b0c11af90fe9e1046e6644d371b469 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -4,41 +4,40 @@
 #include <netinet/in.h>
 
 #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 77cd15d8bfd1c860760576dc3736683fe9bb85a8..8d16ec5769685eff8dbc28f9fe33d0570354e988 100644 (file)
--- 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 3b9d875183e600736bd5c66e654dd5d458163f26..ee2632b62de1c2d8bccd4066a6c55b5df1f6bcd6 100644 (file)
--- 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 d3ed0c0d4f58a45fac23a09ff9b7fc4c17fbb891..4622f4a0c56f3311ffd9355370ac704da7ccdaf0 100644 (file)
--- 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 c58a6b51ca81f974dfc31d903c5bac386db1c62e..3a6179f5037dff79af467dbca66e275be56b81c7 100644 (file)
--- 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 590b62d863139ee6db43de8b1be69da0c498606e..b5f65f6140d88215857f76efd4e4efe81a4b12b7 100644 (file)
--- 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 de7367f714cb68cf5c0b512005fd87ed66691b4b..2f08fda3bccc93751ca22441cbb94e10364dfbbb 100644 (file)
--- a/src/network/netdev/tunnel.c
+++ b/src/network/netdev/tunnel.c
@@ -6,16 +6,13 @@
 #include <linux/if_tunnel.h>
 #include <linux/ip6_tunnel.h>
 
-#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 681e80b0159d752011d74f6b36a82f4c472e996d..6480d93e65d017dc304249abd56ad075085a06b6 100644 (file)
--- 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 5b799e73a35b8654b490d144d2078db31d25f6a3..ce69ef4124ac45157cb7bfb5b58a26f8ce697b58 100644 (file)
--- 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 1a1600b05529f2c9767391c2b9c3a08c5309b6c7..8a80b633da72421a7cfe8abf8efc475acaaeae7e 100644 (file)
--- 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 f6a4dbb098d30f139f6a448d8d21b0079f36100f..9b3ab48f1afcc7032e6ae148d85a980adef262b8 100644 (file)
--- 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 671b5cb6390a2dadfea2ef2a6a637557b6b06b30..d8af07e3cec6d6a0872912cfe17caa09986897da 100644 (file)
--- a/src/network/netdev/vcan.h
+++ b/src/network/netdev/vcan.h
@@ -6,7 +6,7 @@ typedef struct VCan VCan;
 #include <netinet/in.h>
 #include <linux/can/netlink.h>
 
-#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 e996b49b0a9f7694abb9f25e536f0c36edbfc155..4ed9e81511d69e4ee13a18e79bf57f234b8ef184 100644 (file)
--- a/src/network/netdev/veth.c
+++ b/src/network/netdev/veth.c
@@ -4,9 +4,7 @@
 #include <net/if.h>
 #include <linux/veth.h>
 
-#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 0bb9947bbd77e08dd568ff6b93f8a42611fe265a..6a0728b1c47fbb402ab15360e84a309ef60fac2f 100644 (file)
--- 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 4d939ab0456adeeba34cc723be728b75d7e9c924..1b4e5bc2d387074b40244c8529b98c89a4a67385 100644 (file)
--- a/src/network/netdev/vlan.c
+++ b/src/network/netdev/vlan.c
@@ -4,8 +4,8 @@
 #include <net/if.h>
 #include <linux/if_vlan.h>
 
-#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 b815e03dc54c67b21cd54bbe598dc3cf47a578cc..7f6cb14787d75dc756114700189f327fa3c71ad0 100644 (file)
--- 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 596a91453c0f0cf24d9ec8ff7767c23d93098ca7..76b8f69d9516209f1495baf359f83f414bb2dc91 100644 (file)
--- a/src/network/netdev/vrf.c
+++ b/src/network/netdev/vrf.c
@@ -2,9 +2,8 @@
 
 #include <net/if.h>
 
-#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 05b3937856eb054d386b364464877c1cff28a870..a0bff913bd513f41eb983dd0d0cdc4ccc7b3b6dc 100644 (file)
--- 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 79f47690adb0e1d210af575e8bbd7b951e98a3e4..d1c3f091c35808d1060bd61872225e235190b4fd 100644 (file)
--- a/src/network/netdev/vxcan.c
+++ b/src/network/netdev/vxcan.c
@@ -2,7 +2,7 @@
 
 #include <linux/can/vxcan.h>
 
-#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 b5de19740f2959ebd6697b6a2b3e45af11de5972..4531a673707d810255ef8a1d1765601af9e6de0a 100644 (file)
--- 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 bba58e8aaf4a6e9e955c309343002f85c7eca335..afff53ae32cb19e744a773d4774ed7f318c40df7 100644 (file)
--- a/src/network/netdev/vxlan.c
+++ b/src/network/netdev/vxlan.c
@@ -2,8 +2,6 @@
 
 #include <net/if.h>
 
-#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 0c61bba2b89de3b3753a80f0a46ce2df1baf7a77..cf8ae8845e83353c01102b92b21b091cfafccb36 100644 (file)
--- a/src/network/netdev/vxlan.h
+++ b/src/network/netdev/vxlan.h
@@ -6,7 +6,7 @@ typedef struct VxLan VxLan;
 #include <linux/if_link.h>
 
 #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 a40b32d148ef10446d70f7f996f01fd34e30e5e5..4a1228584d794f866b758421b83997594b4ba04c 100644 (file)
--- 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 afedb4b42474e58322b9c56af894fbf5db650a12..7157af4df3e4ad127587606868f54051c4a8e31f 100644 (file)
--- 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 47355a53d892c131b406659611d41f761eaca2ca..889d3619b162f4c5c55ffdbbc321dcb865933b23 100644 (file)
--- 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 1f688d6716f51511e42fe6d0cd625bfde661acf9..07c77a3fa3e874a297b4117d9fbf99b4430e53fc 100644 (file)
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -7,9 +7,8 @@
 #include <net/if.h>
 
 #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 91de2be61fcec5af9fd868565ea10f6e46d4e01f..279f9025edec081d9c749d6395ffe831aaba09e3 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -6,17 +6,16 @@
 #include <unistd.h>
 
 #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 870a4c8886b311eca2aa69bd7649ce8717361ffb..446ba9f084b962d6105477ec82763c9f50d4e2d0 100644 (file)
--- 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 <stddef.h>
 #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 9820d6af2997aa98ef7b56aaf622e0459862d21b..0d4559774cbfcfbb45264c24386081f1c2ccccff 100644 (file)
--- 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 33dfdd858811f791875d55437da22be2cbbfde4e..4bac44ca5a54eb0731788317abd92bdc0d3604e5 100644 (file)
--- 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 80b893b8377f8907a8083fedab3a490fc5ca4cec..95ff829b9e34045676a76a18d7da242cdd585fee 100644 (file)
--- 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 56932ba15c4a331cc24b837f0f9fc3ed42c15424..25b9396397752b4c35eb40fd1e0e9126933874a7 100644 (file)
--- 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);