*: auto-convert to SPDX License IDs

[mirror_frr.git] / nhrpd / nhrp_route.c

diff --git a/nhrpd/nhrp_route.c b/nhrpd/nhrp_route.c
index 76e0978cb6b6d6b008b341d9cb873ab99aa4daef..bf7ba5f650bb8d93f3e0cb2b1010af436e5c2030 100644 (file)
--- a/nhrpd/nhrp_route.c
+++ b/nhrpd/nhrp_route.c
@@ -1,10 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /* NHRP routing functions
  * Copyright (c) 2014-2015 Timo Teräs
- *
- * This file is free software: you may copy, redistribute 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.
  */
 
 #ifdef HAVE_CONFIG_H
@@ -139,7 +135,17 @@ void nhrp_route_announce(int add, enum nhrp_cache_type type,
                /* Regular route, so these are announced
                 * to other routing daemons */
                break;
-       default:
+       case NHRP_CACHE_INVALID:
+       case NHRP_CACHE_INCOMPLETE:
+               /*
+                * I cannot believe that we want to set a FIB_OVERRIDE
+                * for invalid state or incomplete.  But this matches
+                * the original code.  Someone will probably notice
+                * the problem eventually
+                */
+       case NHRP_CACHE_CACHED:
+       case NHRP_CACHE_LOCAL:
+       case NHRP_CACHE_NUM_TYPES:
                SET_FLAG(api.flags, ZEBRA_FLAG_FIB_OVERRIDE);
                break;
        }
@@ -408,9 +414,7 @@ void nhrp_send_zebra_configure_arp(struct interface *ifp, int family)
        }
        s = zclient->obuf;
        stream_reset(s);
-       zclient_create_header(s,
-                             ZEBRA_CONFIGURE_ARP,
-                             ifp->vrf_id);
+       zclient_create_header(s, ZEBRA_CONFIGURE_ARP, ifp->vrf->vrf_id);
        stream_putc(s, family);
        stream_putl(s, ifp->ifindex);
        stream_putw_at(s, 0, stream_get_endp(s));
@@ -433,9 +437,7 @@ void nhrp_send_zebra_gre_source_set(struct interface *ifp,
        }
        s = zclient->obuf;
        stream_reset(s);
-       zclient_create_header(s,
-                             ZEBRA_GRE_SOURCE_SET,
-                             ifp->vrf_id);
+       zclient_create_header(s, ZEBRA_GRE_SOURCE_SET, ifp->vrf->vrf_id);
        stream_putl(s, ifp->ifindex);
        stream_putl(s, link_idx);
        stream_putl(s, link_vrf_id);