summaryrefslogtreecommitdiffstats
path: root/nhrpd
diff options
context:
space:
mode:
authorQuentin Young <qlyoung@cumulusnetworks.com>2018-09-13 21:38:57 +0200
committerQuentin Young <qlyoung@cumulusnetworks.com>2018-09-13 21:38:57 +0200
commit1c50c1c0d683ebfa53c1607c71b8d26547e8f218 (patch)
tree0dbb03af253cdcb0abeacaf6a860a4c7600359c5 /nhrpd
parent*: LIB_[ERR|WARN] -> EC_LIB (diff)
downloadfrr-1c50c1c0d683ebfa53c1607c71b8d26547e8f218.tar.xz
frr-1c50c1c0d683ebfa53c1607c71b8d26547e8f218.zip
*: style for EC replacements
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'nhrpd')
-rw-r--r--nhrpd/resolver.c7
-rw-r--r--nhrpd/vici.c17
2 files changed, 14 insertions, 10 deletions
diff --git a/nhrpd/resolver.c b/nhrpd/resolver.c
index 4959ec91e..830f0e1c8 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(EC_NHRP_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 0a1573b59..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(EC_NHRP_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(EC_NHRP_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;
@@ -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(EC_NHRP_SWAN,
+ flog_err(
+ EC_NHRP_SWAN,
"VICI: StrongSwan does not support mandatory events (unpatched?)");
break;
case VICI_EVENT_CONFIRM: