From: Christian Franke <chris@opensourcerouting.org>
Date: Wed, 20 Feb 2013 10:00:53 +0000 (+0000)
Subject: ospfd: fix LSA initialization for build without opaque LSA
X-Git-Tag: frr-2.0-rc1~1675
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=58952492d2eedd4b7974274a578a1fa9707125bb;p=matthieu%2Ffrr.git

ospfd: fix LSA initialization for build without opaque LSA

If configured without opaque LSA support, the old code would incorrectly
associate type 5 LSAs with an area.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
---

diff --git a/ospfd/ospf_packet.c b/ospfd/ospf_packet.c
index 9a4587d962..d3f1b5635f 100644
--- a/ospfd/ospf_packet.c
+++ b/ospfd/ospf_packet.c
@@ -1660,8 +1660,10 @@ ospf_ls_upd_list_lsa (struct ospf_neighbor *nbr, struct stream *s,
         case OSPF_AS_EXTERNAL_LSA:
 #ifdef HAVE_OPAQUE_LSA
         case OSPF_OPAQUE_AS_LSA:
+#endif /* HAVE_OPAQUE_LSA */
           lsa->area = NULL;
           break;
+#ifdef HAVE_OPAQUE_LSA
         case OSPF_OPAQUE_LINK_LSA:
           lsa->oi = oi; /* Remember incoming interface for flooding control. */
           /* Fallthrough */