From: Denis Ovsienko <infrastation@yandex.ru>
Date: Sun, 18 Dec 2011 12:27:02 +0000 (+0400)
Subject: ospfd: fix bug in NSSA ABR status check
X-Git-Tag: frr-2.0-rc1~1940
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=4e677f52db2276b92bcc201b4379a66a83d45caa;p=mirror%2Ffrr.git

ospfd: fix bug in NSSA ABR status check

* ospf_abr.c
  * ospf_abr_nssa_am_elected(): feed "best" instead of "address of best"
    into IPV4_ADDR_CMP(), because "best" is a pointer; also, mean s_addr
    field of the structures to get better typed pointers
---

diff --git a/ospfd/ospf_abr.c b/ospfd/ospf_abr.c
index 846b90df4d..b7cc20dd87 100644
--- a/ospfd/ospf_abr.c
+++ b/ospfd/ospf_abr.c
@@ -384,7 +384,7 @@ ospf_abr_nssa_am_elected (struct ospf_area *area)
       if (best == NULL)
       	best = &lsa->data->id;
       else
-        if ( IPV4_ADDR_CMP (&best, &lsa->data->id) < 0)
+        if (IPV4_ADDR_CMP (&best->s_addr, &lsa->data->id.s_addr) < 0)
           best = &lsa->data->id;
     }
     
@@ -395,7 +395,7 @@ ospf_abr_nssa_am_elected (struct ospf_area *area)
     if (best == NULL)
       return 1;
     
-    if ( IPV4_ADDR_CMP (&best, &area->ospf->router_id) < 0)
+    if (IPV4_ADDR_CMP (&best->s_addr, &area->ospf->router_id.s_addr) < 0)
       return 1;
     else
       return 0;