summaryrefslogtreecommitdiffstats
path: root/nhrpd/vici.c
diff options
context:
space:
mode:
authorDavid Lamparter <equinox@diac24.net>2018-09-14 17:35:58 +0200
committerGitHub <noreply@github.com>2018-09-14 17:35:58 +0200
commit2fa3198399df58b1b039f094ad03d7c1329a2a3d (patch)
tree8bfb9ce491addede73950d9320bb075df0969339 /nhrpd/vici.c
parentMerge pull request #3019 from pacovn/static_analysis__shadow_variables4 (diff)
parent*: style for EC replacements (diff)
downloadfrr-2fa3198399df58b1b039f094ad03d7c1329a2a3d.tar.xz
frr-2fa3198399df58b1b039f094ad03d7c1329a2a3d.zip
Merge pull request #3023 from qlyoung/ultimate-warning-reference-cards-rename
warning reference cards rename
Diffstat (limited to 'nhrpd/vici.c')
-rw-r--r--nhrpd/vici.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/nhrpd/vici.c b/nhrpd/vici.c
index c1a99685f..3de4609a2 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: