diff options
Diffstat (limited to 'nhrpd')
| -rw-r--r-- | nhrpd/nhrp_errors.c | 4 | ||||
| -rw-r--r-- | nhrpd/nhrp_errors.h | 4 | ||||
| -rw-r--r-- | nhrpd/resolver.c | 7 | ||||
| -rw-r--r-- | nhrpd/vici.c | 19 |
4 files changed, 19 insertions, 15 deletions
diff --git a/nhrpd/nhrp_errors.c b/nhrpd/nhrp_errors.c index c557ba8a66..4c4f55be9e 100644 --- a/nhrpd/nhrp_errors.c +++ b/nhrpd/nhrp_errors.c @@ -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" diff --git a/nhrpd/nhrp_errors.h b/nhrpd/nhrp_errors.h index c9e947eb2a..593714786a 100644 --- a/nhrpd/nhrp_errors.h +++ b/nhrpd/nhrp_errors.h @@ -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); diff --git a/nhrpd/resolver.c b/nhrpd/resolver.c index f017d974df..830f0e1c84 100644 --- a/nhrpd/resolver.c +++ b/nhrpd/resolver.c @@ -198,9 +198,10 @@ void resolver_resolve(struct resolver_query *query, int af, union sockunion *)) { if (query->callback != NULL) { - flog_err(NHRP_ERR_RESOLVER, - "Trying to resolve '%s', but previous query was not finished yet", - hostname); + flog_err( + EC_NHRP_RESOLVER, + "Trying to resolve '%s', but previous query was not finished yet", + hostname); return; } diff --git a/nhrpd/vici.c b/nhrpd/vici.c index c1a99685f3..3de4609a2b 100644 --- a/nhrpd/vici.c +++ b/nhrpd/vici.c @@ -218,9 +218,10 @@ static void parse_sa_message(struct vici_message_ctx *ctx, if (str2sockunion(buf, &sactx->local.host) < 0) - flog_err(NHRP_ERR_SWAN, - "VICI: bad strongSwan local-host: %s", - buf); + flog_err( + EC_NHRP_SWAN, + "VICI: bad strongSwan local-host: %s", + buf); } else if (blob_equal(key, "local-id") && ctx->nsections == 1) { sactx->local.id = *val; @@ -236,9 +237,10 @@ static void parse_sa_message(struct vici_message_ctx *ctx, if (str2sockunion(buf, &sactx->remote.host) < 0) - flog_err(NHRP_ERR_SWAN, - "VICI: bad strongSwan remote-host: %s", - buf); + flog_err( + EC_NHRP_SWAN, + "VICI: bad strongSwan remote-host: %s", + buf); } else if (blob_equal(key, "remote-id") && ctx->nsections == 1) { sactx->remote.id = *val; @@ -281,7 +283,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 +342,8 @@ 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: |