diff options
| author | Hiroki Sato <hrs@FreeBSD.org> | 2010-02-16 19:27:03 +0000 |
|---|---|---|
| committer | Hiroki Sato <hrs@FreeBSD.org> | 2010-02-16 19:27:03 +0000 |
| commit | 7ab9a19af615666cef45e1b4538c8460d19e1ec0 (patch) | |
| tree | 301a68c22691daf3b616754a383cd1730c23dae7 /net/openbgpd/files/patch-bgpd_log.c | |
| parent | Add updating instructions for sysutils/bacula-{server,client}. (diff) | |
Update to 4.6.20100215.
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=249966
Diffstat (limited to 'net/openbgpd/files/patch-bgpd_log.c')
| -rw-r--r-- | net/openbgpd/files/patch-bgpd_log.c | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/net/openbgpd/files/patch-bgpd_log.c b/net/openbgpd/files/patch-bgpd_log.c new file mode 100644 index 000000000000..603711ce1158 --- /dev/null +++ b/net/openbgpd/files/patch-bgpd_log.c @@ -0,0 +1,74 @@ +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 +--- 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 +@@ -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 $ */ + + /* + * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> +@@ -32,6 +32,7 @@ + #include "log.h" + + int debug; ++int verbose; + + void logit(int, const char *, ...); + +@@ -42,8 +43,9 @@ log_fmt_peer(const struct peer_config *p + char *pfmt, *p; + + ip = log_addr(&peer->remote_addr); +- if ((peer->remote_addr.af == AF_INET && peer->remote_masklen != 32) || +- (peer->remote_addr.af == AF_INET6 && peer->remote_masklen != 128)) { ++ if ((peer->remote_addr.aid == AID_INET && peer->remote_masklen != 32) || ++ (peer->remote_addr.aid == AID_INET6 && ++ peer->remote_masklen != 128)) { + if (asprintf(&p, "%s/%u", ip, peer->remote_masklen) == -1) + fatal(NULL); + } else { +@@ -69,6 +71,7 @@ log_init(int n_debug) + extern char *__progname; + + debug = n_debug; ++ verbose = n_debug; + + if (!debug) + openlog(__progname, LOG_PID | LOG_NDELAY, LOG_DAEMON); +@@ -77,6 +80,12 @@ log_init(int n_debug) + } + + void ++log_verbose(int v) ++{ ++ verbose = v; ++} ++ ++void + logit(int pri, const char *fmt, ...) + { + va_list ap; +@@ -193,7 +202,7 @@ log_debug(const char *emsg, ...) + { + va_list ap; + +- if (debug) { ++ if (verbose) { + va_start(ap, emsg); + vlog(LOG_DEBUG, emsg, ap); + va_end(ap); +@@ -318,6 +327,9 @@ log_conn_attempt(const struct peer *peer + b = log_sockaddr(sa); + logit(LOG_INFO, "connection from non-peer %s refused", b); + } else { ++ /* only log if there is a chance that the session may come up */ ++ if (peer->conf.down && peer->state == STATE_IDLE) ++ return; + p = log_fmt_peer(&peer->conf); + logit(LOG_INFO, "Connection attempt from %s while session is " + "in state %s", p, statenames[peer->state]); |