From: Paul Jakma <paul@jakma.org>
Date: Thu, 14 Jan 2010 13:26:12 +0000 (+0300)
Subject: ospfd: Fix debug messages that were masked by DISCARD_LSA
X-Git-Tag: frr-2.0-rc1~2167
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=2cd754de60210748e61069fed2c9d4086d24c21e;p=mirror%2Ffrr.git

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.
---

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 8f61ed1a0e..1066e64fb7 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);
 }