From 093e35334dbc8b17a6a64151699ad21c30d1f9df Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 2 Oct 2020 14:01:59 +0900 Subject: [PATCH] network: header cleanup --- src/network/netdev/macsec.c | 1 - src/network/networkd-address-pool.c | 1 + src/network/networkd-address.c | 7 +------ src/network/networkd-address.h | 22 +++++++++------------- src/network/networkd-dhcp-server.c | 1 + src/network/networkd-dhcp4.c | 1 + src/network/networkd-dhcp6.c | 1 + src/network/networkd-link.c | 1 + src/network/networkd-link.h | 1 - src/network/networkd-ndisc.c | 1 + src/network/networkd-network-gperf.gperf | 1 + src/network/networkd-network.c | 1 + src/network/networkd-network.h | 1 - 13 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/network/netdev/macsec.c b/src/network/netdev/macsec.c index 9d3b8d6e4c..9f0e6f25c1 100644 --- a/src/network/netdev/macsec.c +++ b/src/network/netdev/macsec.c @@ -13,7 +13,6 @@ #include "memory-util.h" #include "netlink-util.h" #include "network-internal.h" -#include "networkd-address.h" #include "networkd-manager.h" #include "path-util.h" #include "socket-util.h" diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c index 5f5a170718..24a6bff2a1 100644 --- a/src/network/networkd-address-pool.c +++ b/src/network/networkd-address-pool.c @@ -2,6 +2,7 @@ #include "alloc-util.h" #include "networkd-address-pool.h" +#include "networkd-address.h" #include "networkd-manager.h" #include "set.h" #include "string-util.h" diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index d82d54d418..170adfbbf6 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -3,20 +3,15 @@ #include #include "alloc-util.h" -#include "conf-parser.h" #include "firewall-util.h" #include "memory-util.h" -#include "missing_network.h" #include "netlink-util.h" #include "networkd-address.h" #include "networkd-manager.h" -#include "networkd-ndisc.h" +#include "networkd-network.h" #include "parse-util.h" -#include "set.h" -#include "socket-util.h" #include "string-util.h" #include "strv.h" -#include "utf8.h" #define ADDRESSES_PER_LINK_MAX 2048U #define STATIC_ADDRESSES_PER_NETWORK_MAX 1024U diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h index b936e3e87a..ec1f51927e 100644 --- a/src/network/networkd-address.h +++ b/src/network/networkd-address.h @@ -3,26 +3,22 @@ #include #include - -#include "conf-parser.h" -#include "in-addr-util.h" - -typedef struct Address Address; - -#include "networkd-link.h" -#include "networkd-network.h" -#include "networkd-util.h" +#include #include "sd-ipv4acd.h" +#include "conf-parser.h" +#include "in-addr-util.h" +#include "networkd-link.h" +#include "networkd-util.h" + #define CACHE_INFO_INFINITY_LIFE_TIME 0xFFFFFFFFU +typedef struct Manager Manager; typedef struct Network Network; -typedef struct Link Link; -typedef struct NetworkConfigSection NetworkConfigSection; typedef int (*address_ready_callback_t)(Address *address); -struct Address { +typedef struct Address { Network *network; NetworkConfigSection *section; @@ -52,7 +48,7 @@ struct Address { address_ready_callback_t callback; sd_ipv4acd *acd; -}; +} Address; int address_new(Address **ret); Address *address_free(Address *address); diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c index 9195f0680f..a0ef756df8 100644 --- a/src/network/networkd-dhcp-server.c +++ b/src/network/networkd-dhcp-server.c @@ -4,6 +4,7 @@ #include "fd-util.h" #include "fileio.h" +#include "networkd-address.h" #include "networkd-dhcp-server.h" #include "networkd-link.h" #include "networkd-manager.h" diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 18ce0c61bb..59c68744c0 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -11,6 +11,7 @@ #include "hostname-util.h" #include "parse-util.h" #include "network-internal.h" +#include "networkd-address.h" #include "networkd-dhcp4.h" #include "networkd-link.h" #include "networkd-manager.h" diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c index f0642c9f72..4b99c5f308 100644 --- a/src/network/networkd-dhcp6.c +++ b/src/network/networkd-dhcp6.c @@ -14,6 +14,7 @@ #include "hostname-util.h" #include "missing_network.h" #include "network-internal.h" +#include "networkd-address.h" #include "networkd-dhcp6.h" #include "networkd-link.h" #include "networkd-manager.h" diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ef3a20befb..0083959591 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -21,6 +21,7 @@ #include "netlink-util.h" #include "network-internal.h" #include "networkd-address-label.h" +#include "networkd-address.h" #include "networkd-can.h" #include "networkd-dhcp-server.h" #include "networkd-dhcp4.h" diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h index 361646ec4d..510d3f8c03 100644 --- a/src/network/networkd-link.h +++ b/src/network/networkd-link.h @@ -15,7 +15,6 @@ #include "sd-radv.h" #include "sd-netlink.h" -#include "list.h" #include "log-link.h" #include "network-util.h" #include "networkd-util.h" diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c index 545574e126..6a21f12907 100644 --- a/src/network/networkd-ndisc.c +++ b/src/network/networkd-ndisc.c @@ -9,6 +9,7 @@ #include "sd-ndisc.h" #include "missing_network.h" +#include "networkd-address.h" #include "networkd-dhcp6.h" #include "networkd-manager.h" #include "networkd-ndisc.h" diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index 1d899464d8..a5680adc16 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -7,6 +7,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"") #include "netem.h" #include "network-internal.h" #include "networkd-address-label.h" +#include "networkd-address.h" #include "networkd-can.h" #include "networkd-conf.h" #include "networkd-dhcp-common.h" diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index c1c1ff502e..3c6f45c61b 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -15,6 +15,7 @@ #include "networkd-dhcp-server.h" #include "network-internal.h" #include "networkd-address-label.h" +#include "networkd-address.h" #include "networkd-fdb.h" #include "networkd-manager.h" #include "networkd-mdb.h" diff --git a/src/network/networkd-network.h b/src/network/networkd-network.h index f6ebda4a14..99cce40533 100644 --- a/src/network/networkd-network.h +++ b/src/network/networkd-network.h @@ -12,7 +12,6 @@ #include "conf-parser.h" #include "hashmap.h" #include "netdev.h" -#include "networkd-address.h" #include "networkd-brvlan.h" #include "networkd-dhcp-common.h" #include "networkd-dhcp4.h"