Download raw body.
relayd: knfmt
Here is a simple diff after running "knfmt -i *.c *.h". I'm by no means
a KNF expert, nor do I have much experience with this. To me, it looks
fine on the whole.
Obviously, I don't like 1 or 2 changes, but I prefer to set them to a
"default" output of knfmt once and then I don't have to worry about them
so much.
Any feedback or objections?
Rafael
diff --git a/agentx_control.c b/agentx_control.c
index 68fb676..4f4ff18 100644
--- a/agentx_control.c
+++ b/agentx_control.c
@@ -192,7 +192,7 @@ void agentxctl_table(struct agentx_varbind *);
void agentx_sock(int, short, void *);
#if 0
int snmp_element(const char *, enum snmp_type, void *, int64_t,
- struct agentx_pdu *);
+ struct agentx_pdu *);
int snmp_string2oid(const char *, struct snmp_oid *);
#endif
@@ -228,8 +228,8 @@ agentx_init(struct relayd *nenv)
if ((sas = agentx_session(sa, NULL, 0, "relayd", 0)) == NULL)
fatal("%s: agentx session alloc", __func__);
if ((sac = agentx_context(sas,
- env->sc_conf.agentx_context[0] == '\0' ? NULL :
- env->sc_conf.agentx_context)) == NULL)
+ env->sc_conf.agentx_context[0] == '\0' ? NULL :
+ env->sc_conf.agentx_context)) == NULL)
fatal("%s: agentx context alloc", __func__);
sar = agentx_region(sac, AGENTX_OID(RELAYDINFO), 0);
if (sar == NULL)
@@ -237,19 +237,19 @@ agentx_init(struct relayd *nenv)
if ((relaydRedirectIdx = agentx_index_integer_dynamic(sar,
AGENTX_OID(RELAYDREDIRECTINDEX))) == NULL ||
(relaydRelayIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDRELAYINDEX))) == NULL ||
+ AGENTX_OID(RELAYDRELAYINDEX))) == NULL ||
(relaydRouterIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDROUTERINDEX))) == NULL ||
+ AGENTX_OID(RELAYDROUTERINDEX))) == NULL ||
(relaydNetRouteIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDNETROUTEINDEX))) == NULL ||
+ AGENTX_OID(RELAYDNETROUTEINDEX))) == NULL ||
(relaydHostIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDHOSTINDEX))) == NULL ||
+ AGENTX_OID(RELAYDHOSTINDEX))) == NULL ||
(relaydSessionIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDSESSIONINDEX))) == NULL ||
+ AGENTX_OID(RELAYDSESSIONINDEX))) == NULL ||
(relaydSessionRelayIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDSESSIONRELAYINDEX))) == NULL ||
+ AGENTX_OID(RELAYDSESSIONRELAYINDEX))) == NULL ||
(relaydTableIdx = agentx_index_integer_dynamic(sar,
- AGENTX_OID(RELAYDTABLEINDEX))) == NULL)
+ AGENTX_OID(RELAYDTABLEINDEX))) == NULL)
fatal("%s: agentx index alloc", __func__);
session_idxs[0] = relaydSessionRelayIdx;
session_idxs[1] = relaydSessionIdx;
@@ -257,170 +257,170 @@ agentx_init(struct relayd *nenv)
AGENTX_OID(RELAYDREDIRECTINDEX), &relaydRedirectIdx, 1, 0,
agentxctl_redirect)) == NULL ||
(relaydRedirectStatus = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTSTATUS), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTSTATUS), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectName = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTNAME), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTNAME), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectCnt = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTCNT), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTCNT), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectAvg = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTAVG), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTAVG), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectLast = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTLAST), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTLAST), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectAvgHour = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTAVGHOUR), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTAVGHOUR), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectLastHour = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTLASTHOUR), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTLASTHOUR), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectAvgDay = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTAVGDAY), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTAVGDAY), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRedirectLastDay = agentx_object(sar,
- AGENTX_OID(RELAYDREDIRECTLASTDAY), &relaydRedirectIdx, 1, 0,
- agentxctl_redirect)) == NULL ||
+ AGENTX_OID(RELAYDREDIRECTLASTDAY), &relaydRedirectIdx, 1, 0,
+ agentxctl_redirect)) == NULL ||
(relaydRelayIndex = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYINDEX), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYINDEX), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayStatus = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYSTATUS), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYSTATUS), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayName = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYNAME), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYNAME), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayCnt = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYCNT), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYCNT), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayAvg = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYAVG), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYAVG), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayLast = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYLAST), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYLAST), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayAvgHour = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYAVGHOUR), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYAVGHOUR), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayLastHour = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYLASTHOUR), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYLASTHOUR), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayAvgDay = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYAVGDAY), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYAVGDAY), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRelayLastDay = agentx_object(sar,
- AGENTX_OID(RELAYDRELAYLASTDAY), &relaydRelayIdx, 1, 0,
- agentxctl_relay)) == NULL ||
+ AGENTX_OID(RELAYDRELAYLASTDAY), &relaydRelayIdx, 1, 0,
+ agentxctl_relay)) == NULL ||
(relaydRouterIndex = agentx_object(sar,
- AGENTX_OID(RELAYDROUTERINDEX), &relaydRouterIdx, 1, 0,
- agentxctl_router)) == NULL ||
+ AGENTX_OID(RELAYDROUTERINDEX), &relaydRouterIdx, 1, 0,
+ agentxctl_router)) == NULL ||
(relaydRouterTableIndex = agentx_object(sar,
- AGENTX_OID(RELAYDROUTERTABLEINDEX), &relaydRouterIdx, 1, 0,
- agentxctl_router)) == NULL ||
+ AGENTX_OID(RELAYDROUTERTABLEINDEX), &relaydRouterIdx, 1, 0,
+ agentxctl_router)) == NULL ||
(relaydRouterStatus = agentx_object(sar,
- AGENTX_OID(RELAYDROUTERSTATUS), &relaydRouterIdx, 1, 0,
- agentxctl_router)) == NULL ||
+ AGENTX_OID(RELAYDROUTERSTATUS), &relaydRouterIdx, 1, 0,
+ agentxctl_router)) == NULL ||
(relaydRouterName = agentx_object(sar,
- AGENTX_OID(RELAYDROUTERNAME), &relaydRouterIdx, 1, 0,
- agentxctl_router)) == NULL ||
+ AGENTX_OID(RELAYDROUTERNAME), &relaydRouterIdx, 1, 0,
+ agentxctl_router)) == NULL ||
(relaydRouterLabel = agentx_object(sar,
- AGENTX_OID(RELAYDROUTERLABEL), &relaydRouterIdx, 1, 0,
- agentxctl_router)) == NULL ||
+ AGENTX_OID(RELAYDROUTERLABEL), &relaydRouterIdx, 1, 0,
+ agentxctl_router)) == NULL ||
(relaydRouterRtable = agentx_object(sar,
- AGENTX_OID(RELAYDROUTERRTABLE), &relaydRouterIdx, 1, 0,
- agentxctl_router)) == NULL ||
+ AGENTX_OID(RELAYDROUTERRTABLE), &relaydRouterIdx, 1, 0,
+ agentxctl_router)) == NULL ||
(relaydNetRouteIndex = agentx_object(sar,
- AGENTX_OID(RELAYDNETROUTEINDEX), &relaydNetRouteIdx, 1, 0,
- agentxctl_netroute)) == NULL ||
+ AGENTX_OID(RELAYDNETROUTEINDEX), &relaydNetRouteIdx, 1, 0,
+ agentxctl_netroute)) == NULL ||
(relaydNetRouteAddr = agentx_object(sar,
- AGENTX_OID(RELAYDNETROUTEADDR), &relaydNetRouteIdx, 1, 0,
- agentxctl_netroute)) == NULL ||
+ AGENTX_OID(RELAYDNETROUTEADDR), &relaydNetRouteIdx, 1, 0,
+ agentxctl_netroute)) == NULL ||
(relaydNetRouteAddrType = agentx_object(sar,
- AGENTX_OID(RELAYDNETROUTEADDRTYPE), &relaydNetRouteIdx, 1, 0,
- agentxctl_netroute)) == NULL ||
+ AGENTX_OID(RELAYDNETROUTEADDRTYPE), &relaydNetRouteIdx, 1, 0,
+ agentxctl_netroute)) == NULL ||
(relaydNetRoutePrefixLen = agentx_object(sar,
- AGENTX_OID(RELAYDNETROUTEPREFIXLEN), &relaydNetRouteIdx, 1, 0,
- agentxctl_netroute)) == NULL ||
+ AGENTX_OID(RELAYDNETROUTEPREFIXLEN), &relaydNetRouteIdx, 1, 0,
+ agentxctl_netroute)) == NULL ||
(relaydNetRouteRouterIndex = agentx_object(sar,
- AGENTX_OID(RELAYDNETROUTEROUTERINDEX), &relaydNetRouteIdx, 1, 0,
- agentxctl_netroute)) == NULL ||
+ AGENTX_OID(RELAYDNETROUTEROUTERINDEX), &relaydNetRouteIdx, 1, 0,
+ agentxctl_netroute)) == NULL ||
(relaydHostIndex = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTINDEX), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTINDEX), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostParentIndex = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTPARENTINDEX), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTPARENTINDEX), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostTableIndex = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTTABLEINDEX), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTTABLEINDEX), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostName = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTNAME), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTNAME), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostAddress = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTADDRESS), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTADDRESS), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostAddressType = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTADDRESSTYPE), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTADDRESSTYPE), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostStatus = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTSTATUS), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTSTATUS), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostCheckCnt = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTCHECKCNT), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTCHECKCNT), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostUpCnt = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTUPCNT), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTUPCNT), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydHostErrno = agentx_object(sar,
- AGENTX_OID(RELAYDHOSTERRNO), &relaydHostIdx, 1, 0,
- agentxctl_host)) == NULL ||
+ AGENTX_OID(RELAYDHOSTERRNO), &relaydHostIdx, 1, 0,
+ agentxctl_host)) == NULL ||
(relaydSessionIndex = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONINDEX), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONINDEX), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionRelayIndex = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONRELAYINDEX), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONRELAYINDEX), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionInAddr = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONINADDR), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONINADDR), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionInAddrType = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONINADDRTYPE), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONINADDRTYPE), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionOutAddr = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONOUTADDR), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONOUTADDR), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionOutAddrType = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONOUTADDRTYPE), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONOUTADDRTYPE), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionPortIn = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONPORTIN), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONPORTIN), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionPortOut = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONPORTOUT), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONPORTOUT), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionAge = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONAGE), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONAGE), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionIdle = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONIDLE), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONIDLE), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionStatus = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONSTATUS), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONSTATUS), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydSessionPid = agentx_object(sar,
- AGENTX_OID(RELAYDSESSIONPID), session_idxs, 2, 0,
- agentxctl_session)) == NULL ||
+ AGENTX_OID(RELAYDSESSIONPID), session_idxs, 2, 0,
+ agentxctl_session)) == NULL ||
(relaydTableIndex = agentx_object(sar,
- AGENTX_OID(RELAYDTABLEINDEX), &relaydTableIdx, 1, 0,
- agentxctl_table)) == NULL ||
+ AGENTX_OID(RELAYDTABLEINDEX), &relaydTableIdx, 1, 0,
+ agentxctl_table)) == NULL ||
(relaydTableName = agentx_object(sar,
- AGENTX_OID(RELAYDTABLENAME), &relaydTableIdx, 1, 0,
- agentxctl_table)) == NULL ||
+ AGENTX_OID(RELAYDTABLENAME), &relaydTableIdx, 1, 0,
+ agentxctl_table)) == NULL ||
(relaydTableStatus = agentx_object(sar,
- AGENTX_OID(RELAYDTABLESTATUS), &relaydTableIdx, 1, 0,
- agentxctl_table)) == NULL)
+ AGENTX_OID(RELAYDTABLESTATUS), &relaydTableIdx, 1, 0,
+ agentxctl_table)) == NULL)
fatal("%s: agentx object alloc", __func__);
}
@@ -463,7 +463,7 @@ void
agentx_getsock(struct imsg *imsg)
{
struct timeval tv = AGENTX_RECONNECT_TIMEOUT;
- int fd;
+ int fd;
fd = imsg_get_fd(imsg);
if (fd == -1)
@@ -542,7 +542,6 @@ agentxctl_rdr_byidx(uint32_t instanceidx, enum agentx_request_type type)
return NULL;
}
-
void
agentxctl_redirect(struct agentx_varbind *sav)
{
@@ -993,7 +992,6 @@ agentxctl_table(struct agentx_varbind *sav)
else
agentx_varbind_integer(sav, 0);
}
-
}
#if 0
diff --git a/ca.c b/ca.c
index b3b6b44..c2f1eab 100644
--- a/ca.c
+++ b/ca.c
@@ -254,7 +254,7 @@ ca_dispatch_relay(int fd, struct privsep_proc *p, struct imsg *imsg)
iov[c++].iov_len = sizeof(cko);
if (proc_composev_imsg(env->sc_ps, PROC_RELAY,
cko.cko_proc, imsg_get_type(imsg), -1, -1, iov,
- c) == -1)
+ c) == -1)
log_warn("%s: proc_composev_imsg", __func__);
break;
}
@@ -427,8 +427,8 @@ rsae_send_imsg(int flen, const u_char *from, u_char *to, RSA *rsa,
__func__, cmd == IMSG_CA_PRIVENC ?
"enc" : "dec", cko.cko_hash);
} else if (ret > 0) {
- if (ibuf_get(&ibuf, to, ret) == -1
- || ibuf_size(&ibuf) != 0)
+ if (ibuf_get(&ibuf, to, ret) == -1 ||
+ ibuf_size(&ibuf) != 0)
fatalx("data size");
}
done = 1;
diff --git a/check_icmp.c b/check_icmp.c
index a8182cd..0528172 100644
--- a/check_icmp.c
+++ b/check_icmp.c
@@ -39,7 +39,7 @@
void icmp_setup(struct relayd *, struct ctl_icmp_event *, int);
void check_icmp_add(struct ctl_icmp_event *, int, struct timeval *,
- void (*)(int, short, void *));
+ void (*)(int, short, void *));
int icmp_checks_done(struct ctl_icmp_event *);
void icmp_checks_timeout(struct ctl_icmp_event *, enum host_error);
void send_icmp(int, short, void *);
@@ -222,7 +222,7 @@ send_icmp(int s, short event, void *arg)
}
ttl = host->conf.ttl;
- switch(cie->af) {
+ switch (cie->af) {
case AF_INET:
if (ttl > 0) {
if (setsockopt(s, IPPROTO_IP, IP_TTL,
@@ -393,14 +393,14 @@ in_cksum(u_short *addr, int len)
* sequential 16 bit words to it, and at the end, fold back all the
* carry bits from the top 16 bits into the lower 16 bits.
*/
- while (nleft > 1) {
+ while (nleft > 1) {
sum += *w++;
nleft -= 2;
}
/* mop up an odd byte, if necessary */
if (nleft == 1) {
- *(u_char *)(&answer) = *(u_char *)w ;
+ *(u_char *)(&answer) = *(u_char *)w;
sum += answer;
}
diff --git a/check_script.c b/check_script.c
index 6182b07..026e7bc 100644
--- a/check_script.c
+++ b/check_script.c
@@ -49,10 +49,10 @@ check_script(struct relayd *env, struct host *host)
host->flags &= ~(F_CHECK_SENT|F_CHECK_DONE);
scr.host = host->conf.id;
- if ((strlcpy(scr.name, host->conf.name,sizeof(scr.name)) >=
+ if ((strlcpy(scr.name, host->conf.name, sizeof(scr.name)) >=
sizeof(scr.name)) ||
(strlcpy(scr.path, table->conf.path, sizeof(scr.path)) >=
- sizeof(scr.path)))
+ sizeof(scr.path)))
fatalx("invalid script path");
memcpy(&scr.timeout, &table->conf.timeout, sizeof(scr.timeout));
diff --git a/check_tcp.c b/check_tcp.c
index 05819a7..1fb692d 100644
--- a/check_tcp.c
+++ b/check_tcp.c
@@ -58,11 +58,11 @@ check_tcp(struct ctl_tcp_event *cte)
switch (cte->host->conf.ss.ss_family) {
case AF_INET:
((struct sockaddr_in *)&cte->host->conf.ss)->sin_port =
- cte->table->conf.port;
+ cte->table->conf.port;
break;
case AF_INET6:
((struct sockaddr_in6 *)&cte->host->conf.ss)->sin6_port =
- cte->table->conf.port;
+ cte->table->conf.port;
break;
}
diff --git a/check_tls.c b/check_tls.c
index 3d56068..54c6d83 100644
--- a/check_tls.c
+++ b/check_tls.c
@@ -182,7 +182,7 @@ check_tls_handshake(int fd, short event, void *arg)
} else {
cte->host->up = HOST_DOWN;
check_tls_error(cte, cte->host->conf.name,
- "cannot connect");
+ "cannot connect");
hce_notify_done(cte->host, HCE_TLS_CONNECT_FAIL);
check_tls_cleanup(cte);
return;
diff --git a/config.c b/config.c
index ed8a516..452b00a 100644
--- a/config.c
+++ b/config.c
@@ -68,14 +68,12 @@ config_init(struct relayd *env)
env->sc_empty_table.conf.flags |= F_DISABLE;
(void)strlcpy(env->sc_empty_table.conf.name, "empty",
sizeof(env->sc_empty_table.conf.name));
-
}
if (what & CONFIG_RDRS) {
if ((env->sc_rdrs =
calloc(1, sizeof(*env->sc_rdrs))) == NULL)
return (-1);
TAILQ_INIT(env->sc_rdrs);
-
}
if (what & CONFIG_RELAYS) {
if ((env->sc_relays =
@@ -270,7 +268,7 @@ config_getcfg(struct relayd *env, struct imsg *imsg)
/* Update runtime flags */
if (imsg_get_data(imsg, &env->sc_conf,
- sizeof(struct relayd_config)) == -1) {
+ sizeof(struct relayd_config)) == -1) {
log_warn("%s: imsg_get_data", __func__);
return (-1);
}
@@ -732,8 +730,8 @@ config_getproto(struct relayd *env, struct imsg *imsg)
}
if ((s = ibuf_size(&ibuf)) > 0) {
proto->style = NULL;
- if ((proto->style = ibuf_get_string(&ibuf, s - 1))
- == NULL) {
+ if ((proto->style = ibuf_get_string(&ibuf, s - 1)) ==
+ NULL) {
log_warn("%s: ibuf_get_string", __func__);
free(proto);
return (-1);
@@ -783,7 +781,6 @@ config_getrule(struct relayd *env, struct imsg *imsg)
return (-1);
}
-
#define GETKV(_n, _f) { \
len = rule->rule_ctl.kvlen[_n]._f; \
if (len >= 0) { \
@@ -1060,10 +1057,10 @@ config_setrelay(struct relayd *env, struct relay *rlay)
int
config_getrelay(struct relayd *env, struct imsg *imsg)
{
- struct ibuf ibuf;
- struct privsep *ps = env->sc_ps;
- struct relay *rlay;
- size_t s;
+ struct ibuf ibuf;
+ struct privsep *ps = env->sc_ps;
+ struct relay *rlay;
+ size_t s;
if (imsg_get_ibuf(imsg, &ibuf) == -1) {
log_warn("%s: imsg_get_ibuf", __func__);
diff --git a/hce.c b/hce.c
index ffac69c..66057b2 100644
--- a/hce.c
+++ b/hce.c
@@ -39,7 +39,7 @@ int hce_dispatch_parent(int, struct privsep_proc *, struct imsg *);
int hce_dispatch_pfe(int, struct privsep_proc *, struct imsg *);
int hce_dispatch_relay(int, struct privsep_proc *, struct imsg *);
-static struct relayd *env = NULL;
+static struct relayd *env = NULL;
int running = 0;
static struct privsep_proc procs[] = {
@@ -259,7 +259,7 @@ hce_notify_done(struct host *host, enum host_error he)
if (env->sc_conf.opts & logopt) {
if (host->code > 0)
- asprintf(&codemsg, ",%d", host->code);
+ asprintf(&codemsg, ",%d", host->code);
log_info("host %s, check %s%s (%lums,%s%s), state %s -> %s, "
"availability %s",
host->conf.name, table_check(table->conf.check),
diff --git a/http.h b/http.h
index 2926f0f..085d848 100644
--- a/http.h
+++ b/http.h
@@ -102,21 +102,21 @@ struct http_method {
{ HTTP_METHOD_MOVE, "MOVE" }, \
{ HTTP_METHOD_LOCK, "LOCK" }, \
{ HTTP_METHOD_UNLOCK, "UNLOCK" }, \
- { HTTP_METHOD_VERSION_CONTROL, "VERSION-CONTROL" }, \
+ { HTTP_METHOD_VERSION_CONTROL, "VERSION-CONTROL" },\
{ HTTP_METHOD_REPORT, "REPORT" }, \
{ HTTP_METHOD_CHECKOUT, "CHECKOUT" }, \
{ HTTP_METHOD_CHECKIN, "CHECKIN" }, \
{ HTTP_METHOD_UNCHECKOUT, "UNCHECKOUT" }, \
- { HTTP_METHOD_MKWORKSPACE, "MKWORKSPACE" }, \
+ { HTTP_METHOD_MKWORKSPACE, "MKWORKSPACE" },\
{ HTTP_METHOD_UPDATE, "UPDATE" }, \
{ HTTP_METHOD_LABEL, "LABEL" }, \
{ HTTP_METHOD_MERGE, "MERGE" }, \
- { HTTP_METHOD_BASELINE_CONTROL, "BASELINE-CONTROL" }, \
+ { HTTP_METHOD_BASELINE_CONTROL, "BASELINE-CONTROL" },\
{ HTTP_METHOD_MKACTIVITY, "MKACTIVITY" }, \
{ HTTP_METHOD_ORDERPATCH, "ORDERPATCH" }, \
{ HTTP_METHOD_ACL, "ACL" }, \
- { HTTP_METHOD_MKREDIRECTREF, "MKREDIRECTREF" }, \
- { HTTP_METHOD_UPDATEREDIRECTREF, "UPDATEREDIRECTREF" }, \
+ { HTTP_METHOD_MKREDIRECTREF, "MKREDIRECTREF" },\
+ { HTTP_METHOD_UPDATEREDIRECTREF, "UPDATEREDIRECTREF" },\
{ HTTP_METHOD_SEARCH, "SEARCH" }, \
{ HTTP_METHOD_MKCALENDAR, "MKCALENDAR" }, \
{ HTTP_METHOD_PATCH, "PATCH" }, \
diff --git a/log.c b/log.c
index 532015d..38a6583 100644
--- a/log.c
+++ b/log.c
@@ -159,7 +159,7 @@ log_debug(const char *emsg, ...)
static void
vfatalc(int code, const char *emsg, va_list ap)
{
- static char s[BUFSIZ];
+ static char s[BUFSIZ];
const char *sep;
if (emsg != NULL) {
diff --git a/log.h b/log.h
index 6cd802c..1646321 100644
--- a/log.h
+++ b/log.h
@@ -22,25 +22,25 @@
#include <sys/types.h>
#include <stdarg.h>
-void log_init(int, int);
-void log_procinit(const char *);
-void log_setverbose(int);
-int log_getverbose(void);
-void log_warn(const char *, ...)
- __attribute__((__format__ (printf, 1, 2)));
-void log_warnx(const char *, ...)
- __attribute__((__format__ (printf, 1, 2)));
-void log_info(const char *, ...)
- __attribute__((__format__ (printf, 1, 2)));
-void log_debug(const char *, ...)
- __attribute__((__format__ (printf, 1, 2)));
-void logit(int, const char *, ...)
- __attribute__((__format__ (printf, 2, 3)));
-void vlog(int, const char *, va_list)
- __attribute__((__format__ (printf, 2, 0)));
-__dead void fatal(const char *, ...)
- __attribute__((__format__ (printf, 1, 2)));
-__dead void fatalx(const char *, ...)
- __attribute__((__format__ (printf, 1, 2)));
+void log_init(int, int);
+void log_procinit(const char *);
+void log_setverbose(int);
+int log_getverbose(void);
+void log_warn(const char *, ...)
+ __attribute__((__format__(printf, 1, 2)));
+void log_warnx(const char *, ...)
+ __attribute__((__format__(printf, 1, 2)));
+void log_info(const char *, ...)
+ __attribute__((__format__(printf, 1, 2)));
+void log_debug(const char *, ...)
+ __attribute__((__format__(printf, 1, 2)));
+void logit(int, const char *, ...)
+ __attribute__((__format__(printf, 2, 3)));
+void vlog(int, const char *, va_list)
+ __attribute__((__format__(printf, 2, 0)));
+__dead void fatal(const char *, ...)
+ __attribute__((__format__(printf, 1, 2)));
+__dead void fatalx(const char *, ...)
+ __attribute__((__format__(printf, 1, 2)));
#endif /* LOG_H */
diff --git a/pfe.c b/pfe.c
index a1791b8..319eaa5 100644
--- a/pfe.c
+++ b/pfe.c
@@ -154,8 +154,8 @@ pfe_dispatch_hce(int fd, struct privsep_proc *p, struct imsg *imsg)
proc_compose(env->sc_ps, PROC_RELAY,
IMSG_HOST_STATUS, &st, sizeof(st));
- if ((table = table_find(env, host->conf.tableid))
- == NULL)
+ if ((table = table_find(env, host->conf.tableid)) ==
+ NULL)
fatalx("%s: invalid table id", __func__);
log_debug("%s: state %d for host %u %s", __func__,
@@ -586,14 +586,13 @@ disable_host(struct ctl_conn *c, struct ctl_id *id, struct host *host)
{
struct host *h;
struct table *table, *t;
- int host_byname = 0;
+ int host_byname = 0;
if (host == NULL) {
if (id->id == EMPTY_ID) {
host = host_findbyname(env, id->name);
host_byname = 1;
- }
- else
+ } else
host = host_find(env, id->id);
if (host == NULL || host->conf.parentid)
return (-1);
@@ -649,15 +648,13 @@ enable_host(struct ctl_conn *c, struct ctl_id *id, struct host *host)
{
struct host *h;
struct table *t;
- int host_byname = 0;
-
+ int host_byname = 0;
if (host == NULL) {
if (id->id == EMPTY_ID) {
host = host_findbyname(env, id->name);
host_byname = 1;
- }
- else
+ } else
host = host_find(env, id->id);
if (host == NULL || host->conf.parentid)
return (-1);
@@ -673,7 +670,7 @@ enable_host(struct ctl_conn *c, struct ctl_id *id, struct host *host)
host->flags &= ~(F_ADD);
proc_compose(env->sc_ps, PROC_HCE, IMSG_HOST_ENABLE,
- &host->conf.id, sizeof (host->conf.id));
+ &host->conf.id, sizeof(host->conf.id));
/* Forward to relay engine(s) */
proc_compose(env->sc_ps, PROC_RELAY, IMSG_HOST_ENABLE,
@@ -790,8 +787,7 @@ pfe_sync(void)
if (table->up && table->conf.flags & F_DEMOTED) {
demote.level = -1;
table->conf.flags &= ~F_DEMOTED;
- }
- else if (!table->up && !(table->conf.flags & F_DEMOTED)) {
+ } else if (!table->up && !(table->conf.flags & F_DEMOTED)) {
demote.level = 1;
table->conf.flags |= F_DEMOTED;
}
diff --git a/pfe_filter.c b/pfe_filter.c
index df2297b..7d82e7a 100644
--- a/pfe_filter.c
+++ b/pfe_filter.c
@@ -238,7 +238,7 @@ kill_srcnodes(struct relayd *env, struct table *table)
switch (host->conf.ss.ss_family) {
case AF_INET:
- sain = (struct sockaddr_in *)&host->conf.ss;
+ sain = (struct sockaddr_in *)&host->conf.ss;
bcopy(&sain->sin_addr,
&psnk.psnk_dst.addr.v.a.addr.v4,
sizeof(psnk.psnk_dst.addr.v.a.addr.v4));
@@ -414,7 +414,7 @@ sync_ruleset(struct relayd *env, struct rdr *rdr, int enable)
rio.rule.dst.port[1] = address->port.val[1];
rio.rule.rtableid = -1; /* stay in the main routing table */
rio.rule.onrdomain = env->sc_rtable;
- DPRINTF("%s rtable %d",__func__,env->sc_rtable);
+ DPRINTF("%s rtable %d", __func__, env->sc_rtable);
if (rio.rule.proto == IPPROTO_TCP)
rio.rule.timeout[PFTM_TCP_ESTABLISHED] =
diff --git a/pfe_route.c b/pfe_route.c
index 27afb35..2fb1383 100644
--- a/pfe_route.c
+++ b/pfe_route.c
@@ -57,7 +57,7 @@ sync_routes(struct relayd *env, struct router *rt)
{
struct netroute *nr;
struct host *host;
- char buf[HOST_NAME_MAX+1];
+ char buf[HOST_NAME_MAX + 1];
struct ctl_netroute crt;
if (!(env->sc_conf.flags & F_NEEDRT))
diff --git a/proc.c b/proc.c
index c18398f..05c8ef1 100644
--- a/proc.c
+++ b/proc.c
@@ -38,11 +38,11 @@
#include "log.h"
void proc_exec(struct privsep *, struct privsep_proc *, unsigned int, int,
- char **);
+ char **);
void proc_setup(struct privsep *, struct privsep_proc *, unsigned int);
void proc_open(struct privsep *, int, int);
void proc_accept(struct privsep *, int, enum privsep_procid,
- unsigned int);
+ unsigned int);
void proc_close(struct privsep *);
void proc_shutdown(struct privsep_proc *);
void proc_sig_handler(int, short, void *);
@@ -71,11 +71,11 @@ void
proc_exec(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc,
int argc, char **argv)
{
- unsigned int proc, nargc, i, proc_i;
+ unsigned int proc, nargc, i, proc_i;
char **nargv;
- struct privsep_proc *p;
- char num[32];
- int fd;
+ struct privsep_proc *p;
+ char num[32];
+ int fd;
/* Prepare the new process argv. */
nargv = calloc(argc + 5, sizeof(char *));
@@ -94,7 +94,7 @@ proc_exec(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc,
/* Point process instance arg to stack and copy the original args. */
nargv[nargc++] = "-I";
nargv[nargc++] = num;
- for (i = 1; i < (unsigned int) argc; i++)
+ for (i = 1; i < (unsigned int)argc; i++)
nargv[nargc++] = argv[i];
nargv[nargc] = NULL;
@@ -120,8 +120,8 @@ proc_exec(struct privsep *ps, struct privsep_proc *procs, unsigned int nproc,
case 0:
/* Prepare parent socket. */
if (fd != PROC_PARENT_SOCK_FILENO) {
- if (dup2(fd, PROC_PARENT_SOCK_FILENO)
- == -1)
+ if (dup2(fd, PROC_PARENT_SOCK_FILENO) ==
+ -1)
fatal("dup2");
} else if (fcntl(fd, F_SETFD, 0) == -1)
fatal("fcntl");
@@ -668,7 +668,7 @@ proc_dispatch(int fd, short event, void *arg)
fatalx("%s: imsg_get_data", __func__);
proc_accept(ps, imsg_get_fd(&imsg), pf.pf_procid,
- pf.pf_instance);
+ pf.pf_instance);
break;
default:
fatalx("%s: %s %d got invalid imsg %d peerid %d "
diff --git a/proxy_protocol.c b/proxy_protocol.c
index ef13d7d..68b3c3c 100644
--- a/proxy_protocol.c
+++ b/proxy_protocol.c
@@ -81,8 +81,8 @@ proxy_protocol_v1(struct rsession *con, struct evbuffer *dstout)
}
ret = evbuffer_add_printf(dstout,
- "PROXY %s %s %s %d %d\r\n", proxyproto, ibuf, obuf,
- ntohs(con->se_in.port), ntohs(con->se_relay->rl_conf.port));
+ "PROXY %s %s %s %d %d\r\n", proxyproto, ibuf, obuf,
+ ntohs(con->se_in.port), ntohs(con->se_relay->rl_conf.port));
return ret == -1 ? -1 : 0;
}
@@ -90,15 +90,15 @@ proxy_protocol_v1(struct rsession *con, struct evbuffer *dstout)
int
proxy_protocol_v2(struct rsession *con, struct evbuffer *dstout)
{
- union proxy_v2_addr addr;
- struct proxy_v2_hdr hdr;
- const struct relay_config *conf = &con->se_relay->rl_conf;
- const struct sockaddr_storage *srcss = &con->se_in.ss;
- const struct sockaddr_storage *dstss = &con->se_sockname;
- int error;
- in_port_t srcport = con->se_in.port;
- in_port_t dstport = conf->port;
- u_int16_t len;
+ union proxy_v2_addr addr;
+ struct proxy_v2_hdr hdr;
+ const struct relay_config *conf = &con->se_relay->rl_conf;
+ const struct sockaddr_storage *srcss = &con->se_in.ss;
+ const struct sockaddr_storage *dstss = &con->se_sockname;
+ int error;
+ in_port_t srcport = con->se_in.port;
+ in_port_t dstport = conf->port;
+ u_int16_t len;
bcopy(PROXY_V2_SIG, hdr.sig, sizeof(hdr.sig));
hdr.ver_cmd = 0x20 | PROXY_V2_CMD_PROXY;
@@ -106,7 +106,7 @@ proxy_protocol_v2(struct rsession *con, struct evbuffer *dstout)
switch (dstss->ss_family) {
case AF_INET:
hdr.fam = (conf->flags & F_UDP) ?
- PROXY_V2_FAM_UDP4 : PROXY_V2_FAM_TCP4;
+ PROXY_V2_FAM_UDP4 : PROXY_V2_FAM_TCP4;
len = sizeof(addr.ipv4_addr);
addr.ipv4_addr.src_addr =
((const struct sockaddr_in *)srcss)->sin_addr.s_addr;
@@ -117,7 +117,7 @@ proxy_protocol_v2(struct rsession *con, struct evbuffer *dstout)
break;
case AF_INET6:
hdr.fam = (conf->flags & F_UDP) ?
- PROXY_V2_FAM_UDP6 : PROXY_V2_FAM_TCP6;
+ PROXY_V2_FAM_UDP6 : PROXY_V2_FAM_TCP6;
len = sizeof(addr.ipv6_addr);
bcopy(&((const struct sockaddr_in6 *)srcss)->sin6_addr,
addr.ipv6_addr.src_addr, sizeof(addr.ipv6_addr.src_addr));
diff --git a/relay.c b/relay.c
index 2d706bd..9e9db5f 100644
--- a/relay.c
+++ b/relay.c
@@ -48,13 +48,13 @@
void relay_statistics(int, short, void *);
int relay_dispatch_parent(int, struct privsep_proc *,
- struct imsg *);
+ struct imsg *);
int relay_dispatch_pfe(int, struct privsep_proc *,
- struct imsg *);
+ struct imsg *);
int relay_dispatch_ca(int, struct privsep_proc *,
- struct imsg *);
+ struct imsg *);
int relay_dispatch_hce(int, struct privsep_proc *,
- struct imsg *);
+ struct imsg *);
void relay_shutdown(void);
void relay_protodebug(struct relay *);
@@ -62,11 +62,11 @@ void relay_ruledebug(struct relay_rule *);
void relay_init(struct privsep *, struct privsep_proc *p, void *);
void relay_launch(void);
int relay_socket(struct sockaddr_storage *, in_port_t,
- struct protocol *, int, int);
+ struct protocol *, int, int);
int relay_socket_listen(struct sockaddr_storage *, in_port_t,
- struct protocol *);
+ struct protocol *);
int relay_socket_connect(struct sockaddr_storage *, in_port_t,
- struct protocol *, int);
+ struct protocol *, int);
void relay_accept(int, short, void *);
void relay_input(struct rsession *);
@@ -75,7 +75,7 @@ void relay_hash_addr(SIPHASH_CTX *, struct sockaddr_storage *, int);
int relay_tls_ctx_create(struct relay *);
void relay_tls_transaction(struct rsession *,
- struct ctl_relay_event *);
+ struct ctl_relay_event *);
void relay_tls_handshake(int, short, void *);
void relay_tls_connected(struct ctl_relay_event *);
void relay_tls_readcb(int, short, void *);
@@ -83,10 +83,10 @@ void relay_tls_writecb(int, short, void *);
void relay_connect_retry(int, short, void *);
void relay_connect_state(struct rsession *,
- struct ctl_relay_event *, enum relay_state);
+ struct ctl_relay_event *, enum relay_state);
extern void bufferevent_read_pressure_cb(struct evbuffer *, size_t,
- size_t, void *);
+ size_t, void *);
volatile int relay_sessions;
volatile int relay_inflight = 0;
@@ -232,7 +232,7 @@ relay_ruledebug(struct relay_rule *rule)
}
int kvv = (kv->kv_option == KEY_OPTION_STRIP ||
- kv->kv_value == NULL);
+ kv->kv_value == NULL);
fprintf(stderr, "%s%s%s%s%s%s ",
kv->kv_key == NULL ? "" : "\"",
kv->kv_key == NULL ? "" : kv->kv_key,
@@ -439,7 +439,7 @@ relay_statistics(int fd, short events, void *arg)
void
relay_launch(void)
{
- void (*callback)(int, short, void *);
+ void (*callback)(int, short, void *);
struct relay *rlay;
struct host *host;
struct relay_table *rlt;
@@ -560,7 +560,7 @@ relay_socket(struct sockaddr_storage *ss, in_port_t port,
if (reuseport) {
val = 1;
if (setsockopt(s, SOL_SOCKET, SO_REUSEPORT, &val,
- sizeof(int)) == -1)
+ sizeof(int)) == -1)
goto bad;
}
if (proto->tcpflags & TCPFLAG_BUFSIZ) {
@@ -795,7 +795,7 @@ relay_connected(int fd, short sig, void *arg)
bufferevent_settimeout(bev,
rlay->rl_conf.timeout.tv_sec, rlay->rl_conf.timeout.tv_sec);
bufferevent_setwatermark(bev, EV_WRITE,
- RELAY_MIN_PREFETCHED * proto->tcpbufsiz, 0);
+ RELAY_MIN_PREFETCHED * proto->tcpbufsiz, 0);
bufferevent_enable(bev, EV_READ|EV_WRITE);
if (con->se_in.bev)
bufferevent_enable(con->se_in.bev, EV_READ);
@@ -846,7 +846,7 @@ relay_input(struct rsession *con)
bufferevent_settimeout(con->se_in.bev,
rlay->rl_conf.timeout.tv_sec, rlay->rl_conf.timeout.tv_sec);
bufferevent_setwatermark(con->se_in.bev, EV_WRITE,
- RELAY_MIN_PREFETCHED * proto->tcpbufsiz, 0);
+ RELAY_MIN_PREFETCHED * proto->tcpbufsiz, 0);
bufferevent_enable(con->se_in.bev, EV_READ|EV_WRITE);
if (relay_splice(&con->se_in) == -1)
@@ -1035,7 +1035,7 @@ relay_error(struct bufferevent *bev, short error, void *arg)
struct evbuffer *dst;
DPRINTF("%s: session %d: dir %d state %d to read %lld event error %x",
- __func__, con->se_id, cre->dir, cre->state, cre->toread, error);
+ __func__, con->se_id, cre->dir, cre->state, cre->toread, error);
if (error & EVBUFFER_TIMEOUT) {
if (cre->splicelen >= 0) {
bufferevent_enable(bev, EV_READ);
@@ -1538,7 +1538,7 @@ relay_connect_retry(int fd, short sig, void *arg)
relay_inflight = 1;
}
- DPRINTF("%s: retry %d of %d, inflight: %d",__func__,
+ DPRINTF("%s: retry %d of %d, inflight: %d", __func__,
con->se_retrycount, con->se_retry, relay_inflight);
if (sig != EV_TIMEOUT)
@@ -1598,7 +1598,7 @@ relay_connect_retry(int fd, short sig, void *arg)
else
relay_connect_state(con, &con->se_out, STATE_CONNECTED);
relay_inflight--;
- DPRINTF("%s: inflight decremented, now %d",__func__, relay_inflight);
+ DPRINTF("%s: inflight decremented, now %d", __func__, relay_inflight);
event_add(&rlay->rl_ev, NULL);
@@ -1724,7 +1724,7 @@ relay_connect(struct rsession *con)
relay_connect_state(con, &con->se_out, STATE_CONNECTED);
relay_inflight--;
- DPRINTF("%s: inflight decremented, now %d",__func__,
+ DPRINTF("%s: inflight decremented, now %d", __func__,
relay_inflight);
if (errno == EINPROGRESS)
@@ -1919,8 +1919,8 @@ relay_dispatch_pfe(int fd, struct privsep_proc *p, struct imsg *imsg)
fatalx("%s: desynchronized", __func__);
}
- if ((table = table_find(env, host->conf.tableid))
- == NULL)
+ if ((table = table_find(env, host->conf.tableid)) ==
+ NULL)
fatalx("%s: invalid table id", __func__);
DPRINTF("%s: [%d] state %d for "
@@ -2173,7 +2173,8 @@ relay_tls_ctx_create(struct relay *rlay)
tls_config_insecure_noverifyname(tls_client_cfg);
if (rlay->rl_tls_ca_fd != -1) {
- if ((buf = relay_load_fd(rlay->rl_tls_ca_fd, &len)) == NULL) {
+ if ((buf = relay_load_fd(rlay->rl_tls_ca_fd, &len)) ==
+ NULL) {
log_warn("failed to read root certificates");
goto err;
}
@@ -2219,7 +2220,7 @@ relay_tls_ctx_create(struct relay *rlay)
if (cert->cert_ocsp_fd != -1 &&
(ocspbuf = relay_load_fd(cert->cert_ocsp_fd,
- &ocsplen)) == NULL) {
+ &ocsplen)) == NULL) {
log_warn("failed to load OCSP staplefile");
goto err;
}
diff --git a/relay_http.c b/relay_http.c
index f8ae404..2eee6d2 100644
--- a/relay_http.c
+++ b/relay_http.c
@@ -41,46 +41,46 @@
#include "http.h"
#include "log.h"
-static int _relay_lookup_url(struct ctl_relay_event *, char *, char *,
- char *, struct kv *);
+static int _relay_lookup_url(struct ctl_relay_event *, char *, char *,
+ char *, struct kv *);
int relay_lookup_url(struct ctl_relay_event *,
- const char *, struct kv *);
+ const char *, struct kv *);
int relay_lookup_query(struct ctl_relay_event *, struct kv *);
int relay_lookup_cookie(struct ctl_relay_event *, const char *,
- struct kv *);
+ struct kv *);
void relay_read_httpcontent(struct bufferevent *, void *);
void relay_read_httpchunks(struct bufferevent *, void *);
char *relay_expand_http(struct ctl_relay_event *, char *,
- char *, size_t);
+ char *, size_t);
int relay_writeheader_kv(struct ctl_relay_event *, struct kv *);
int relay_writeheader_http(struct ctl_relay_event *,
- struct ctl_relay_event *);
+ struct ctl_relay_event *);
int relay_writerequest_http(struct ctl_relay_event *,
- struct ctl_relay_event *);
+ struct ctl_relay_event *);
int relay_writeresponse_http(struct ctl_relay_event *,
- struct ctl_relay_event *);
+ struct ctl_relay_event *);
void relay_reset_http(struct ctl_relay_event *);
static int relay_httpmethod_cmp(const void *, const void *);
static int relay_httperror_cmp(const void *, const void *);
int relay_httpquery_test(struct ctl_relay_event *,
- struct relay_rule *, struct kvlist *);
+ struct relay_rule *, struct kvlist *);
int relay_httpheader_test(struct ctl_relay_event *,
- struct relay_rule *, struct kvlist *);
+ struct relay_rule *, struct kvlist *);
int relay_httppath_test(struct ctl_relay_event *,
- struct relay_rule *, struct kvlist *);
+ struct relay_rule *, struct kvlist *);
int relay_httpurl_test(struct ctl_relay_event *,
- struct relay_rule *, struct kvlist *);
+ struct relay_rule *, struct kvlist *);
int relay_httpcookie_test(struct ctl_relay_event *,
- struct relay_rule *, struct kvlist *);
+ struct relay_rule *, struct kvlist *);
int relay_apply_actions(struct ctl_relay_event *, struct kvlist *,
- struct relay_table *);
+ struct relay_table *);
int relay_match_actions(struct ctl_relay_event *,
- struct relay_rule *, struct kvlist *, struct kvlist *,
- struct relay_table **);
+ struct relay_rule *, struct kvlist *, struct kvlist *,
+ struct relay_table **);
void relay_httpdesc_free(struct http_descriptor *);
-char * server_root_strip(char *, int);
+char *server_root_strip(char *, int);
int relay_http_parse_startline(struct ctl_relay_event *, char *,
- enum httpmethod *);
+ enum httpmethod *);
static struct relayd *env = NULL;
@@ -118,14 +118,13 @@ relay_http_init(struct relay *rlay)
int
relay_http_priv_init(struct rsession *con)
{
-
struct http_session *hs;
if ((hs = calloc(1, sizeof(*hs))) == NULL)
return (-1);
SIMPLEQ_INIT(&hs->hs_methods);
DPRINTF("%s: session %d http_session %p", __func__,
- con->se_id, hs);
+ con->se_id, hs);
con->se_priv = hs;
return (relay_httpdesc_init(&con->se_in));
}
@@ -348,8 +347,8 @@ relay_read_http(struct bufferevent *bev, void *arg)
*/
if (desc->http_method == HTTP_METHOD_RESPONSE &&
(((desc->http_status >= 100 &&
- desc->http_status < 200) ||
- desc->http_status == 204)) &&
+ desc->http_status < 200) ||
+ desc->http_status == 204)) &&
cre->toread != 0) {
relay_abort_http(con, 502,
"Bad Gateway", 0);
@@ -498,8 +497,8 @@ relay_read_http(struct bufferevent *bev, void *arg)
*/
headers_only = cre->dir == RELAY_DIR_RESPONSE && !ws_response &&
(request_method == HTTP_METHOD_HEAD ||
- (desc->http_status >= 100 && desc->http_status < 200) ||
- desc->http_status == 204 || desc->http_status == 304);
+ (desc->http_status >= 100 && desc->http_status < 200) ||
+ desc->http_status == 204 || desc->http_status == 304);
if (headers_only)
cre->toread = 0;
@@ -575,17 +574,17 @@ relay_read_http(struct bufferevent *bev, void *arg)
* outbound websocket upgrade response.
*/
if (cre->toread == TOREAD_UNLIMITED &&
- connection_close == NULL && !ws_response)
+ connection_close == NULL && !ws_response)
if (kv_add(&desc->http_headers, "Connection",
"close", 0) == NULL)
goto fail;
if (cre->dir == RELAY_DIR_REQUEST) {
if (relay_writerequest_http(cre->dst, cre) == -1)
- goto fail;
+ goto fail;
} else {
if (relay_writeresponse_http(cre->dst, cre) == -1)
- goto fail;
+ goto fail;
}
if (relay_bufferevent_print(cre->dst, "\r\n") == -1 ||
relay_writeheader_http(cre->dst, cre) == -1 ||
@@ -655,8 +654,8 @@ relay_read_httpcontent(struct bufferevent *bev, void *arg)
/* Read content data */
if ((off_t)size > cre->toread) {
size = cre->toread;
- if (relay_bufferevent_write_chunk(cre->dst, src, size)
- == -1)
+ if (relay_bufferevent_write_chunk(cre->dst, src,
+ size) == -1)
goto fail;
cre->toread = 0;
} else {
@@ -716,8 +715,8 @@ relay_read_httpchunks(struct bufferevent *bev, void *arg)
/* Read chunk data */
if ((off_t)size > cre->toread) {
size = cre->toread;
- if (relay_bufferevent_write_chunk(cre->dst, src, size)
- == -1)
+ if (relay_bufferevent_write_chunk(cre->dst, src,
+ size) == -1)
goto fail;
cre->toread = 0;
} else {
@@ -891,7 +890,7 @@ relay_lookup_url(struct ctl_relay_event *cre, const char *host, struct kv *kv)
struct http_descriptor *desc = (struct http_descriptor *)cre->desc;
int i, j, dots;
char *hi[RELAY_MAXLOOKUPLEVELS], *p, *pp, *c, ch;
- char ph[HOST_NAME_MAX+1];
+ char ph[HOST_NAME_MAX + 1];
int ret;
if (desc->http_path == NULL)
@@ -1001,8 +1000,8 @@ relay_lookup_cookie(struct ctl_relay_event *cre, const char *str,
if (strcasecmp(kv->kv_key, key) == 0 &&
((kv->kv_value == NULL) ||
- (fnmatch(kv->kv_value, value,
- FNM_CASEFOLD) != FNM_NOMATCH))) {
+ (fnmatch(kv->kv_value, value,
+ FNM_CASEFOLD) != FNM_NOMATCH))) {
ret = RES_DROP;
goto done;
}
@@ -1034,14 +1033,14 @@ relay_lookup_query(struct ctl_relay_event *cre, struct kv *kv)
tmpkey = ptr;
if ((ptr = strchr(ptr, '&')) != NULL)
*ptr++ = '\0';
- if ((tmpval = strchr(tmpkey, '=')) == NULL || strlen(tmpval)
- < 1)
+ if ((tmpval = strchr(tmpkey, '=')) == NULL || strlen(tmpval) <
+ 1)
continue;
*tmpval++ = '\0';
if (fnmatch(kv->kv_key, tmpkey, 0) != FNM_NOMATCH &&
- (kv->kv_value == NULL || fnmatch(kv->kv_value, tmpval, 0)
- != FNM_NOMATCH))
+ (kv->kv_value == NULL || fnmatch(kv->kv_value, tmpval, 0) !=
+ FNM_NOMATCH))
break;
else
tmpkey = NULL;
@@ -1179,7 +1178,7 @@ relay_close_http(struct rsession *con)
struct http_method_node *hmn;
DPRINTF("%s: session %d http_session %p", __func__,
- con->se_id, hs);
+ con->se_id, hs);
if (hs != NULL)
while (!SIMPLEQ_EMPTY(&hs->hs_methods)) {
hmn = SIMPLEQ_FIRST(&hs->hs_methods);
@@ -1283,8 +1282,8 @@ relay_writerequest_http(struct ctl_relay_event *dst,
relay_bufferevent_print(dst, " ") == -1 ||
relay_bufferevent_print(dst, desc->http_path) == -1 ||
(desc->http_query != NULL &&
- (relay_bufferevent_print(dst, "?") == -1 ||
- relay_bufferevent_print(dst, desc->http_query) == -1)) ||
+ (relay_bufferevent_print(dst, "?") == -1 ||
+ relay_bufferevent_print(dst, desc->http_query) == -1)) ||
relay_bufferevent_print(dst, " ") == -1 ||
relay_bufferevent_print(dst, desc->http_version) == -1)
return (-1);
@@ -1329,9 +1328,9 @@ relay_writeheader_kv(struct ctl_relay_event *dst, struct kv *hdr)
ptr = hdr->kv_value;
if (relay_bufferevent_print(dst, key) == -1 ||
(ptr != NULL &&
- (relay_bufferevent_print(dst, ": ") == -1 ||
- relay_bufferevent_print(dst, ptr) == -1 ||
- relay_bufferevent_print(dst, "\r\n") == -1)))
+ (relay_bufferevent_print(dst, ": ") == -1 ||
+ relay_bufferevent_print(dst, ptr) == -1 ||
+ relay_bufferevent_print(dst, "\r\n") == -1)))
return (-1);
DPRINTF("%s: %s: %s", __func__, key,
hdr->kv_value == NULL ? "" : hdr->kv_value);
@@ -1340,8 +1339,7 @@ relay_writeheader_kv(struct ctl_relay_event *dst, struct kv *hdr)
}
int
-relay_writeheader_http(struct ctl_relay_event *dst, struct ctl_relay_event
- *cre)
+relay_writeheader_http(struct ctl_relay_event *dst, struct ctl_relay_event *cre)
{
struct kv *hdr, *kv;
struct http_descriptor *desc = (struct http_descriptor *)cre->desc;
@@ -1499,9 +1497,12 @@ relay_httppath_test(struct ctl_relay_event *cre, struct relay_rule *rule,
return (0);
else if (fnmatch(kv->kv_key, desc->http_path, 0) == FNM_NOMATCH)
return (-1);
- else if (kv->kv_value != NULL && kv->kv_option == KEY_OPTION_NONE) {
- query = desc->http_query == NULL ? "" : desc->http_query;
- if (fnmatch(kv->kv_value, query, FNM_CASEFOLD) == FNM_NOMATCH)
+ else if (kv->kv_value != NULL &&
+ kv->kv_option == KEY_OPTION_NONE) {
+ query = desc->http_query == NULL ? "" :
+ desc->http_query;
+ if (fnmatch(kv->kv_value, query, FNM_CASEFOLD) ==
+ FNM_NOMATCH)
return (-1);
}
}
@@ -1793,8 +1794,8 @@ relay_apply_actions(struct ctl_relay_event *cre, struct kvlist *actions,
goto fail;
break;
default:
- if (kv_setkey(mp, "%s", kv->kv_key)
- == -1)
+ if (kv_setkey(mp, "%s", kv->kv_key) ==
+ -1)
goto fail;
break;
}
@@ -1802,8 +1803,8 @@ relay_apply_actions(struct ctl_relay_event *cre, struct kvlist *actions,
default:
break;
}
- if (kv_log(con, mp, con->se_label, cre->dir)
- == -1)
+ if (kv_log(con, mp, con->se_label, cre->dir) ==
+ -1)
goto fail;
break;
default:
@@ -1884,7 +1885,7 @@ relay_test(struct protocol *proto, struct ctl_relay_event *cre)
else if (proto->type != r->rule_proto)
RELAY_GET_SKIP_STEP(RULE_SKIP_PROTO);
else if (RELAY_AF_NEQ(r->rule_af, cre->ss.ss_family) ||
- RELAY_AF_NEQ(r->rule_af, cre->dst->ss.ss_family))
+ RELAY_AF_NEQ(r->rule_af, cre->dst->ss.ss_family))
RELAY_GET_SKIP_STEP(RULE_SKIP_AF);
else if (RELAY_ADDR_CMP(&r->rule_src, &cre->ss) != 0)
RELAY_GET_SKIP_STEP(RULE_SKIP_SRC);
@@ -1946,8 +1947,8 @@ relay_test(struct protocol *proto, struct ctl_relay_event *cre)
}
}
- if (rule != NULL && relay_match_actions(cre, rule, NULL, &actions, &tbl)
- != 0) {
+ if (rule != NULL &&
+ relay_match_actions(cre, rule, NULL, &actions, &tbl) != 0) {
/* Something bad happened, drop */
action = RES_DROP;
}
diff --git a/relay_udp.c b/relay_udp.c
index cac1059..8055775 100644
--- a/relay_udp.c
+++ b/relay_udp.c
@@ -45,13 +45,13 @@ static struct relayd *env = NULL;
struct shuffle relay_shuffle;
int relay_udp_socket(struct sockaddr_storage *, in_port_t,
- struct protocol *);
+ struct protocol *);
void relay_udp_timeout(int, short, void *);
void relay_dns_log(struct rsession *, u_int8_t *, size_t);
void *relay_dns_validate(struct rsession *,
- struct relay *, struct sockaddr_storage *,
- u_int8_t *, size_t);
+ struct relay *, struct sockaddr_storage *,
+ u_int8_t *, size_t);
int relay_dns_request(struct rsession *);
void relay_udp_response(int, short, void *);
void relay_dns_result(struct rsession *, u_int8_t *, size_t);
@@ -196,7 +196,7 @@ relay_udp_response(int fd, short sig, void *arg)
slen = sizeof(ss);
if ((len = recvfrom(fd, buf, sizeof(buf), 0,
- (struct sockaddr*)&ss, &slen)) < 1)
+ (struct sockaddr *)&ss, &slen)) < 1)
return;
/* Parse and validate the packet header */
@@ -230,7 +230,7 @@ relay_udp_server(int fd, short sig, void *arg)
slen = sizeof(ss);
if ((len = recvfrom(fd, buf, sizeof(buf), 0,
- (struct sockaddr*)&ss, &slen)) < 1)
+ (struct sockaddr *)&ss, &slen)) < 1)
return;
if (proto->validate != NULL &&
diff --git a/relayd.c b/relayd.c
index 5c6cf32..9c3fa7d 100644
--- a/relayd.c
+++ b/relayd.c
@@ -62,9 +62,9 @@ void parent_shutdown(struct relayd *);
int parent_dispatch_pfe(int, struct privsep_proc *, struct imsg *);
int parent_dispatch_hce(int, struct privsep_proc *, struct imsg *);
int parent_dispatch_relay(int, struct privsep_proc *,
- struct imsg *);
+ struct imsg *);
int parent_dispatch_ca(int, struct privsep_proc *,
- struct imsg *);
+ struct imsg *);
int bindany(struct ctl_bindany *);
void parent_tls_ticket_rekey(int, short, void *);
@@ -201,7 +201,7 @@ main(int argc, char *argv[])
if (geteuid())
errx(1, "need root privileges");
- if ((ps->ps_pw = getpwnam(RELAYD_USER)) == NULL)
+ if ((ps->ps_pw = getpwnam(RELAYD_USER)) == NULL)
errx(1, "unknown user %s", RELAYD_USER);
log_init(debug, LOG_DAEMON);
@@ -504,7 +504,8 @@ parent_dispatch_relay(int fd, struct privsep_proc *p, struct imsg *imsg)
return (-1);
}
- if (bnd.bnd_proc < 0 || bnd.bnd_proc > env->sc_conf.prefork_relay)
+ if (bnd.bnd_proc < 0 ||
+ bnd.bnd_proc > env->sc_conf.prefork_relay)
fatalx("%s: invalid relay proc", __func__);
switch (bnd.bnd_proto) {
case IPPROTO_TCP:
@@ -683,7 +684,7 @@ kv_add(struct kvtree *keys, char *key, char *value, int unique)
int
kv_set(struct kv *kv, char *fmt, ...)
{
- va_list ap;
+ va_list ap;
char *value = NULL;
struct kv *ckv;
int ret;
@@ -691,7 +692,7 @@ kv_set(struct kv *kv, char *fmt, ...)
va_start(ap, fmt);
ret = vasprintf(&value, fmt, ap);
va_end(ap);
- if (ret == -1)
+ if (ret == -1)
return (-1);
/* Remove all children */
@@ -711,7 +712,7 @@ kv_set(struct kv *kv, char *fmt, ...)
int
kv_setkey(struct kv *kv, char *fmt, ...)
{
- va_list ap;
+ va_list ap;
char *key = NULL;
int ret;
@@ -1191,8 +1192,8 @@ table_findbyconf(struct relayd *env, struct table *tb)
*/
if (bcmp(&a, &b, sizeof(b)) == 0 &&
((tb->sendbuf == NULL && table->sendbuf == NULL) ||
- (tb->sendbuf != NULL && table->sendbuf != NULL &&
- strcmp(tb->sendbuf, table->sendbuf) == 0)))
+ (tb->sendbuf != NULL && table->sendbuf != NULL &&
+ strcmp(tb->sendbuf, table->sendbuf) == 0)))
return (table);
}
return (NULL);
@@ -1233,7 +1234,7 @@ relay_findbyaddr(struct relayd *env, struct relay_config *rc)
}
EVP_PKEY *
-pkey_find(struct relayd *env, char * hash)
+pkey_find(struct relayd *env, char *hash)
{
struct ca_pkey *pkey;
@@ -1334,14 +1335,16 @@ relay_load_fd(int fd, off_t *len)
}
int
-relay_load_certfiles(struct relayd *env, struct relay *rlay, const struct keyname *name)
+relay_load_certfiles(struct relayd *env, struct relay *rlay,
+ const struct keyname *name)
{
- char certfile[PATH_MAX];
- char hbuf[PATH_MAX];
- struct protocol *proto = rlay->rl_proto;
- struct relay_cert *cert;
- int useport = htons(rlay->rl_conf.port);
- int cert_fd = -1, key_fd = -1, ocsp_fd = -1, ret = 0;
+ char certfile[PATH_MAX];
+ char hbuf[PATH_MAX];
+ struct protocol *proto = rlay->rl_proto;
+ struct relay_cert *cert;
+ int useport = htons(rlay->rl_conf.port);
+ int cert_fd = -1, key_fd = -1, ocsp_fd = -1,
+ ret = 0;
if (rlay->rl_conf.flags & F_TLSCLIENT) {
if (strlen(proto->tlsca) && rlay->rl_tls_ca_fd == -1) {
@@ -1388,23 +1391,21 @@ relay_load_certfiles(struct relayd *env, struct relay *rlay, const struct keynam
goto fail;
if (name != NULL && strcmp(name->certificate, "") != 0) {
- if (strlcpy(certfile, name->certificate, sizeof(certfile))
- >= sizeof(certfile)) {
+ if (strlcpy(certfile, name->certificate, sizeof(certfile)) >=
+ sizeof(certfile)) {
log_warnx("certificate truncated");
goto fail;
}
- }
- else {
+ } else {
ret = snprintf(certfile, sizeof(certfile),
- "/etc/ssl/%s:%u.crt", hbuf, useport);
+ "/etc/ssl/%s:%u.crt", hbuf, useport);
if (ret < 0 || (size_t)ret >= sizeof(certfile))
goto fail;
}
if ((cert_fd = open(certfile, O_RDONLY)) == -1) {
-
ret = snprintf(certfile, sizeof(certfile),
- "/etc/ssl/%s.crt", hbuf);
+ "/etc/ssl/%s.crt", hbuf);
if (ret < 0 || (size_t)ret >= sizeof(certfile))
goto fail;
@@ -1415,23 +1416,22 @@ relay_load_certfiles(struct relayd *env, struct relay *rlay, const struct keynam
log_debug("%s: using certificate %s", __func__, certfile);
if (name != NULL && strcmp(name->key, "") != 0) {
- if (strlcpy(certfile, name->key, sizeof(certfile))
- >= sizeof(certfile)) {
+ if (strlcpy(certfile, name->key, sizeof(certfile)) >=
+ sizeof(certfile)) {
log_warnx("certificate key truncated");
goto fail;
}
- }
- else {
+ } else {
if (useport) {
ret = snprintf(certfile, sizeof(certfile),
- "/etc/ssl/private/%s:%u.key",
- hbuf, useport);
+ "/etc/ssl/private/%s:%u.key",
+ hbuf, useport);
if (ret < 0 || (size_t)ret >= sizeof(certfile))
goto fail;
} else {
ret = snprintf(certfile, sizeof(certfile),
- "/etc/ssl/private/%s.key", hbuf);
+ "/etc/ssl/private/%s.key", hbuf);
if (ret < 0 || (size_t)ret >= sizeof(certfile))
goto fail;
@@ -1442,24 +1442,22 @@ relay_load_certfiles(struct relayd *env, struct relay *rlay, const struct keynam
log_debug("%s: using private key %s", __func__, certfile);
if (name != NULL && strcmp(name->ocsp, "") != 0) {
- if (strlcpy(certfile, name->ocsp, sizeof(certfile))
- >= sizeof(certfile)) {
+ if (strlcpy(certfile, name->ocsp, sizeof(certfile)) >=
+ sizeof(certfile)) {
log_warnx("certificate ocsp truncated");
goto fail;
}
-
- }
- else {
+ } else {
if (useport) {
ret = snprintf(certfile, sizeof(certfile),
- "/etc/ssl/%s:%u.ocsp",
- hbuf, useport);
+ "/etc/ssl/%s:%u.ocsp",
+ hbuf, useport);
if (ret < 0 || (size_t)ret >= sizeof(certfile))
goto fail;
} else {
ret = snprintf(certfile, sizeof(certfile),
- "/etc/ssl/%s.ocsp", hbuf);
+ "/etc/ssl/%s.ocsp", hbuf);
if (ret < 0 || (size_t)ret >= sizeof(certfile))
goto fail;
@@ -1883,7 +1881,7 @@ prefixlen2mask(u_int8_t prefixlen)
struct in6_addr *
prefixlen2mask6(u_int8_t prefixlen, u_int32_t *mask)
{
- static struct in6_addr s6;
+ static struct in6_addr s6;
int i;
if (prefixlen > 128)
@@ -1914,7 +1912,7 @@ accept_reserve(int sockfd, struct sockaddr *addr, socklen_t *addrlen,
if ((ret = accept4(sockfd, addr, addrlen, SOCK_NONBLOCK)) > -1) {
(*counter)++;
- DPRINTF("%s: inflight incremented, now %d",__func__, *counter);
+ DPRINTF("%s: inflight incremented, now %d", __func__, *counter);
}
return (ret);
}
diff --git a/relayd.h b/relayd.h
index 5fb50ff..9e9282f 100644
--- a/relayd.h
+++ b/relayd.h
@@ -155,7 +155,7 @@ struct ctl_script {
objid_t host;
int retval;
struct timeval timeout;
- char name[HOST_NAME_MAX+1];
+ char name[HOST_NAME_MAX + 1];
char path[PATH_MAX];
};
@@ -174,23 +174,23 @@ struct ctl_icmp_event {
};
struct ctl_tcp_event {
- int s;
- struct ibuf *buf;
- struct host *host;
- struct table *table;
- struct timeval tv_start;
- struct event ev;
- int (*validate_read)(struct ctl_tcp_event *);
- int (*validate_close)(struct ctl_tcp_event *);
+ int s;
+ struct ibuf *buf;
+ struct host *host;
+ struct table *table;
+ struct timeval tv_start;
+ struct event ev;
+ int (*validate_read)(struct ctl_tcp_event *);
+ int (*validate_close)(struct ctl_tcp_event *);
- struct tls *tls;
+ struct tls *tls;
};
enum direction {
RELAY_DIR_INVALID = -1,
- RELAY_DIR_ANY = 0,
- RELAY_DIR_REQUEST = 1,
- RELAY_DIR_RESPONSE = 2
+ RELAY_DIR_ANY = 0,
+ RELAY_DIR_REQUEST = 1,
+ RELAY_DIR_RESPONSE = 2
};
enum relay_state {
@@ -424,7 +424,7 @@ struct host_config {
objid_t parentid;
objid_t tableid;
int retry;
- char name[HOST_NAME_MAX+1];
+ char name[HOST_NAME_MAX + 1];
struct sockaddr_storage ss;
int ttl;
int priority;
@@ -434,7 +434,7 @@ struct host {
TAILQ_ENTRY(host) entry;
TAILQ_ENTRY(host) globalentry;
SLIST_ENTRY(host) child;
- SLIST_HEAD(,host) children;
+ SLIST_HEAD(, host) children;
struct host_config conf;
u_int32_t flags;
char *tablename;
@@ -757,12 +757,12 @@ struct protocol {
enum prototype type;
char *style;
- int (*cmp)(struct rsession *, struct rsession *);
+ int (*cmp)(struct rsession *, struct rsession *);
void *(*validate)(struct rsession *, struct relay *,
- struct sockaddr_storage *,
- u_int8_t *, size_t);
- int (*request)(struct rsession *);
- void (*close)(struct rsession *);
+ struct sockaddr_storage *,
+ u_int8_t *, size_t);
+ int (*request)(struct rsession *);
+ void (*close)(struct rsession *);
struct relay_rules rules;
int rulecount;
@@ -804,7 +804,7 @@ struct relay_config {
objid_t id;
u_int32_t flags;
objid_t proto;
- char name[HOST_NAME_MAX+1];
+ char name[HOST_NAME_MAX + 1];
in_port_t port;
in_port_t dstport;
int dstretry;
@@ -882,7 +882,7 @@ TAILQ_HEAD(netroutelist, netroute);
struct router_config {
objid_t id;
u_int32_t flags;
- char name[HOST_NAME_MAX+1];
+ char name[HOST_NAME_MAX + 1];
char label[RT_LABEL_SIZE];
int nroutes;
objid_t gwtable;
@@ -910,20 +910,20 @@ struct ctl_netroute {
/* initially control.h */
struct control_sock {
- const char *cs_name;
- struct event cs_ev;
- struct event cs_evt;
- int cs_fd;
- int cs_restricted;
- void *cs_env;
+ const char *cs_name;
+ struct event cs_ev;
+ struct event cs_evt;
+ int cs_fd;
+ int cs_restricted;
+ void *cs_env;
- TAILQ_ENTRY(control_sock) cs_entry;
+ TAILQ_ENTRY(control_sock) cs_entry;
};
TAILQ_HEAD(control_socks, control_sock);
struct imsgev {
struct imsgbuf ibuf;
- void (*handler)(int, short, void *);
+ void (*handler)(int, short, void *);
struct event ev;
struct privsep_proc *proc;
void *data;
@@ -936,7 +936,6 @@ struct ctl_conn {
u_int waiting;
#define CTL_CONN_NOTIFY 0x01
struct imsgev iev;
-
};
TAILQ_HEAD(ctl_connlist, ctl_conn);
@@ -1055,13 +1054,13 @@ struct privsep {
struct privsep_proc {
const char *p_title;
enum privsep_procid p_id;
- int (*p_cb)(int, struct privsep_proc *,
- struct imsg *);
- void (*p_init)(struct privsep *,
- struct privsep_proc *);
+ int (*p_cb)(int, struct privsep_proc *,
+ struct imsg *);
+ void (*p_init)(struct privsep *,
+ struct privsep_proc *);
const char *p_chroot;
struct privsep *p_ps;
- void (*p_shutdown)(void);
+ void (*p_shutdown)(void);
struct passwd *p_pw;
};
@@ -1144,13 +1143,12 @@ struct relayd {
#define RELAYD_OPT_LOGCONERR 0x40
/* control.c */
-int control_init(struct privsep *, struct control_sock *);
-int control_listen(struct control_sock *);
-void control_cleanup(struct control_sock *);
-void control_dispatch_imsg(int, short, void *);
-void control_imsg_forward(struct imsg *);
-struct ctl_conn *
- control_connbyfd(int);
+int control_init(struct privsep *, struct control_sock *);
+int control_listen(struct control_sock *);
+void control_cleanup(struct control_sock *);
+void control_dispatch_imsg(int, short, void *);
+void control_imsg_forward(struct imsg *);
+struct ctl_conn *control_connbyfd(int);
/* parse.y */
int parse_config(const char *, struct relayd *);
@@ -1164,11 +1162,11 @@ const char *table_check(enum table_check);
#ifdef DEBUG
const char *relay_state(enum relay_state);
#endif
-const char *print_availability(u_long, u_long);
-const char *print_host(struct sockaddr_storage *, char *, size_t);
-const char *print_time(struct timeval *, struct timeval *, char *, size_t);
-const char *printb_flags(const u_int32_t, const char *);
-void getmonotime(struct timeval *);
+const char *print_availability(u_long, u_long);
+const char *print_host(struct sockaddr_storage *, char *, size_t);
+const char *print_time(struct timeval *, struct timeval *, char *, size_t);
+const char *printb_flags(const u_int32_t, const char *);
+void getmonotime(struct timeval *);
struct ibuf *string2binary(const char *);
void print_hex(uint8_t *, off_t, size_t);
void print_debug(const char *, ...);
@@ -1185,14 +1183,13 @@ int disable_table(struct ctl_conn *, struct ctl_id *);
int disable_host(struct ctl_conn *, struct ctl_id *, struct host *);
/* pfe_filter.c */
-void init_tables(struct relayd *);
-void flush_table(struct relayd *, struct rdr *);
-void sync_table(struct relayd *, struct rdr *, struct table *);
-void sync_ruleset(struct relayd *, struct rdr *, int);
-void flush_rulesets(struct relayd *);
-int natlook(struct relayd *, struct ctl_natlook *);
-u_int64_t
- check_table(struct relayd *, struct rdr *, struct table *);
+void init_tables(struct relayd *);
+void flush_table(struct relayd *, struct rdr *);
+void sync_table(struct relayd *, struct rdr *, struct table *);
+void sync_ruleset(struct relayd *, struct rdr *, int);
+void flush_rulesets(struct relayd *);
+int natlook(struct relayd *, struct ctl_natlook *);
+u_int64_t check_table(struct relayd *, struct rdr *, struct table *);
/* pfe_route.c */
void init_routes(struct relayd *);
@@ -1204,69 +1201,66 @@ void hce(struct privsep *, struct privsep_proc *);
void hce_notify_done(struct host *, enum host_error);
/* relay.c */
-void relay(struct privsep *, struct privsep_proc *);
-int relay_privinit(struct relay *);
-int relay_session_cmp(struct rsession *, struct rsession *);
-void relay_close(struct rsession *, const char *, int);
-int relay_reset_event(struct rsession *, struct ctl_relay_event *);
-void relay_natlook(int, short, void *);
-void relay_session(struct rsession *);
-int relay_from_table(struct rsession *);
-int relay_socket_af(struct sockaddr_storage *, in_port_t);
-in_port_t
- relay_socket_getport(struct sockaddr_storage *);
-int relay_cmp_af(struct sockaddr_storage *,
- struct sockaddr_storage *);
-void relay_write(struct bufferevent *, void *);
-void relay_read(struct bufferevent *, void *);
-int relay_splice(struct ctl_relay_event *);
-int relay_splicelen(struct ctl_relay_event *);
-int relay_spliceadjust(struct ctl_relay_event *);
-void relay_error(struct bufferevent *, short, void *);
-int relay_preconnect(struct rsession *);
-int relay_connect(struct rsession *);
-void relay_connected(int, short, void *);
-void relay_bindanyreq(struct rsession *, in_port_t, int);
-void relay_bindany(int, short, void *);
-void relay_dump(struct ctl_relay_event *, const void *, size_t);
-int relay_bufferevent_add(struct event *, int);
-int relay_bufferevent_print(struct ctl_relay_event *, const char *);
-int relay_bufferevent_write_buffer(struct ctl_relay_event *,
- struct evbuffer *);
-int relay_bufferevent_write_chunk(struct ctl_relay_event *,
- struct evbuffer *, size_t);
-int relay_bufferevent_write(struct ctl_relay_event *,
- void *, size_t);
-int relay_test(struct protocol *, struct ctl_relay_event *);
-void relay_calc_skip_steps(struct relay_rules *);
-void relay_match(struct kvlist *, struct kv *, struct kv *,
- struct kvtree *);
-void relay_session_publish(struct rsession *);
-void relay_session_unpublish(struct rsession *);
+void relay(struct privsep *, struct privsep_proc *);
+int relay_privinit(struct relay *);
+int relay_session_cmp(struct rsession *, struct rsession *);
+void relay_close(struct rsession *, const char *, int);
+int relay_reset_event(struct rsession *, struct ctl_relay_event *);
+void relay_natlook(int, short, void *);
+void relay_session(struct rsession *);
+int relay_from_table(struct rsession *);
+int relay_socket_af(struct sockaddr_storage *, in_port_t);
+in_port_t relay_socket_getport(struct sockaddr_storage *);
+int relay_cmp_af(struct sockaddr_storage *,
+ struct sockaddr_storage *);
+void relay_write(struct bufferevent *, void *);
+void relay_read(struct bufferevent *, void *);
+int relay_splice(struct ctl_relay_event *);
+int relay_splicelen(struct ctl_relay_event *);
+int relay_spliceadjust(struct ctl_relay_event *);
+void relay_error(struct bufferevent *, short, void *);
+int relay_preconnect(struct rsession *);
+int relay_connect(struct rsession *);
+void relay_connected(int, short, void *);
+void relay_bindanyreq(struct rsession *, in_port_t, int);
+void relay_bindany(int, short, void *);
+void relay_dump(struct ctl_relay_event *, const void *, size_t);
+int relay_bufferevent_add(struct event *, int);
+int relay_bufferevent_print(struct ctl_relay_event *, const char *);
+int relay_bufferevent_write_buffer(struct ctl_relay_event *,
+ struct evbuffer *);
+int relay_bufferevent_write_chunk(struct ctl_relay_event *,
+ struct evbuffer *, size_t);
+int relay_bufferevent_write(struct ctl_relay_event *,
+ void *, size_t);
+int relay_test(struct protocol *, struct ctl_relay_event *);
+void relay_calc_skip_steps(struct relay_rules *);
+void relay_match(struct kvlist *, struct kv *, struct kv *,
+ struct kvtree *);
+void relay_session_publish(struct rsession *);
+void relay_session_unpublish(struct rsession *);
SPLAY_PROTOTYPE(session_tree, rsession, se_nodes, relay_session_cmp);
/* relay_http.c */
-void relay_http(struct relayd *);
-void relay_http_init(struct relay *);
-void relay_abort_http(struct rsession *, u_int, const char *,
- u_int16_t);
-void relay_read_http(struct bufferevent *, void *);
-void relay_close_http(struct rsession *);
-u_int relay_httpmethod_byname(const char *);
-const char
- *relay_httpmethod_byid(u_int);
-const char
- *relay_httperror_byid(u_int);
-int relay_http_priv_init(struct rsession *);
-int relay_httpdesc_init(struct ctl_relay_event *);
-ssize_t relay_http_time(time_t, char *, size_t);
+void relay_http(struct relayd *);
+void relay_http_init(struct relay *);
+void relay_abort_http(struct rsession *, u_int, const char *,
+ u_int16_t);
+void relay_read_http(struct bufferevent *, void *);
+void relay_close_http(struct rsession *);
+u_int relay_httpmethod_byname(const char *);
+const char *relay_httpmethod_byid(u_int);
+const char *relay_httperror_byid(u_int);
+int relay_http_priv_init(struct rsession *);
+int relay_httpdesc_init(struct ctl_relay_event *);
+ssize_t relay_http_time(time_t, char *, size_t);
/* relay_udp.c */
void relay_udp_privinit(struct relay *);
void relay_udp_init(struct relayd *, struct relay *);
int relay_udp_bind(struct sockaddr_storage *, in_port_t,
- struct protocol *);
+ struct protocol *);
void relay_udp_server(int, short, void *);
/* check_icmp.c */
@@ -1288,8 +1282,8 @@ int script_exec(struct relayd *, struct ctl_script *);
/* ssl.c */
void ssl_error(const char *);
char *ssl_load_key(struct relayd *, const char *, off_t *, char *);
-uint8_t *ssl_update_certificate(const uint8_t *, size_t, EVP_PKEY *,
- EVP_PKEY *, X509 *, size_t *);
+uint8_t *ssl_update_certificate(const uint8_t *, size_t, EVP_PKEY *,
+ EVP_PKEY *, X509 *, size_t *);
int ssl_load_pkey(char *, off_t, X509 **, EVP_PKEY **);
/* ca.c */
@@ -1298,74 +1292,81 @@ void ca_engine_init(struct relayd *);
void hash_x509(X509 *cert, char *hash, size_t hashlen);
/* relayd.c */
-struct host *host_find(struct relayd *, objid_t);
-struct table *table_find(struct relayd *, objid_t);
-struct rdr *rdr_find(struct relayd *, objid_t);
-struct netroute *route_find(struct relayd *, objid_t);
-struct router *router_find(struct relayd *, objid_t);
-struct host *host_findbyname(struct relayd *, const char *);
-struct table *table_findbyname(struct relayd *, const char *);
-struct table *table_findbyconf(struct relayd *, struct table *);
-struct rdr *rdr_findbyname(struct relayd *, const char *);
-void event_again(struct event *, int, short,
- void (*)(int, short, void *),
- struct timeval *, struct timeval *, void *);
-struct relay *relay_find(struct relayd *, objid_t);
-struct protocol *proto_find(struct relayd *, objid_t);
-struct rsession *session_find(struct relayd *, objid_t);
-struct relay *relay_findbyname(struct relayd *, const char *);
-struct relay *relay_findbyaddr(struct relayd *, struct relay_config *);
-EVP_PKEY *pkey_find(struct relayd *, char *hash);
-struct ca_pkey *pkey_add(struct relayd *, EVP_PKEY *, char *hash);
-struct relay_cert *cert_add(struct relayd *, objid_t);
-struct relay_cert *cert_find(struct relayd *, objid_t);
-char *relay_load_fd(int, off_t *);
-int relay_load_certfiles(struct relayd *, struct relay *,
- const struct keyname *);
-int expand_string(char *, size_t, const char *, const char *);
-void translate_string(char *);
-void purge_key(char **, off_t);
-void purge_table(struct relayd *, struct tablelist *,
- struct table *);
-void purge_relay(struct relayd *, struct relay *);
-char *digeststr(enum digest_type, const u_int8_t *, size_t, char *);
-const char *canonicalize_host(const char *, char *, size_t);
-int parse_url(const char *, char **, char **, char **);
-int map6to4(struct sockaddr_storage *);
-int map4to6(struct sockaddr_storage *, struct sockaddr_storage *);
-void imsg_event_add(struct imsgev *);
-int imsg_compose_event(struct imsgev *, u_int16_t, u_int32_t,
- pid_t, int, void *, u_int16_t);
-void socket_rlimit(int);
-void *get_data(struct ibuf *, size_t);
-int sockaddr_cmp(struct sockaddr *, struct sockaddr *, int);
-struct in6_addr *prefixlen2mask6(u_int8_t, u_int32_t *);
-u_int32_t prefixlen2mask(u_int8_t);
-int accept_reserve(int, struct sockaddr *, socklen_t *, int,
- volatile int *);
-struct kv *kv_add(struct kvtree *, char *, char *, int);
-int kv_set(struct kv *, char *, ...)
- __attribute__((__format__ (printf, 2, 3)));
-int kv_setkey(struct kv *, char *, ...)
- __attribute__((__format__ (printf, 2, 3)));
-void kv_delete(struct kvtree *, struct kv *);
-void kv_purge(struct kvtree *);
-void kv_free(struct kv *);
-struct kv *kv_inherit(struct kv *, struct kv *);
-void relay_log(struct rsession *, char *);
-int kv_log(struct rsession *, struct kv *, u_int16_t,
- enum direction);
-struct kv *kv_find(struct kvtree *, struct kv *);
-struct kv *kv_find_value(struct kvtree *, char *, const char *,
- const char *);
-int kv_cmp(struct kv *, struct kv *);
-int rule_add(struct protocol *, struct relay_rule *, const char
- *);
-void rule_delete(struct relay_rules *, struct relay_rule *);
-void rule_free(struct relay_rule *);
-struct relay_rule
- *rule_inherit(struct relay_rule *);
-void rule_settable(struct relay_rules *, struct relay_table *);
+struct host *host_find(struct relayd *, objid_t);
+struct table *table_find(struct relayd *, objid_t);
+struct rdr *rdr_find(struct relayd *, objid_t);
+struct netroute *route_find(struct relayd *, objid_t);
+struct router *router_find(struct relayd *, objid_t);
+struct host *host_findbyname(struct relayd *, const char *);
+struct table *table_findbyname(struct relayd *, const char *);
+struct table *table_findbyconf(struct relayd *, struct table *);
+struct rdr *rdr_findbyname(struct relayd *, const char *);
+void event_again(struct event *, int, short,
+ void (*)(int, short, void *),
+ struct timeval *, struct timeval *, void *);
+struct relay *relay_find(struct relayd *, objid_t);
+struct protocol *proto_find(struct relayd *, objid_t);
+struct rsession *session_find(struct relayd *, objid_t);
+struct relay *relay_findbyname(struct relayd *, const char *);
+struct relay *relay_findbyaddr(struct relayd *,
+ struct relay_config *);
+EVP_PKEY *pkey_find(struct relayd *, char *hash);
+struct ca_pkey *pkey_add(struct relayd *, EVP_PKEY *, char *hash);
+struct relay_cert *cert_add(struct relayd *, objid_t);
+struct relay_cert *cert_find(struct relayd *, objid_t);
+char *relay_load_fd(int, off_t *);
+int relay_load_certfiles(struct relayd *, struct relay *,
+ const struct keyname *);
+int expand_string(char *, size_t, const char *,
+ const char *);
+void translate_string(char *);
+void purge_key(char **, off_t);
+void purge_table(struct relayd *, struct tablelist *,
+ struct table *);
+void purge_relay(struct relayd *, struct relay *);
+char *digeststr(enum digest_type, const u_int8_t *, size_t,
+ char *);
+const char *canonicalize_host(const char *, char *, size_t);
+int parse_url(const char *, char **, char **, char **);
+int map6to4(struct sockaddr_storage *);
+int map4to6(struct sockaddr_storage *,
+ struct sockaddr_storage *);
+void imsg_event_add(struct imsgev *);
+int imsg_compose_event(struct imsgev *, u_int16_t,
+ u_int32_t,
+ pid_t, int, void *, u_int16_t);
+void socket_rlimit(int);
+void *get_data(struct ibuf *, size_t);
+int sockaddr_cmp(struct sockaddr *, struct sockaddr *,
+ int);
+struct in6_addr *prefixlen2mask6(u_int8_t, u_int32_t *);
+u_int32_t prefixlen2mask(u_int8_t);
+int accept_reserve(int, struct sockaddr *, socklen_t *,
+ int,
+ volatile int *);
+struct kv *kv_add(struct kvtree *, char *, char *, int);
+int kv_set(struct kv *, char *, ...)
+ __attribute__((__format__(printf, 2, 3)));
+int kv_setkey(struct kv *, char *, ...)
+ __attribute__((__format__(printf, 2, 3)));
+void kv_delete(struct kvtree *, struct kv *);
+void kv_purge(struct kvtree *);
+void kv_free(struct kv *);
+struct kv *kv_inherit(struct kv *, struct kv *);
+void relay_log(struct rsession *, char *);
+int kv_log(struct rsession *, struct kv *, u_int16_t,
+ enum direction);
+struct kv *kv_find(struct kvtree *, struct kv *);
+struct kv *kv_find_value(struct kvtree *, char *, const char *,
+ const char *);
+int kv_cmp(struct kv *, struct kv *);
+int rule_add(struct protocol *, struct relay_rule *,
+ const char *);
+void rule_delete(struct relay_rules *, struct relay_rule *);
+void rule_free(struct relay_rule *);
+struct relay_rule *rule_inherit(struct relay_rule *);
+void rule_settable(struct relay_rules *,
+ struct relay_table *);
RB_PROTOTYPE(kvtree, kv, kv_node, kv_cmp);
/* carp.c */
@@ -1396,37 +1397,41 @@ void shuffle_init(struct shuffle *);
u_int16_t shuffle_generate16(struct shuffle *);
/* proc.c */
-enum privsep_procid
- proc_getid(struct privsep_proc *, unsigned int, const char *);
-int proc_flush_imsg(struct privsep *, enum privsep_procid, int);
-void proc_init(struct privsep *, struct privsep_proc *, unsigned int, int,
- int, char **, enum privsep_procid);
-void proc_kill(struct privsep *);
-void proc_connect(struct privsep *);
-void proc_dispatch(int, short event, void *);
-void proc_run(struct privsep *, struct privsep_proc *,
- struct privsep_proc *, unsigned int,
- void (*)(struct privsep *, struct privsep_proc *, void *), void *);
-void proc_range(struct privsep *, enum privsep_procid, int *, int *);
-int proc_compose_imsg(struct privsep *, enum privsep_procid, int,
- u_int16_t, u_int32_t, int, void *, u_int16_t);
-int proc_compose(struct privsep *, enum privsep_procid,
- uint16_t, void *, uint16_t);
-int proc_composev_imsg(struct privsep *, enum privsep_procid, int,
- u_int16_t, u_int32_t, int, const struct iovec *, int);
-int proc_composev(struct privsep *, enum privsep_procid,
- uint16_t, const struct iovec *, int);
-void proc_forward_imsg(struct privsep *, struct imsg *,
- enum privsep_procid);
-struct imsgbuf *
- proc_ibuf(struct privsep *, enum privsep_procid, int);
-struct imsgev *
- proc_iev(struct privsep *, enum privsep_procid, int);
-void imsg_event_add(struct imsgev *);
-int imsg_compose_event(struct imsgev *, uint16_t, uint32_t,
- pid_t, int, void *, uint16_t);
-int imsg_composev_event(struct imsgev *, uint16_t, uint32_t,
- pid_t, int, const struct iovec *, int);
+enum privsep_procid proc_getid(struct privsep_proc *, unsigned int,
+ const char *);
+int proc_flush_imsg(struct privsep *, enum privsep_procid,
+ int);
+void proc_init(struct privsep *, struct privsep_proc *,
+ unsigned int, int,
+ int, char **, enum privsep_procid);
+void proc_kill(struct privsep *);
+void proc_connect(struct privsep *);
+void proc_dispatch(int, short event, void *);
+void proc_run(struct privsep *, struct privsep_proc *,
+ struct privsep_proc *, unsigned int,
+ void (*)(struct privsep *, struct privsep_proc *, void *), void *);
+void proc_range(struct privsep *, enum privsep_procid,
+ int *, int *);
+int proc_compose_imsg(struct privsep *,
+ enum privsep_procid, int,
+ u_int16_t, u_int32_t, int, void *, u_int16_t);
+int proc_compose(struct privsep *, enum privsep_procid,
+ uint16_t, void *, uint16_t);
+int proc_composev_imsg(struct privsep *,
+ enum privsep_procid, int,
+ u_int16_t, u_int32_t, int, const struct iovec *, int);
+int proc_composev(struct privsep *, enum privsep_procid,
+ uint16_t, const struct iovec *, int);
+void proc_forward_imsg(struct privsep *, struct imsg *,
+ enum privsep_procid);
+struct imsgbuf *proc_ibuf(struct privsep *, enum privsep_procid, int);
+struct imsgev *proc_iev(struct privsep *, enum privsep_procid, int);
+void imsg_event_add(struct imsgev *);
+int imsg_compose_event(struct imsgev *, uint16_t, uint32_t,
+ pid_t, int, void *, uint16_t);
+int imsg_composev_event(struct imsgev *, uint16_t,
+ uint32_t,
+ pid_t, int, const struct iovec *, int);
/* config.c */
int config_init(struct relayd *);
diff --git a/ssl.c b/ssl.c
index 4913949..3ad0287 100644
--- a/ssl.c
+++ b/ssl.c
@@ -247,7 +247,7 @@ ssl_error(const char *where)
unsigned long code;
char errbuf[128];
- for (; (code = ERR_get_error()) != 0 ;) {
+ for (; (code = ERR_get_error()) != 0;) {
ERR_error_string_n(code, errbuf, sizeof(errbuf));
log_warnx("SSL library error: %s: %s", where, errbuf);
}
relayd: knfmt