*: auto-convert to SPDX License IDs

[mirror_frr.git] / bfdd / bfdd_nb_state.c

diff --git a/bfdd/bfdd_nb_state.c b/bfdd/bfdd_nb_state.c
index 043f850afa179a343fe18ceb291f5fb48588b478..12acda8fd8a62683bdf97c0dd24a88179835fd8b 100644 (file)
--- a/bfdd/bfdd_nb_state.c
+++ b/bfdd/bfdd_nb_state.c
@@ -1,23 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * BFD daemon northbound implementation.
  *
  * Copyright (C) 2019 Network Device Education Foundation, Inc. ("NetDEF")
  *                    Rafael Zalamena
- *
- * 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; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301 USA.
  */
 
 #include <zebra.h>
@@ -351,9 +337,8 @@ int bfdd_bfd_sessions_multi_hop_get_keys(struct nb_cb_get_keys_args *args)
        args->keys->num = 4;
        strlcpy(args->keys->key[0], srcbuf, sizeof(args->keys->key[0]));
        strlcpy(args->keys->key[1], dstbuf, sizeof(args->keys->key[1]));
-       strlcpy(args->keys->key[2], bs->key.ifname, sizeof(args->keys->key[2]));
-       strlcpy(args->keys->key[3], bs->key.vrfname,
-               sizeof(args->keys->key[3]));
+       strlcpy(args->keys->key[2], bs->key.vrfname,
+               sizeof(args->keys->key[2]));
 
        return NB_OK;
 }
@@ -363,14 +348,13 @@ bfdd_bfd_sessions_multi_hop_lookup_entry(struct nb_cb_lookup_entry_args *args)
 {
        const char *source_addr = args->keys->key[0];
        const char *dest_addr = args->keys->key[1];
-       const char *ifname = args->keys->key[2];
-       const char *vrf = args->keys->key[3];
+       const char *vrf = args->keys->key[2];
        struct sockaddr_any psa, lsa;
        struct bfd_key bk;
 
        strtosa(dest_addr, &psa);
        strtosa(source_addr, &lsa);
-       gen_bfd_key(&bk, &psa, &lsa, true, ifname, vrf);
+       gen_bfd_key(&bk, &psa, &lsa, true, NULL, vrf);
 
        return bfd_key_lookup(bk);
 }