summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpaul <paul>2007-06-14 11:17:58 +0000
committerpaul <paul>2007-06-14 11:17:58 +0000
commitda5c00d3c3ee4e140af507cbffe1f1d01dada4b4 (patch)
treea9bf7adc72973159ee67cb4fa855f2a36e61213e
parent4616b4afc9d5ec51024e765972cfae4be41116fd (diff)
downloadquagga-da5c00d3c3ee4e140af507cbffe1f1d01dada4b4.tar.bz2
quagga-da5c00d3c3ee4e140af507cbffe1f1d01dada4b4.tar.xz
[bgpd] bug #370, default-originate was broken by a silly thinko
2007-05-25 Paul Jakma <paul.jakma@sun.com> * bgp_route.c: (bgp_default_originate) Sanity check added previously was broken and always failed, thus this function never could run, bug #370.
-rw-r--r--bgpd/ChangeLog6
-rw-r--r--bgpd/bgp_route.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/bgpd/ChangeLog b/bgpd/ChangeLog
index ed606494..b2191d48 100644
--- a/bgpd/ChangeLog
+++ b/bgpd/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-25 Paul Jakma <paul.jakma@sun.com>
+
+ * bgp_route.c: (bgp_default_originate) Sanity check added
+ previously was broken and always failed, thus this function
+ never could run, bug #370.
+
2007-05-03 Paul Jakma <paul.jakma@sun.com>
* bgp_route.h: (struct info) Move less frequently used
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index db0f3a74..1c0e6f1a 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -2370,7 +2370,7 @@ bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
struct peer *from;
int ret = RMAP_DENYMATCH;
- if (afi != AFI_IP || afi != AFI_IP6)
+ if (!(afi == AFI_IP || afi == AFI_IP6))
return;
bgp = peer->bgp;