diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-10-30 17:02:15 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-10-30 22:23:43 +0900 |
commit | 737f14054649db6bec5d73108db0675fe3fec3d1 (patch) | |
tree | 7d8cfb5781188762f265f63a4129349d7fb6a80f /src/network/netdev | |
parent | b7a4129ca946ed49e161a03283faf5bbab96d110 (diff) | |
download | systemd-737f14054649db6bec5d73108db0675fe3fec3d1.tar.gz |
network: cleanup header inclusion
Diffstat (limited to 'src/network/netdev')
40 files changed, 76 insertions, 98 deletions
diff --git a/src/network/netdev/bond.c b/src/network/netdev/bond.c index a85c9e33ec..185b155440 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 011c2c3040..fc9d6c2352 100644 --- 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 091a54ff39..23c733cbe7 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 93e0651f7d..f935414772 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 772f3db5e7..4db5caa0f2 100644 --- 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 6304e6b549..caa3b7600e 100644 --- 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 611f9b2f6d..69d43b6a19 100644 --- 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 32f7f038ba..2ac3c1e835 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 45dfe17777..53b4bc944f 100644 --- 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 3bad56d500..171407b7c4 100644 --- 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 6ac23052bb..e51bd1f206 100644 --- 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 d1d65a69bf..8ea7d889b4 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 e13c3af9fd..fe596c295a 100644 --- 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 b473f1e19f..5d81be32da 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 47566f63a8..09a5f4822e 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 <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 9b5d3c0df3..6908c4e811 100644 --- 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 77cd15d8bf..8d16ec5769 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 3b9d875183..ee2632b62d 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 d3ed0c0d4f..4622f4a0c5 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 c58a6b51ca..3a6179f503 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 590b62d863..b5f65f6140 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 de7367f714..2f08fda3bc 100644 --- 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 681e80b015..6480d93e65 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 5b799e73a3..ce69ef4124 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 1a1600b055..8a80b633da 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 f6a4dbb098..9b3ab48f1a 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 671b5cb639..d8af07e3ce 100644 --- 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 e996b49b0a..4ed9e81511 100644 --- 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 0bb9947bbd..6a0728b1c4 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 4d939ab045..1b4e5bc2d3 100644 --- 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 b815e03dc5..7f6cb14787 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 596a91453c..76b8f69d95 100644 --- 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 05b3937856..a0bff913bd 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 79f47690ad..d1c3f091c3 100644 --- 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 b5de19740f..4531a67370 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 bba58e8aaf..afff53ae32 100644 --- 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 0c61bba2b8..cf8ae8845e 100644 --- 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 a40b32d148..4a1228584d 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 afedb4b424..7157af4df3 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 47355a53d8..889d3619b1 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; |