Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / ospfd / ospf_sr.c

diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c
index 2c7c80686cfd6bacf1b21627616f3a7490544648..adb14ec6b1478ce9173e58dfe118c938fa77bcb5 100644 (file)
--- a/ospfd/ospf_sr.c
+++ b/ospfd/ospf_sr.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * This is an implementation of Segment Routing
  * as per RFC 8665 - OSPF Extensions for Segment Routing
@@ -9,20 +10,6 @@
  * Author: Anselme Sawadogo <anselmesawadogo@gmail.com>
  *
  * Copyright (C) 2016 - 2020 Orange Labs http://www.orange.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #ifdef HAVE_CONFIG_H
@@ -756,13 +743,14 @@ static struct ospf_neighbor *get_neighbor_by_addr(struct ospf *top,
        for (ALL_LIST_ELEMENTS_RO(top->oiflist, node, oi))
                for (rn = route_top(oi->nbrs); rn; rn = route_next(rn)) {
                        nbr = rn->info;
-                       if (nbr)
-                               if (IPV4_ADDR_SAME(&nbr->address.u.prefix4,
-                                                  &addr)
-                                   || IPV4_ADDR_SAME(&nbr->router_id, &addr)) {
-                                       route_unlock_node(rn);
-                                       return nbr;
-                               }
+                       if (!nbr)
+                               continue;
+
+                       if (IPV4_ADDR_SAME(&nbr->address.u.prefix4, &addr) ||
+                           IPV4_ADDR_SAME(&nbr->router_id, &addr)) {
+                               route_unlock_node(rn);
+                               return nbr;
+                       }
                }
        return NULL;
 }