diff options
| author | Chris Hall <GMCH@hestia.halldom.com> | 2010-04-17 16:50:23 +0100 |
|---|---|---|
| committer | Chris Hall <GMCH@hestia.halldom.com> | 2010-04-17 16:50:23 +0100 |
| commit | 31d9b6c31d949bf0e884d8a6e02939345b9816e1 (patch) | |
| tree | 7a6588c12a16f99b512232b77e86118837c646c4 /ospfd | |
| parent | 825f338d44433fc2d351c08d41272f52a15329db (diff) | |
| download | quagga-31d9b6c31d949bf0e884d8a6e02939345b9816e1.tar.bz2 quagga-31d9b6c31d949bf0e884d8a6e02939345b9816e1.tar.xz | |
Bring up to date with 0.99.16 release
This brings this branch up to date with 0.99.16, EXCEPT for the
change to bgpd to use monotonic clock for timing updates.
There are places where bgpd expects to find the actual time that
things happened... so this change is not though to be complete.
Further tidying in zebra, for FreeBSD.
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_lsdb.c | 1 | ||||
| -rw-r--r-- | ospfd/ospf_packet.c | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ospfd/ospf_lsdb.c b/ospfd/ospf_lsdb.c index 2e1bdedf..c906f052 100644 --- a/ospfd/ospf_lsdb.c +++ b/ospfd/ospf_lsdb.c @@ -75,7 +75,6 @@ ospf_lsdb_cleanup (struct ospf_lsdb *lsdb) static void lsdb_prefix_set (struct prefix_ls *lp, struct ospf_lsa *lsa) { - memset (lp, 0, sizeof (struct prefix_ls)); lp->family = 0; lp->prefixlen = 64; lp->id = lsa->data->id; diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index d8ff41d4..8045c659 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -1723,17 +1723,17 @@ ospf_ls_upd (struct ip *iph, struct ospf_header *ospfh, /* Reject from STUB or NSSA */ if (nbr->oi->area->external_routing != OSPF_AREA_DEFAULT) { - DISCARD_LSA (lsa, 1); if (IS_DEBUG_OSPF_NSSA) zlog_debug("Incoming External LSA Discarded: We are NSSA/STUB Area"); + DISCARD_LSA (lsa, 1); } if (lsa->data->type == OSPF_AS_NSSA_LSA) if (nbr->oi->area->external_routing != OSPF_AREA_NSSA) { - DISCARD_LSA (lsa,2); if (IS_DEBUG_OSPF_NSSA) zlog_debug("Incoming NSSA LSA Discarded: Not NSSA Area"); + DISCARD_LSA (lsa,2); } /* Find the LSA in the current database. */ @@ -1952,6 +1952,7 @@ ospf_ls_upd (struct ip *iph, struct ospf_header *ospfh, } } } +#undef DISCARD_LSA assert (listcount (lsas) == 0); list_delete (lsas); |