diff options
| author | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-28 03:34:39 +0000 |
|---|---|---|
| committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-04-28 03:34:39 +0000 |
| commit | c650ec55433e876493ee7b7442019915aafed0e0 (patch) | |
| tree | aaafd6d75f11411ff9729d2b361af78fb2f1a1c4 | |
| parent | b6ba89594dc146529ba9f49449537f2ba9dfd3b1 (diff) | |
make this at least compile
| -rw-r--r-- | usr.sbin/bgpd/pfkey.c | 10 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 8 |
2 files changed, 13 insertions, 5 deletions
diff --git a/usr.sbin/bgpd/pfkey.c b/usr.sbin/bgpd/pfkey.c index ad64dbd893c..1163a4c5fab 100644 --- a/usr.sbin/bgpd/pfkey.c +++ b/usr.sbin/bgpd/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.24 2004/04/28 03:19:52 markus Exp $ */ +/* $OpenBSD: pfkey.c,v 1.25 2004/04/28 03:34:38 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -424,8 +424,12 @@ pfkey_reply(int sd, u_int32_t *spip) } if (hdr.sadb_msg_errno != 0) { errno = hdr.sadb_msg_errno; - log_warn("pfkey"); - return (-1); + if (errno == ESRCH) + return (0); + else { + log_warn("pfkey"); + return (-1); + } } len = hdr.sadb_msg_len * PFKEY2_CHUNK; if ((data = malloc(len)) == NULL) { diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 2c8d7d94fce..ef84b6d689e 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.106 2004/04/28 02:57:27 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.107 2004/04/28 03:34:38 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -1056,14 +1056,18 @@ peer_down(u_int32_t id) void peer_dump(u_int32_t id, u_int16_t afi, u_int8_t safi) { - if (afi == AFI_ALL | afi == AFI_IPv4) + if (afi == AFI_ALL || afi == AFI_IPv4) if (safi == SAFI_ALL || safi == SAFI_UNICAST || safi == SAFI_BOTH) { +#if 0 pt_dump(up_dump_upcall, peer); +#endif return; } +#if 0 log_peer_warnx(&peer->conf, "unsupported AFI, SAFI combination"); +#endif } /* |