Browse Source

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.
Paul Jakma 12 years ago
parent
commit
2cd754de60
1 changed files with 4 additions and 3 deletions
  1. 4 3
      ospfd/ospf_packet.c

+ 4 - 3
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);
 }