Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / nhrpd / nhrp_errors.c

diff --git a/nhrpd/nhrp_errors.c b/nhrpd/nhrp_errors.c
index 71ec211136b066b46abff0a34b073bb3d585937b..12ad7c6b68bd3c8a98941e8c65ed9e6a31e3adba 100644 (file)
--- a/nhrpd/nhrp_errors.c
+++ b/nhrpd/nhrp_errors.c
@@ -1,21 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * NHRP-specific error messages.
  * Copyright (C) 2018 Cumulus Networks, Inc.
  *               Donald Sharp
- *
- * 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
  */
 
 #include <zebra.h>
@@ -24,19 +11,13 @@
 #include "nhrp_errors.h"
 
 /* clang-format off */
-static struct ferr_ref ferr_nhrp_err[] = {
+static struct log_ref ferr_nhrp_err[] = {
        {
-               .code = NHRP_ERR_SWAN,
+               .code = EC_NHRP_SWAN,
                .title = "NHRP Strong Swan Error",
                .description = "NHRP has detected a error with the Strongswan code",
                .suggestion = "Ensure that StrongSwan is configured correctly.  Restart StrongSwan and FRR"
        },
-       {
-               .code = NHRP_ERR_RESOLVER,
-               .title = "NHRP DNS Resolution",
-               .description = "NHRP has detected an error in an attempt to resolve a hostname",
-               .suggestion = "Ensure that DNS is working properly and the hostname is configured in dns.  If you are still seeing this error, open an issue"
-       },
        {
                .code = END_FERR,
        }
@@ -45,7 +26,5 @@ static struct ferr_ref ferr_nhrp_err[] = {
 
 void nhrp_error_init(void)
 {
-       ferr_ref_init();
-
-       ferr_ref_add(ferr_nhrp_err);
+       log_ref_add(ferr_nhrp_err);
 }