diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2014-08-19 18:15:40 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2014-08-19 18:15:40 +0200 |
| commit | 1520e4748129c4eb97ac3090bcc97149a1900611 (patch) | |
| tree | f4501a77bcb9e3ecabfd9dd5f80ee3e71cb35119 /lib | |
| parent | 342a31bfda21616209366679ac522471e5772a2f (diff) | |
| parent | 90444ca35e3037ed43ec695428f0ef6d82f9a320 (diff) | |
| download | quagga-1520e4748129c4eb97ac3090bcc97149a1900611.tar.bz2 quagga-1520e4748129c4eb97ac3090bcc97149a1900611.tar.xz | |
*: merge branch stable/0.99.23
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/queue.h | 2 | ||||
| -rw-r--r-- | lib/zclient.c | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/queue.h b/lib/queue.h index 70cffab1..48b363e2 100644 --- a/lib/queue.h +++ b/lib/queue.h @@ -33,8 +33,6 @@ #ifndef _SYS_QUEUE_H_ #define _SYS_QUEUE_H_ -#include <sys/cdefs.h> - /* * This file defines four types of data structures: singly-linked lists, * singly-linked tail queues, lists and tail queues. diff --git a/lib/zclient.c b/lib/zclient.c index 20188f6a..3b5477e9 100644 --- a/lib/zclient.c +++ b/lib/zclient.c @@ -805,6 +805,16 @@ zebra_interface_address_read (int type, struct stream *s) ifc->flags = ifc_flags; if (ifc->destination) ifc->destination->prefixlen = ifc->address->prefixlen; + else if (CHECK_FLAG(ifc->flags, ZEBRA_IFA_PEER)) + { + /* carp interfaces on OpenBSD with 0.0.0.0/0 as "peer" */ + char buf[BUFSIZ]; + prefix2str (ifc->address, buf, sizeof(buf)); + zlog_warn("warning: interface %s address %s " + "with peer flag set, but no peer address!", + ifp->name, buf); + UNSET_FLAG(ifc->flags, ZEBRA_IFA_PEER); + } } } else |