ospfd: fix wrong NSSA debug guards

Fix usage of NSSA debug guards in code paths that have nothing to
do with NSSA areas.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>

diff --git a/ospfd/ospf_flood.c b/ospfd/ospf_flood.c
index 7eb587899b8d41691aeb6bb46edf9f065659b3fa..6c1ac6761af8f525bb9035015be23a2e37302251 100644 (file)
--- a/ospfd/ospf_flood.c
+++ b/ospfd/ospf_flood.c
@@ -597,7 +597,7 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
                   Designated Router, chances are that all the neighbors have
                   received the LSA already. */
                if (NBR_IS_DR(inbr) || NBR_IS_BDR(inbr)) {
-                       if (IS_DEBUG_OSPF_NSSA)
+                       if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))
                                zlog_debug("%s: DR/BDR NOT SEND to int %s (%s)",
                                           __func__, IF_NAME(oi),
                                           ospf_get_name(oi->ospf));
@@ -611,7 +611,7 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
                   end up retransmitting the updates. */
 
                if (oi->state == ISM_Backup) {
-                       if (IS_DEBUG_OSPF_NSSA)
+                       if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))
                                zlog_debug(
                                        "%s: ISM_Backup NOT SEND to int %s (%s)",
                                        __func__, IF_NAME(oi),
@@ -626,8 +626,7 @@ static int ospf_flood_through_interface(struct ospf_interface *oi,
           (which       must be > 0) when it is copied into the outgoing Link
           State Update packet (until the LS age field reaches the maximum
           value of MaxAge). */
-       /* XXX HASSO: Is this IS_DEBUG_OSPF_NSSA really correct? */
-       if (IS_DEBUG_OSPF_NSSA)
+       if (IS_DEBUG_OSPF(lsa, LSA_FLOODING))
                zlog_debug("%s: DR/BDR sending upd to int %s (%s)", __func__,
                           IF_NAME(oi), ospf_get_name(oi->ospf));
 

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 2ba5b3796dd46a2be0dd1fc2bf595bc23234b0cc..580eee13cf0815117d1934f5f9030c7caddf25fd 100644 (file)
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1890,7 +1890,7 @@ static void ospf_ls_upd(struct ospf *ospf, struct ip *iph,
                struct ospf_lsa *ls_ret, *current;
                int ret = 1;
 
-               if (IS_DEBUG_OSPF_NSSA)
+               if (IS_DEBUG_OSPF(lsa, LSA))
                        zlog_debug("LSA Type-%d from %pI4, ID: %pI4, ADV: %pI4",
                                   lsa->data->type, &ospfh->router_id,
                                   &lsa->data->id, &lsa->data->adv_router);