Both struct kroute and struct kroute6 are no longer used outside of
kroute.c. As a first step move the definitions over to that file.
More will follow :)
--
:wq Claudio
? obj
? test
? test.c
Index: bgpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.h,v
retrieving revision 1.434
diff -u -p -r1.434 bgpd.h
--- bgpd.h 22 Jun 2022 14:56:12 -0000 1.434
+++ bgpd.h 22 Jun 2022 14:57:42 -0000
@@ -690,28 +690,6 @@ struct kroute_full {
uint8_t priority;
};
-struct kroute {
- struct in_addr prefix;
- struct in_addr nexthop;
- uint32_t mplslabel;
- uint16_t flags;
- uint16_t labelid;
- u_short ifindex;
- uint8_t prefixlen;
- uint8_t priority;
-};
-
-struct kroute6 {
- struct in6_addr prefix;
- struct in6_addr nexthop;
- uint32_t mplslabel;
- uint16_t flags;
- uint16_t labelid;
- u_short ifindex;
- uint8_t prefixlen;
- uint8_t priority;
-};
-
struct kroute_nexthop {
struct bgpd_addr nexthop;
struct bgpd_addr gateway;
Index: kroute.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/kroute.c,v
retrieving revision 1.263
diff -u -p -r1.263 kroute.c
--- kroute.c 22 Jun 2022 14:56:12 -0000 1.263
+++ kroute.c 22 Jun 2022 14:57:42 -0000
@@ -54,6 +54,28 @@ struct {
uint8_t fib_prio;
} kr_state;
+struct kroute {
+ struct in_addr prefix;
+ struct in_addr nexthop;
+ uint32_t mplslabel;
+ uint16_t flags;
+ uint16_t labelid;
+ u_short ifindex;
+ uint8_t prefixlen;
+ uint8_t priority;
+};
+
+struct kroute6 {
+ struct in6_addr prefix;
+ struct in6_addr nexthop;
+ uint32_t mplslabel;
+ uint16_t flags;
+ uint16_t labelid;
+ u_short ifindex;
+ uint8_t prefixlen;
+ uint8_t priority;
+};
+
struct kroute_node {
RB_ENTRY(kroute_node) entry;
struct kroute r;
