network: cleanup networkd-route.h

src/network/networkd-ndisc.c

@@ -12,7 +12,6 @@
 #include "networkd-dhcp6.h"
 #include "networkd-manager.h"
 #include "networkd-ndisc.h"
-#include "networkd-route.h"
 #include "string-table.h"
 #include "string-util.h"
 #include "strv.h"

src/network/networkd-network-gperf.gperf

@@ -22,6 +22,7 @@ _Pragma("GCC diagnostic ignored \"-Wimplicit-fallthrough\"")
 #include "networkd-neighbor.h"
 #include "networkd-nexthop.h"
 #include "networkd-radv.h"
+#include "networkd-route.h"
 #include "networkd-routing-policy-rule.h"
 #include "networkd-sriov.h"
 #include "qdisc.h"

src/network/networkd-network.h

@@ -22,7 +22,6 @@
 #include "networkd-lldp-tx.h"
 #include "networkd-ndisc.h"
 #include "networkd-radv.h"
-#include "networkd-route.h"
 #include "networkd-util.h"
 #include "ordered-set.h"
 #include "resolve-util.h"

src/network/networkd-route.c

@@ -3,18 +3,14 @@
 #include <linux/icmpv6.h>
 
 #include "alloc-util.h"
-#include "conf-parser.h"
-#include "in-addr-util.h"
-#include "missing_network.h"
 #include "netlink-util.h"
 #include "networkd-ipv4ll.h"
 #include "networkd-manager.h"
-#include "networkd-ndisc.h"
+#include "networkd-network.h"
 #include "networkd-nexthop.h"
 #include "networkd-route.h"
 #include "networkd-routing-policy-rule.h"
 #include "parse-util.h"
-#include "set.h"
 #include "socket-netlink.h"
 #include "string-table.h"
 #include "string-util.h"

src/network/networkd-route.h

@@ -1,15 +1,20 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #pragma once
 
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdio.h>
+
+#include "sd-netlink.h"
+
 #include "conf-parser.h"
-#include "macro.h"
-
-typedef struct Route Route;
-typedef struct NetworkConfigSection NetworkConfigSection;
-
-#include "networkd-network.h"
+#include "in-addr-util.h"
+#include "networkd-link.h"
 #include "networkd-util.h"
 
+typedef struct Manager Manager;
+typedef struct Network Network;
+
 typedef struct MultipathRouteVia {
         uint16_t family;
         union in_addr_union address;
@@ -21,7 +26,7 @@ typedef struct MultipathRoute {
         uint32_t weight;
 } MultipathRoute;
 
-struct Route {
+typedef struct Route {
         Network *network;
         NetworkConfigSection *section;
 
@@ -58,7 +63,7 @@ struct Route {
 
         usec_t lifetime;
         sd_event_source *expire;
-};
+} Route;
 
 void route_hash_func(const Route *route, struct siphash *state);
 int route_compare_func(const Route *a, const Route *b);