proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 20:13:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: fix wrong NSSA debug guards

Browse Source 
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>
This commit is contained in:
Renato Westphal 2021-05-31 10:27:51 -03:00
parent 98cb53f96a
commit 231af0a5d6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ospfd/ospf_flood.c
View File

@ -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));

2
ospfd/ospf_packet.c
View File

@ -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);