diff options
| author | Paul Jakma <paul@jakma.org> | 2010-01-14 16:26:12 +0300 |
|---|---|---|
| committer | Denis Ovsienko <infrastation@yandex.ru> | 2010-01-14 16:26:12 +0300 |
| commit | 2cd754de60210748e61069fed2c9d4086d24c21e (patch) | |
| tree | 1f9ef18fb413e0d786623eb857eea894a9900ff9 /ospfd | |
| parent | efbbcaf1aea686d118019514dcde92b13c92b0fc (diff) | |
ospfd: Fix debug messages that were masked by DISCARD_LSA
* ospf_packet.c: (ospf_ls_upd) DISCARD_LSA continues, and so should be
after debug messages, not before them.
Diffstat (limited to 'ospfd')
| -rw-r--r-- | ospfd/ospf_packet.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c index 8f61ed1a..1066e64f 100644 --- a/ospfd/ospf_packet.c +++ b/ospfd/ospf_packet.c @@ -1724,17 +1724,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. */ @@ -1953,7 +1953,8 @@ ospf_ls_upd (struct ip *iph, struct ospf_header *ospfh, } } } - +#undef DISCARD_LSA + assert (listcount (lsas) == 0); list_delete (lsas); } |