Re: relayd: use __func__ in log messages

[Sebastian Benoit]

thanks for both this and your httpd diff, both commited.

Hiltjo Posthuma(hil...@codemadness.org) on 2017.05.07 20:56:25 +0200:
> Hey,
> 
> This replaces the prefix in log messages to __func__. Some older code had
> the prefix still set to another name. Patch below:
> 
> 
> diff --git a/usr.sbin/relayd/ca.c b/usr.sbin/relayd/ca.c
> index 45bd5f3224b..de002488d9c 100644
> --- a/usr.sbin/relayd/ca.c
> +++ b/usr.sbin/relayd/ca.c
> @@ -96,11 +96,11 @@ ca_launch(void)
>   if (rlay->rl_conf.tls_key_len) {
>   if ((in = BIO_new_mem_buf(rlay->rl_tls_key,
>   rlay->rl_conf.tls_key_len)) == NULL)
> - fatalx("ca_launch: key");
> + fatalx("%s: key", __func__);
>  
>   if ((pkey = PEM_read_bio_PrivateKey(in,
>   NULL, NULL, NULL)) == NULL)
> - fatalx("ca_launch: PEM");
> + fatalx("%s: PEM", __func__);
>   BIO_free(in);
>  
>   rlay->rl_tls_pkey = pkey;
> @@ -119,11 +119,11 @@ ca_launch(void)
>   if (rlay->rl_conf.tls_cakey_len) {
>   if ((in = BIO_new_mem_buf(rlay->rl_tls_cakey,
>   rlay->rl_conf.tls_cakey_len)) == NULL)
> - fatalx("ca_launch: key");
> + fatalx("%s: key", __func__);
>  
>   if ((pkey = PEM_read_bio_PrivateKey(in,
>   NULL, NULL, NULL)) == NULL)
> - fatalx("ca_launch: PEM");
> + fatalx("%s: PEM", __func__);
>   BIO_free(in);
>  
>   rlay->rl_tls_capkey = pkey;
> @@ -181,21 +181,18 @@ ca_dispatch_relay(int fd, struct privsep_proc *p, 
> struct imsg *imsg)
>   IMSG_SIZE_CHECK(imsg, ());
>   bcopy(imsg->data, , sizeof(cko));
>   if (cko.cko_proc > env->sc_conf.prefork_relay)
> - fatalx("ca_dispatch_relay: "
> - "invalid relay proc");
> + fatalx("%s: invalid relay proc", __func__);
>   if (IMSG_DATA_SIZE(imsg) != (sizeof(cko) + cko.cko_flen))
> - fatalx("ca_dispatch_relay: "
> - "invalid key operation");
> + fatalx("%s: invalid key operation", __func__);
>   if ((pkey = pkey_find(env, cko.cko_id)) == NULL ||
>   (rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
> - fatalx("ca_dispatch_relay: "
> - "invalid relay key or id");
> + fatalx("%s: invalid relay key or id", __func__);
>  
>   DPRINTF("%s:%d: key id %d", __func__, __LINE__, cko.cko_id);
>  
>   from = (u_char *)imsg->data + sizeof(cko);
>   if ((to = calloc(1, cko.cko_tlen)) == NULL)
> - fatalx("ca_dispatch_relay: calloc");
> + fatalx("%s: calloc", __func__);
>  
>   switch (imsg->hdr.type) {
>   case IMSG_CA_PRIVENC:
> @@ -294,16 +291,16 @@ rsae_send_imsg(int flen, const u_char *from, u_char 
> *to, RSA *rsa,
>*/
>   imsg_composev(ibuf, cmd, 0, 0, -1, iov, cnt);
>   if (imsg_flush(ibuf) == -1)
> - log_warn("rsae_send_imsg: imsg_flush");
> + log_warn("%s: imsg_flush", __func__);
>  
>   pfd[0].fd = ibuf->fd;
>   pfd[0].events = POLLIN;
>   while (!done) {
>   switch (poll(pfd, 1, RELAY_TLS_PRIV_TIMEOUT)) {
>   case -1:
> - fatal("rsae_send_imsg: poll");
> + fatal("%s: poll", __func__);
>   case 0:
> - log_warnx("rsae_send_imsg: poll timeout");
> + log_warnx("%s: poll timeout", __func__);
>   break;
>   default:
>   break;
> diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c
> index 3ba5179856d..cc98d258280 100644
> --- a/usr.sbin/relayd/check_icmp.c
> +++ b/usr.sbin/relayd/check_icmp.c
> @@ -53,10 +53,10 @@ icmp_setup(struct relayd *env, struct ctl_icmp_event 
> *cie, int af)
>   if (af == AF_INET6)
>   proto = IPPROTO_ICMPV6;
>   if ((cie->s = socket(af, SOCK_RAW | SOCK_NONBLOCK, proto)) < 0)
> - fatal("icmp_setup: socket");
> + fatal("%s: socket", __func__);
>   val = ICMP_RCVBUF_SIZE;
>   if (setsockopt(cie->s, SOL_SOCKET, SO_RCVBUF, , sizeof(val)) == -1)
> - fatal("icmp_setup: setsockopt");
> + fatal("%s: setsockopt", __func__);
>   cie->env = env;
>   cie->af = af;
>  }
> diff --git a/usr.sbin/relayd/check_script.c b/usr.sbin/relayd/check_script.c
> index 9bb494c7275..a97c91e10b2 100644
> --- a/usr.sbin/relayd/check_script.c
> +++ b/usr.sbin/relayd/check_script.c
> @@ -39,7 

relayd: use __func__ in log messages

[Hiltjo Posthuma]

Hey,

This replaces the prefix in log messages to __func__. Some older code had
the prefix still set to another name. Patch below:


diff --git a/usr.sbin/relayd/ca.c b/usr.sbin/relayd/ca.c
index 45bd5f3224b..de002488d9c 100644
--- a/usr.sbin/relayd/ca.c
+++ b/usr.sbin/relayd/ca.c
@@ -96,11 +96,11 @@ ca_launch(void)
if (rlay->rl_conf.tls_key_len) {
if ((in = BIO_new_mem_buf(rlay->rl_tls_key,
rlay->rl_conf.tls_key_len)) == NULL)
-   fatalx("ca_launch: key");
+   fatalx("%s: key", __func__);
 
if ((pkey = PEM_read_bio_PrivateKey(in,
NULL, NULL, NULL)) == NULL)
-   fatalx("ca_launch: PEM");
+   fatalx("%s: PEM", __func__);
BIO_free(in);
 
rlay->rl_tls_pkey = pkey;
@@ -119,11 +119,11 @@ ca_launch(void)
if (rlay->rl_conf.tls_cakey_len) {
if ((in = BIO_new_mem_buf(rlay->rl_tls_cakey,
rlay->rl_conf.tls_cakey_len)) == NULL)
-   fatalx("ca_launch: key");
+   fatalx("%s: key", __func__);
 
if ((pkey = PEM_read_bio_PrivateKey(in,
NULL, NULL, NULL)) == NULL)
-   fatalx("ca_launch: PEM");
+   fatalx("%s: PEM", __func__);
BIO_free(in);
 
rlay->rl_tls_capkey = pkey;
@@ -181,21 +181,18 @@ ca_dispatch_relay(int fd, struct privsep_proc *p, struct 
imsg *imsg)
IMSG_SIZE_CHECK(imsg, ());
bcopy(imsg->data, , sizeof(cko));
if (cko.cko_proc > env->sc_conf.prefork_relay)
-   fatalx("ca_dispatch_relay: "
-   "invalid relay proc");
+   fatalx("%s: invalid relay proc", __func__);
if (IMSG_DATA_SIZE(imsg) != (sizeof(cko) + cko.cko_flen))
-   fatalx("ca_dispatch_relay: "
-   "invalid key operation");
+   fatalx("%s: invalid key operation", __func__);
if ((pkey = pkey_find(env, cko.cko_id)) == NULL ||
(rsa = EVP_PKEY_get1_RSA(pkey)) == NULL)
-   fatalx("ca_dispatch_relay: "
-   "invalid relay key or id");
+   fatalx("%s: invalid relay key or id", __func__);
 
DPRINTF("%s:%d: key id %d", __func__, __LINE__, cko.cko_id);
 
from = (u_char *)imsg->data + sizeof(cko);
if ((to = calloc(1, cko.cko_tlen)) == NULL)
-   fatalx("ca_dispatch_relay: calloc");
+   fatalx("%s: calloc", __func__);
 
switch (imsg->hdr.type) {
case IMSG_CA_PRIVENC:
@@ -294,16 +291,16 @@ rsae_send_imsg(int flen, const u_char *from, u_char *to, 
RSA *rsa,
 */
imsg_composev(ibuf, cmd, 0, 0, -1, iov, cnt);
if (imsg_flush(ibuf) == -1)
-   log_warn("rsae_send_imsg: imsg_flush");
+   log_warn("%s: imsg_flush", __func__);
 
pfd[0].fd = ibuf->fd;
pfd[0].events = POLLIN;
while (!done) {
switch (poll(pfd, 1, RELAY_TLS_PRIV_TIMEOUT)) {
case -1:
-   fatal("rsae_send_imsg: poll");
+   fatal("%s: poll", __func__);
case 0:
-   log_warnx("rsae_send_imsg: poll timeout");
+   log_warnx("%s: poll timeout", __func__);
break;
default:
break;
diff --git a/usr.sbin/relayd/check_icmp.c b/usr.sbin/relayd/check_icmp.c
index 3ba5179856d..cc98d258280 100644
--- a/usr.sbin/relayd/check_icmp.c
+++ b/usr.sbin/relayd/check_icmp.c
@@ -53,10 +53,10 @@ icmp_setup(struct relayd *env, struct ctl_icmp_event *cie, 
int af)
if (af == AF_INET6)
proto = IPPROTO_ICMPV6;
if ((cie->s = socket(af, SOCK_RAW | SOCK_NONBLOCK, proto)) < 0)
-   fatal("icmp_setup: socket");
+   fatal("%s: socket", __func__);
val = ICMP_RCVBUF_SIZE;
if (setsockopt(cie->s, SOL_SOCKET, SO_RCVBUF, , sizeof(val)) == -1)
-   fatal("icmp_setup: setsockopt");
+   fatal("%s: setsockopt", __func__);
cie->env = env;
cie->af = af;
 }
diff --git a/usr.sbin/relayd/check_script.c b/usr.sbin/relayd/check_script.c
index 9bb494c7275..a97c91e10b2 100644
--- a/usr.sbin/relayd/check_script.c
+++ b/usr.sbin/relayd/check_script.c
@@ -39,7 +39,7 @@ check_script(struct relayd *env, struct host *host)
struct table*table;
 
if ((table = table_find(env, host->conf.tableid)) == NULL)
-