There is no need to use F_KERNEL to tag routes from the kernel.
All this can be done by priority (RTP_MINE vs anything else).
The conversion is simple in most cases.
In kr_fib_delete() and kr_fib_change() check if the route is a bgpd owned
route and in that case remove the F_BGPD_INSERTED flag. The original route
is no longer in the FIB and so that flag should be cleared.
--
:wq Claudio
Index: bgpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.c,v
retrieving revision 1.249
diff -u -p -r1.249 bgpd.c
--- bgpd.c 20 Jul 2022 12:43:27 -0000 1.249
+++ bgpd.c 22 Jul 2022 08:10:01 -0000
@@ -1119,7 +1119,7 @@ int
bgpd_filternexthop(struct kroute_full *kf)
{
/* kernel routes are never filtered */
- if (kf->flags & F_KERNEL && kf->prefixlen != 0)
+ if (kf->priority != RTP_MINE && kf->prefixlen != 0)
return (0);
if (cflags & BGPD_FLAG_NEXTHOP_BGP) {
Index: bgpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.h,v
retrieving revision 1.442
diff -u -p -r1.442 bgpd.h
--- bgpd.h 20 Jul 2022 12:43:27 -0000 1.442
+++ bgpd.h 22 Jul 2022 08:15:45 -0000
@@ -54,6 +54,8 @@
#define MAX_RTSOCK_BUF (2 * 1024 * 1024)
#define MAX_COMM_MATCH 3
+#define RTP_MINE 0xff /* internal route
priority */
+
#define BGPD_OPT_VERBOSE 0x0001
#define BGPD_OPT_VERBOSE2 0x0002
#define BGPD_OPT_NOACTION 0x0004
@@ -74,12 +76,11 @@
#define SOCKET_NAME "/var/run/bgpd.sock"
#define F_BGPD 0x0001
-#define F_KERNEL 0x0002
+#define F_BGPD_INSERTED 0x0002
#define F_CONNECTED 0x0004
#define F_NEXTHOP 0x0008
#define F_DOWN 0x0010
#define F_STATIC 0x0020
-#define F_BGPD_INSERTED 0x0040
#define F_REJECT 0x0080
#define F_BLACKHOLE 0x0100
#define F_LONGER 0x0200
Index: kroute.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/kroute.c,v
retrieving revision 1.276
diff -u -p -r1.276 kroute.c
--- kroute.c 21 Jul 2022 10:22:43 -0000 1.276
+++ kroute.c 22 Jul 2022 09:12:06 -0000
@@ -42,8 +42,6 @@
#include "bgpd.h"
#include "log.h"
-#define RTP_MINE 0xff
-
struct ktable **krt;
u_int krt_size;
@@ -1339,7 +1337,7 @@ kr_redistribute(int type, struct ktable
return;
}
- if (!(kf->flags & F_KERNEL))
+ if (kf->priority == RTP_MINE)
return;
switch (kf->prefix.aid) {
@@ -1760,8 +1758,7 @@ kroute_insert(struct ktable *kt, struct
krm->next = kr;
}
- if ((kr->flags & (F_KERNEL | F_CONNECTED)) ==
- (F_KERNEL | F_CONNECTED))
+ if (kf->priority != RTP_MINE && kf->flags & F_CONNECTED)
if (kif_kr_insert(kr) == -1)
return (-1);
@@ -1801,8 +1798,7 @@ kroute_insert(struct ktable *kt, struct
kr6m->next = kr6;
}
- if ((kr6->flags & (F_KERNEL | F_CONNECTED)) ==
- (F_KERNEL | F_CONNECTED))
+ if (kf->priority != RTP_MINE && kf->flags & F_CONNECTED)
if (kif_kr6_insert(kr6) == -1)
return (-1);
@@ -1813,7 +1809,7 @@ kroute_insert(struct ktable *kt, struct
}
/* XXX this is wrong for nexthop validated via BGP */
- if (kf->flags & F_KERNEL) {
+ if (kf->priority != RTP_MINE) {
RB_FOREACH(h, knexthop_tree, KT2KNT(kt))
if (prefix_compare(&kf->prefix, &h->nexthop,
kf->prefixlen) == 0)
@@ -1873,7 +1869,7 @@ kroute_remove(struct ktable *kt, struct
if (s->kroute == kr)
knexthop_validate(kt, s);
- if (kr->flags & F_KERNEL && kr == krm && kr->next == NULL)
+ if (kr->priority != RTP_MINE && kr == krm && kr->next == NULL)
/* again remove only once */
kr_redistribute(IMSG_NETWORK_REMOVE, kt, kr_tofull(kr));
@@ -1991,7 +1987,7 @@ kroute6_remove(struct ktable *kt, struct
if (s->kroute == kr)
knexthop_validate(kt, s);
- if (kr->flags & F_KERNEL && kr == krm && kr->next == NULL)
+ if (kr->priority != RTP_MINE && kr == krm && kr->next == NULL)
/* again remove only once */
kr_redistribute(IMSG_NETWORK_REMOVE, kt, kr6_tofull(kr));
@@ -3186,7 +3182,6 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
}
memset(kf, 0, sizeof(*kf));
- kf->flags = F_KERNEL;
if (rtm->rtm_flags & RTF_STATIC)
kf->flags |= F_STATIC;
@@ -3195,7 +3190,12 @@ dispatch_rtmsg_addr(struct rt_msghdr *rt
if (rtm->rtm_flags & RTF_REJECT)
kf->flags |= F_REJECT;
- kf->priority = rtm->rtm_priority;
+ /* adjust priority here */
+ if (rtm->rtm_priority == kr_state.fib_prio)
+ kf->priority = RTP_MINE;
+ else
+ kf->priority = rtm->rtm_priority;
+
label = (struct sockaddr_rtlabel *)rti_info[RTAX_LABEL];
if (label != NULL)
if (strlcpy(kf->label, label->sr_label, sizeof(kf->label)) >=
@@ -3265,9 +3265,6 @@ kr_fib_delete(struct ktable *kt, struct
if ((kr = kroute_find(kt, &kf->prefix, kf->prefixlen,
kf->priority)) == NULL)
return (0);
- if (!(kr->flags & F_KERNEL))
- return (0);
-
if (mpath) {
/* get the correct route */
if ((kr = kroute_matchgw(kr, &kf->nexthop)) == NULL) {
@@ -3276,6 +3273,10 @@ kr_fib_delete(struct ktable *kt, struct
return (0);
}
}
+ if (kf->priority == RTP_MINE) {
+ kr->flags &= ~F_BGPD_INSERTED;
+ return (0);
+ }
if (kroute_remove(kt, kr) == -1)
return (-1);
break;
@@ -3283,9 +3284,6 @@ kr_fib_delete(struct ktable *kt, struct
if ((kr6 = kroute6_find(kt, &kf->prefix, kf->prefixlen,
kf->priority)) == NULL)
return (0);
- if (!(kr6->flags & F_KERNEL))
- return (0);
-
if (mpath) {
/* get the correct route */
if ((kr6 = kroute6_matchgw(kr6, &kf->nexthop)) ==
@@ -3295,6 +3293,10 @@ kr_fib_delete(struct ktable *kt, struct
return (0);
}
}
+ if (kf->priority == RTP_MINE) {
+ kr6->flags &= ~F_BGPD_INSERTED;
+ return (0);
+ }
if (kroute6_remove(kt, kr6) == -1)
return (-1);
break;
@@ -3316,7 +3318,7 @@ kr_fib_change(struct ktable *kt, struct
case AID_INET:
if ((kr = kroute_find(kt, &kf->prefix, kf->prefixlen,
kf->priority)) != NULL) {
- if (kr->flags & F_KERNEL) {
+ if (kf->priority != RTP_MINE) {
/* get the correct route */
if (mpath && type == RTM_CHANGE &&
(kr = kroute_matchgw(kr, &kf->nexthop)) ==
@@ -3374,6 +3376,8 @@ kr_fib_change(struct ktable *kt, struct
}
if (kr->flags & F_NEXTHOP && changed)
knexthop_track(kt, kr);
+ } else {
+ kr->flags &= ~F_BGPD_INSERTED;
}
} else {
add4:
@@ -3383,7 +3387,7 @@ add4:
case AID_INET6:
if ((kr6 = kroute6_find(kt, &kf->prefix, kf->prefixlen,
kf->priority)) != NULL) {
- if (kr6->flags & F_KERNEL) {
+ if (kf->priority != RTP_MINE) {
/* get the correct route */
if (mpath && type == RTM_CHANGE &&
(kr6 = kroute6_matchgw(kr6, &kf->nexthop))
@@ -3449,6 +3453,8 @@ add4:
if (kr6->flags & F_NEXTHOP && changed)
knexthop_track(kt, kr6);
+ } else {
+ kr6->flags &= ~F_BGPD_INSERTED;
}
} else {
add6:
Index: rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.c,v
retrieving revision 1.555
diff -u -p -r1.555 rde.c
--- rde.c 19 Jul 2022 10:26:19 -0000 1.555
+++ rde.c 22 Jul 2022 08:13:30 -0000
@@ -4256,7 +4256,6 @@ network_dump_upcall(struct rib_entry *re
memcpy(&kf.nexthop, &prefix_nexthop(p)->true_nexthop,
sizeof(kf.nexthop));
kf.prefixlen = p->pt->prefixlen;
- kf.flags = F_KERNEL;
if ((asp->flags & F_ANN_DYNAMIC) == 0)
kf.flags = F_STATIC;
if (imsg_compose(ibuf_se_ctl, IMSG_CTL_SHOW_NETWORK, 0,
