diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-03-08 13:49:08 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2006-03-08 13:49:08 +0000 |
| commit | f7727d2fcdbe449f7d6b4be393220a427c3bbcab (patch) | |
| tree | 7b017aa12f9ec85625241325a41f8ba2f5c5c5e4 /usr.sbin/ospfd/ospfd.h | |
| parent | cbda4665a87328ce8644ec7f8dd638a2788e91af (diff) | |
Fix logic of the kroute code. First of all there was a porblem if a prefix
is known via kernel and ospf. If the kernel route is removed the ospf one
was not added to the FIB. This is an uncommon event so it is OK to request
an update from the RIB in this case.
Additionally ospfd treated bgpd inserted routes like static routes. This
is wrong because IGP routes habe a higher preference over EGP routes. In
this case a bgpd route needs to be overridden by a ospfd one.
With these to fixes bgpd and ospfd start to play nicely together.
OK norby@
Diffstat (limited to 'usr.sbin/ospfd/ospfd.h')
| -rw-r--r-- | usr.sbin/ospfd/ospfd.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/ospfd/ospfd.h b/usr.sbin/ospfd/ospfd.h index 59d729fd377..e14cf91eb2a 100644 --- a/usr.sbin/ospfd/ospfd.h +++ b/usr.sbin/ospfd/ospfd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ospfd.h,v 1.46 2006/02/24 21:06:47 norby Exp $ */ +/* $OpenBSD: ospfd.h,v 1.47 2006/03/08 13:49:07 claudio Exp $ */ /* * Copyright (c) 2004 Esben Norby <norby@openbsd.org> @@ -48,11 +48,11 @@ #define F_OSPFD_INSERTED 0x0001 #define F_KERNEL 0x0002 -#define F_CONNECTED 0x0004 +#define F_BGPD_INSERTED 0x0004 +#define F_CONNECTED 0x0008 #define F_DOWN 0x0010 #define F_STATIC 0x0020 #define F_DYNAMIC 0x0040 -#define F_LONGER 0x0080 #define F_REDISTRIBUTED 0x0100 #define REDISTRIBUTE_STATIC 0x01 @@ -119,6 +119,7 @@ enum imsg_type { IMSG_CTL_END, IMSG_KROUTE_CHANGE, IMSG_KROUTE_DELETE, + IMSG_KROUTE_GET, IMSG_IFINFO, IMSG_NEIGHBOR_UP, IMSG_NEIGHBOR_DOWN, |