SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync code with last improvements from OpenBSD

Browse source
This commit is contained in:
purplerain 2023-11-11 01:29:48 +00:00
parent 5903cbe575
commit 62d64fa864
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
841 changed files with 83929 additions and 40755 deletions
Download patch file Download diff file Expand all files Collapse all files

39
usr.sbin/bgpd/logmsg.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: logmsg.c,v 1.9 2022/08/24 17:14:02 claudio Exp $ */
/* $OpenBSD: logmsg.c,v 1.10 2023/10/14 09:46:14 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -60,55 +60,54 @@ log_fmt_peer(const struct peer_config *peer)
void
log_peer_info(const struct peer_config *peer, const char *emsg, ...)
{
char *p, *nfmt;
char *p, *msg;
va_list ap;
p = log_fmt_peer(peer);
if (asprintf(&nfmt, "%s: %s", p, emsg) == -1)
fatal(NULL);
va_start(ap, emsg);
vlog(LOG_INFO, nfmt, ap);
if (vasprintf(&msg, emsg, ap) == -1)
fatal(NULL);
va_end(ap);
logit(LOG_INFO, "%s: %s", p, msg);
free(msg);
free(p);
free(nfmt);
}
void
log_peer_warn(const struct peer_config *peer, const char *emsg, ...)
{
char *p, *nfmt;
char *p, *msg;
va_list ap;
int saved_errno = errno;
p = log_fmt_peer(peer);
if (emsg == NULL) {
if (asprintf(&nfmt, "%s: %s", p, strerror(errno)) == -1)
fatal(NULL);
logit(LOG_ERR, "%s: %s", p, strerror(saved_errno));
} else {
if (asprintf(&nfmt, "%s: %s: %s", p, emsg, strerror(errno)) ==
-1)
va_start(ap, emsg);
if (vasprintf(&msg, emsg, ap) == -1)
fatal(NULL);
va_end(ap);
logit(LOG_ERR, "%s: %s: %s", p, msg, strerror(saved_errno));
free(msg);
}
va_start(ap, emsg);
vlog(LOG_ERR, nfmt, ap);
va_end(ap);
free(p);
free(nfmt);
}
void
log_peer_warnx(const struct peer_config *peer, const char *emsg, ...)
{
char *p, *nfmt;
char *p, *msg;
va_list ap;
p = log_fmt_peer(peer);
if (asprintf(&nfmt, "%s: %s", p, emsg) == -1)
fatal(NULL);
va_start(ap, emsg);
vlog(LOG_ERR, nfmt, ap);
if (vasprintf(&msg, emsg, ap) == -1)
fatal(NULL);
va_end(ap);
logit(LOG_ERR, "%s: %s", p, msg);
free(msg);
free(p);
free(nfmt);
}
void