networkd: clean up main header file a bit

Rename networkd.h to networkd-manager.h, to more accurately describe what it
contains.

diff --git a/Makefile.am b/Makefile.am
index b71e20428187d3b0caedb9a1c1d5edd4ae154b0d..6173e7a40f43a873cfccb6935b6c2407c9efd420 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5610,11 +5610,6 @@ libnetworkd_core_la_CFLAGS = \
 
 libnetworkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
-       src/network/networkd.h \
-       src/network/networkd-conf.h \
-       src/network/networkd-conf.c \
-       src/network/networkd-link.h \
-       src/network/networkd-link.c \
        src/network/netdev/netdev.h \
        src/network/netdev/netdev.c \
        src/network/netdev/vrf.h \
@@ -5641,6 +5636,13 @@ libnetworkd_core_la_SOURCES = \
        src/network/netdev/bridge.c \
        src/network/netdev/vcan.h \
        src/network/netdev/vcan.c \
+       src/network/networkd-manager.h \
+       src/network/networkd-manager.c \
+       src/network/networkd-manager-bus.c \
+       src/network/networkd-conf.h \
+       src/network/networkd-conf.c \
+       src/network/networkd-link.h \
+       src/network/networkd-link.c \
        src/network/networkd-link-bus.c \
        src/network/networkd-ipv4ll.c \
        src/network/networkd-dhcp4.c \
@@ -5654,8 +5656,6 @@ libnetworkd_core_la_SOURCES = \
        src/network/networkd-address.c \
        src/network/networkd-route.h \
        src/network/networkd-route.c \
-       src/network/networkd-manager.c \
-       src/network/networkd-manager-bus.c \
        src/network/networkd-fdb.h \
        src/network/networkd-fdb.c \
        src/network/networkd-brvlan.h \

diff --git a/src/network/netdev/bridge.c b/src/network/netdev/bridge.c
index 760aefd97e323da6ba12fb2d8024d658891aa234..08e31b974f9f2b8c54bc6946ee3811ae646f690b 100644 (file)
--- a/src/network/netdev/bridge.c
+++ b/src/network/netdev/bridge.c
@@ -22,8 +22,8 @@
 
 #include "missing.h"
 #include "netlink-util.h"
-#include "networkd.h"
 #include "netdev/bridge.h"
+#include "networkd-manager.h"
 
 /* callback for brige netdev's parameter set */
 static int netdev_bridge_set_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index 4f287bab72225644118992c0e57cfa1c873a0f5d..9b9e83d9db4242751532c1a9e0ba1cb7c8c054ae 100644 (file)
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -27,12 +27,25 @@
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "netdev/netdev.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "siphash24.h"
 #include "stat-util.h"
 #include "string-table.h"
 #include "string-util.h"
 
+#include "netdev/bridge.h"
+#include "netdev/bond.h"
+#include "netdev/vlan.h"
+#include "netdev/macvlan.h"
+#include "netdev/ipvlan.h"
+#include "netdev/vxlan.h"
+#include "netdev/tunnel.h"
+#include "netdev/tuntap.h"
+#include "netdev/veth.h"
+#include "netdev/dummy.h"
+#include "netdev/vrf.h"
+#include "netdev/vcan.h"
+
 const NetDevVTable * const netdev_vtable[_NETDEV_KIND_MAX] = {
         [NETDEV_KIND_BRIDGE] = &bridge_vtable,
         [NETDEV_KIND_BOND] = &bond_vtable,

diff --git a/src/network/networkd-address-pool.c b/src/network/networkd-address-pool.c
index ebc6c9eb9edb9a2b7749a3d0203a608a767bd85a..a63b925a4a7952c4bb2f3d7386b3bace802ef19b 100644 (file)
--- a/src/network/networkd-address-pool.c
+++ b/src/network/networkd-address-pool.c
@@ -19,7 +19,7 @@
 
 #include "alloc-util.h"
 #include "networkd-address-pool.h"
-#include "networkd.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 ed52d5e42d09d3c65d036b8cd82869c27e532c31..2b698d95319fc34d1fadff1d277ad6151c45c0d8 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -24,7 +24,7 @@
 #include "firewall-util.h"
 #include "netlink-util.h"
 #include "networkd-address.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "parse-util.h"
 #include "set.h"
 #include "socket-util.h"

diff --git a/src/network/networkd-brvlan.c b/src/network/networkd-brvlan.c
index 18ecd86858f00573d0ff20c7ca96c6867c60dc79..fa5d3ee7faa60a65927b14e653606f22a4ba398f 100644 (file)
--- a/src/network/networkd-brvlan.c
+++ b/src/network/networkd-brvlan.c
@@ -25,7 +25,9 @@
 #include "conf-parser.h"
 #include "netlink-util.h"
 #include "networkd-brvlan.h"
-#include "networkd.h"
+#include "networkd-link.h"
+#include "networkd-manager.h"
+#include "networkd-network.h"
 #include "parse-util.h"
 #include "vlan-util.h"
 

diff --git a/src/network/networkd-conf.c b/src/network/networkd-conf.c
index 49bb8c18f6ea837571d9ebda8138410a7ec1d4c1..aaa27f311d39ce24e5ed0df326b1cef3574fdb0a 100644 (file)
--- a/src/network/networkd-conf.c
+++ b/src/network/networkd-conf.c
@@ -22,8 +22,10 @@
 #include "conf-parser.h"
 #include "def.h"
 #include "dhcp-identifier.h"
+#include "extract-word.h"
 #include "hexdecoct.h"
 #include "networkd-conf.h"
+#include "networkd-network.h"
 #include "string-table.h"
 
 int manager_parse_config_file(Manager *m) {

diff --git a/src/network/networkd-conf.h b/src/network/networkd-conf.h
index c7bfb42a72992348a6f65b5e25e869f96fd2c517..93819626ba7f48d546cd53706ffea2d2c1513423 100644 (file)
--- a/src/network/networkd-conf.h
+++ b/src/network/networkd-conf.h
@@ -19,7 +19,7 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
-#include "networkd.h"
+typedef struct Manager Manager;
 
 int manager_parse_config_file(Manager *m);
 

diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c
index 3feb158642566eef1ea389d6026332763cba36e2..614bceefaba31f95a0f19ce825e847eb39a6ba4d 100644 (file)
--- a/src/network/networkd-dhcp4.c
+++ b/src/network/networkd-dhcp4.c
@@ -24,7 +24,9 @@
 #include "dhcp-lease-internal.h"
 #include "hostname-util.h"
 #include "network-internal.h"
-#include "networkd.h"
+#include "networkd-link.h"
+#include "networkd-manager.h"
+#include "networkd-network.h"
 
 static int dhcp4_route_handler(sd_netlink *rtnl, sd_netlink_message *m,
                                void *userdata) {

diff --git a/src/network/networkd-dhcp6.c b/src/network/networkd-dhcp6.c
index 15acf56a5f167fba6bd58773982427155f99dc82..6ba2d170e793f5f69d84038cb103bc02a61e442e 100644 (file)
--- a/src/network/networkd-dhcp6.c
+++ b/src/network/networkd-dhcp6.c
@@ -23,7 +23,8 @@
 #include "sd-dhcp6-client.h"
 
 #include "network-internal.h"
-#include "networkd.h"
+#include "networkd-link.h"
+#include "networkd-manager.h"
 
 static int dhcp6_lease_address_acquired(sd_dhcp6_client *client, Link *link);
 
@@ -125,7 +126,6 @@ static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
 
         assert(link);
         assert(link->network);
-        assert(link->manager);
 
         if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
                 return;

diff --git a/src/network/networkd-fdb.c b/src/network/networkd-fdb.c
index ed5a47589e6a4abbe95483b4b6309dd6e0ec6743..3d7f4d2b2dbc6db330542599f846fac4805560ca 100644 (file)
--- a/src/network/networkd-fdb.c
+++ b/src/network/networkd-fdb.c
@@ -22,9 +22,10 @@
 
 #include "alloc-util.h"
 #include "conf-parser.h"
+#include "netdev/bridge.h"
 #include "netlink-util.h"
 #include "networkd-fdb.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "util.h"
 #include "vlan-util.h"
 

diff --git a/src/network/networkd-gperf.gperf b/src/network/networkd-gperf.gperf
index 3fdfe7495548140065688d25b0584d87966b1ee1..eca436d9fde4e61a0886a4a36b7eca82d7366136 100644 (file)
--- a/src/network/networkd-gperf.gperf
+++ b/src/network/networkd-gperf.gperf
@@ -2,6 +2,7 @@
 #include <stddef.h>
 #include "conf-parser.h"
 #include "networkd-conf.h"
+#include "networkd-manager.h"
 %}
 struct ConfigPerfItem;
 %null_strings

diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c
index 2d81311e8117b5dc848b6f919e3051b99be7a6cc..7ba05dbec30d51467e14c0d625bc4d231a51cc85 100644 (file)
--- a/src/network/networkd-ipv4ll.c
+++ b/src/network/networkd-ipv4ll.c
@@ -21,7 +21,9 @@
 #include <linux/if.h>
 
 #include "network-internal.h"
-#include "networkd.h"
+#include "networkd-address.h"
+#include "networkd-manager.h"
+#include "networkd-link.h"
 
 static int ipv4ll_address_lost(Link *link) {
         _cleanup_address_free_ Address *address = NULL;
@@ -171,7 +173,6 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
 
         assert(link);
         assert(link->network);
-        assert(link->manager);
 
         if (IN_SET(link->state, LINK_STATE_FAILED, LINK_STATE_LINGER))
                 return;

diff --git a/src/network/networkd-link-bus.c b/src/network/networkd-link-bus.c
index 532557ed6c5e628859b4e52b3d80ff6b0ba851b8..c39c64833484e01f0cea5ead5becd5b1f2abd954 100644 (file)
--- a/src/network/networkd-link-bus.c
+++ b/src/network/networkd-link-bus.c
@@ -20,7 +20,7 @@
 #include "alloc-util.h"
 #include "bus-util.h"
 #include "networkd-link.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "parse-util.h"
 #include "strv.h"
 

diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c
index bae75aca6fa5f51bdea823d0ee91d3987ab5f6e5..0b634572a9366b8fe449136f8029cfd16a18c153 100644 (file)
--- a/src/network/networkd-link.c
+++ b/src/network/networkd-link.c
@@ -29,8 +29,8 @@
 #include "netlink-util.h"
 #include "network-internal.h"
 #include "networkd-lldp-tx.h"
+#include "networkd-manager.h"
 #include "networkd-ndisc.h"
-#include "networkd.h"
 #include "set.h"
 #include "socket-util.h"
 #include "stdio-util.h"

diff --git a/src/network/networkd-lldp-tx.c b/src/network/networkd-lldp-tx.c
index 3aa768388b6e84ef53112f5d519e55e059722612..2de63ce7462791a0926d23ec1dc87fa8b673116c 100644 (file)
--- a/src/network/networkd-lldp-tx.c
+++ b/src/network/networkd-lldp-tx.c
@@ -26,7 +26,7 @@
 #include "fileio.h"
 #include "hostname-util.h"
 #include "networkd-lldp-tx.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "parse-util.h"
 #include "random-util.h"
 #include "socket-util.h"

diff --git a/src/network/networkd-manager-bus.c b/src/network/networkd-manager-bus.c
index 0c429b94714266aa20d1bad46e2f2e88a90e5b4f..cbb1b93031dfb397ce92fa6740bbed148f371846 100644 (file)
--- a/src/network/networkd-manager-bus.c
+++ b/src/network/networkd-manager-bus.c
@@ -19,7 +19,7 @@
 
 #include "alloc-util.h"
 #include "bus-util.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 
 static BUS_DEFINE_PROPERTY_GET_ENUM(property_get_operational_state, link_operstate, LinkOperationalState);
 

diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 9174dcc7f48c7f868ae325fdba8b867b395fb27a..a1252c9b5128a30352c5dd91485430d955873e90 100644 (file)
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -33,7 +33,7 @@
 #include "libudev-private.h"
 #include "local-addresses.h"
 #include "netlink-util.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "ordered-set.h"
 #include "path-util.h"
 #include "set.h"

diff --git a/src/network/networkd.h b/src/network/networkd-manager.h
similarity index 89%
rename from src/network/networkd.h
rename to src/network/networkd-manager.h
index 17063427daf729521ecbccbcc33fd9e4da103dc5..a90d9a933ff321267934cf4bf09df0b9d0d1d02d 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd-manager.h
@@ -32,20 +32,7 @@
 
 #include "networkd-address-pool.h"
 #include "networkd-link.h"
-#include "netdev/bond.h"
-#include "netdev/bridge.h"
-#include "netdev/dummy.h"
-#include "netdev/ipvlan.h"
-#include "netdev/macvlan.h"
-#include "netdev/tunnel.h"
-#include "netdev/tuntap.h"
-#include "netdev/veth.h"
-#include "netdev/vlan.h"
-#include "netdev/vrf.h"
-#include "netdev/vxlan.h"
-#include "netdev/vcan.h"
 #include "networkd-network.h"
-#include "networkd-util.h"
 
 extern const char* const network_dirs[];
 

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 4853791aa56e488d279e27be8e36b8e059949bd9..70283e5347ccdb304a639c2a2ed60b45a8a9a1d9 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -18,11 +18,12 @@
 ***/
 
 #include <netinet/icmp6.h>
+#include <arpa/inet.h>
 
 #include "sd-ndisc.h"
 
-#include "networkd.h"
 #include "networkd-ndisc.h"
+#include "networkd-route.h"
 
 #define NDISC_DNSSL_MAX 64U
 #define NDISC_RDNSS_MAX 64U

diff --git a/src/network/networkd-network-bus.c b/src/network/networkd-network-bus.c
index 6e21676d2311e5339cf7195cf9e9ab2c2a83ff0e..3b835b52f9a3a71ffa564c07c364a605a625a68d 100644 (file)
--- a/src/network/networkd-network-bus.c
+++ b/src/network/networkd-network-bus.c
@@ -18,7 +18,7 @@
 ***/
 
 #include "alloc-util.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 #include "string-util.h"
 #include "strv.h"
 

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 814f435fc10e71cc74adea58599e00360e447b6d..efd3176ac3dcf0867f31025fe55aac33df3734a6 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -1,8 +1,8 @@
 %{
 #include <stddef.h>
 #include "conf-parser.h"
-#include "networkd.h"
 #include "networkd-conf.h"
+#include "networkd-network.h"
 #include "network-internal.h"
 #include "vlan-util.h"
 %}

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 670d583e373830111443a6cf3d853804aae93ade..31e899eecd1b04a77d3d003c95bb4d674397dd71 100644 (file)
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -27,8 +27,8 @@
 #include "fd-util.h"
 #include "hostname-util.h"
 #include "network-internal.h"
+#include "networkd-manager.h"
 #include "networkd-network.h"
-#include "networkd.h"
 #include "parse-util.h"
 #include "set.h"
 #include "stat-util.h"

diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c
index 6f60ee5e31525a91e15b8f50b4ad042e50f73c5d..f78e1069913994f557db5dcd2beb84a639ebbab3 100644 (file)
--- a/src/network/networkd-route.c
+++ b/src/network/networkd-route.c
@@ -21,8 +21,8 @@
 #include "conf-parser.h"
 #include "in-addr-util.h"
 #include "netlink-util.h"
+#include "networkd-manager.h"
 #include "networkd-route.h"
-#include "networkd.h"
 #include "parse-util.h"
 #include "set.h"
 #include "string-util.h"

diff --git a/src/network/networkd.c b/src/network/networkd.c
index c8f81a2ca60c2686fe37282ecd9886b55a6567af..2851432efff709ca8491d1dbd4c70953b539d1c7 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -20,8 +20,8 @@
 #include "sd-daemon.h"
 
 #include "capability-util.h"
-#include "networkd.h"
 #include "networkd-conf.h"
+#include "networkd-manager.h"
 #include "signal-util.h"
 #include "user-util.h"
 

diff --git a/src/network/test-network-tables.c b/src/network/test-network-tables.c
index 77247c5771b4dcc187c614ea4759802990758d2a..eee91d11d2d12009eb274755f8db5e7e4b08b96d 100644 (file)
--- a/src/network/test-network-tables.c
+++ b/src/network/test-network-tables.c
@@ -3,8 +3,10 @@
 #include "ethtool-util.h"
 #include "netlink-internal.h"
 #include "netdev/bond.h"
+#include "netdev/ipvlan.h"
 #include "netdev/macvlan.h"
-#include "networkd.h"
+#include "networkd-link.h"
+#include "networkd-util.h"
 #include "test-tables.h"
 
 int main(int argc, char **argv) {

diff --git a/src/network/test-network.c b/src/network/test-network.c
index 855646173f61554a1402bb19f926add3e30c29f4..93184a7f88878368de8a35268aa709f2e84697d6 100644 (file)
--- a/src/network/test-network.c
+++ b/src/network/test-network.c
@@ -20,7 +20,7 @@
 #include "alloc-util.h"
 #include "dhcp-lease-internal.h"
 #include "network-internal.h"
-#include "networkd.h"
+#include "networkd-manager.h"
 
 static void test_deserialize_in_addr(void) {
         _cleanup_free_ struct in_addr *addresses = NULL;