proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-03 19:26:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nhrpd: NHRP_[ERR|WARN] -> EC_NHRP

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-09-13 18:59:07 +00:00
parent cf444bcf40
commit 2b84a521e7
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nhrpd/nhrp_errors.c
View File

@ -26,13 +26,13 @@
/* clang-format off */
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,
.code = EC_NHRP_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"

4
nhrpd/nhrp_errors.h
View File

@ -24,8 +24,8 @@
#include "lib/ferr.h"
enum nhrp_log_refs {
NHRP_ERR_SWAN = NHRP_FERR_START,
NHRP_ERR_RESOLVER,
EC_NHRP_SWAN = NHRP_FERR_START,
EC_NHRP_RESOLVER,
};
extern void nhrp_error_init(void);

2
nhrpd/resolver.c
View File

@ -198,7 +198,7 @@ void resolver_resolve(struct resolver_query *query, int af,
union sockunion *))
{
if (query->callback != NULL) {
flog_err(NHRP_ERR_RESOLVER,
flog_err(EC_NHRP_RESOLVER,
"Trying to resolve '%s', but previous query was not finished yet",
hostname);
return;

8
nhrpd/vici.c
View File

@ -218,7 +218,7 @@ static void parse_sa_message(struct vici_message_ctx *ctx,
if (str2sockunion(buf,
&sactx->local.host)
< 0)
flog_err(NHRP_ERR_SWAN,
flog_err(EC_NHRP_SWAN,
"VICI: bad strongSwan local-host: %s",
buf);
} else if (blob_equal(key, "local-id")
@ -236,7 +236,7 @@ static void parse_sa_message(struct vici_message_ctx *ctx,
if (str2sockunion(buf,
&sactx->remote.host)
< 0)
flog_err(NHRP_ERR_SWAN,
flog_err(EC_NHRP_SWAN,
"VICI: bad strongSwan remote-host: %s",
buf);
} else if (blob_equal(key, "remote-id")
@ -281,7 +281,7 @@ static void parse_cmd_response(struct vici_message_ctx *ctx,
case VICI_KEY_VALUE:
if (blob_equal(key, "errmsg")
&& blob2buf(val, buf, sizeof(buf)))
flog_err(NHRP_ERR_SWAN, "VICI: strongSwan: %s", buf);
flog_err(EC_NHRP_SWAN, "VICI: strongSwan: %s", buf);
break;
default:
break;
@ -340,7 +340,7 @@ static void vici_recv_message(struct vici_conn *vici, struct zbuf *msg)
break;
case VICI_EVENT_UNKNOWN:
case VICI_CMD_UNKNOWN:
flog_err(NHRP_ERR_SWAN,
flog_err(EC_NHRP_SWAN,
"VICI: StrongSwan does not support mandatory events (unpatched?)");
break;
case VICI_EVENT_CONFIRM: