diff options
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_log.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_log.c | 51 |
1 files changed, 46 insertions, 5 deletions
diff --git a/net/openbgpd/files/patch-bgpd_log.c b/net/openbgpd/files/patch-bgpd_log.c index 603711ce1158..ca58a9bcfa0c 100644 --- a/net/openbgpd/files/patch-bgpd_log.c +++ b/net/openbgpd/files/patch-bgpd_log.c @@ -2,13 +2,13 @@ Index: bgpd/log.c =================================================================== RCS file: /home/cvs/private/hrs/openbgpd/bgpd/log.c,v retrieving revision 1.1.1.5 -retrieving revision 1.1.1.6 -diff -u -p -r1.1.1.5 -r1.1.1.6 +retrieving revision 1.1.1.7 +diff -u -p -r1.1.1.5 -r1.1.1.7 --- bgpd/log.c 14 Feb 2010 20:19:57 -0000 1.1.1.5 -+++ bgpd/log.c 14 Feb 2010 20:27:06 -0000 1.1.1.6 ++++ bgpd/log.c 12 Jun 2011 10:44:25 -0000 1.1.1.7 @@ -1,4 +1,4 @@ -/* $OpenBSD: log.c,v 1.50 2007/04/23 13:04:24 claudio Exp $ */ -+/* $OpenBSD: log.c,v 1.53 2009/12/03 19:20:35 claudio Exp $ */ ++/* $OpenBSD: log.c,v 1.54 2010/11/18 12:51:24 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -62,7 +62,48 @@ diff -u -p -r1.1.1.5 -r1.1.1.6 va_start(ap, emsg); vlog(LOG_DEBUG, emsg, ap); va_end(ap); -@@ -318,6 +327,9 @@ log_conn_attempt(const struct peer *peer +@@ -250,7 +259,7 @@ log_statechange(struct peer *peer, enum + + void + log_notification(const struct peer *peer, u_int8_t errcode, u_int8_t subcode, +- u_char *data, u_int16_t datalen) ++ u_char *data, u_int16_t datalen, const char *dir) + { + char *p; + const char *suberrname = NULL; +@@ -287,23 +296,22 @@ log_notification(const struct peer *peer + uk = 1; + break; + default: +- logit(LOG_CRIT, "%s: received notification, unknown errcode " +- "%u, subcode %u", p, errcode, subcode); ++ logit(LOG_CRIT, "%s: %s notification, unknown errcode " ++ "%u, subcode %u", p, dir, errcode, subcode); + free(p); + return; + } + + if (uk) +- logit(LOG_CRIT, +- "%s: received notification: %s, unknown subcode %u", +- p, errnames[errcode], subcode); ++ logit(LOG_CRIT, "%s: %s notification: %s, unknown subcode %u", ++ p, dir, errnames[errcode], subcode); + else { + if (suberrname == NULL) +- logit(LOG_CRIT, "%s: received notification: %s", +- p, errnames[errcode]); ++ logit(LOG_CRIT, "%s: %s notification: %s", p, ++ dir, errnames[errcode]); + else +- logit(LOG_CRIT, "%s: received notification: %s, %s", +- p, errnames[errcode], suberrname); ++ logit(LOG_CRIT, "%s: %s notification: %s, %s", ++ p, dir, errnames[errcode], suberrname); + } + free(p); + } +@@ -318,6 +326,9 @@ log_conn_attempt(const struct peer *peer b = log_sockaddr(sa); logit(LOG_INFO, "connection from non-peer %s refused", b); } else { |