diff options
| author |   remi <remi@openbsd.org> | 2018-06-12 20:02:13 +0000 |
|---|---|---|
| committer | remi <remi@openbsd.org> | 2018-06-12 20:02:13 +0000 |
| commit | 8ec2f88588692038553c90a892327e501571e4d0 (patch) | |
| tree | e3e3c36296ce91a646924b99803ab8a291119475 /usr.sbin/ospf6d | |
| parent | zap stray tab (diff) | |
| download | wireguard-openbsd-8ec2f88588692038553c90a892327e501571e4d0.tar.xz wireguard-openbsd-8ec2f88588692038553c90a892327e501571e4d0.zip | |
Fix resending intra area prefix LSAs on link state or if flag change.
ok jca@
Diffstat (limited to 'usr.sbin/ospf6d')
| -rw-r--r-- | usr.sbin/ospf6d/rde.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/usr.sbin/ospf6d/rde.c b/usr.sbin/ospf6d/rde.c index 578c5d80357..4acca43e9b7 100644 --- a/usr.sbin/ospf6d/rde.c +++ b/usr.sbin/ospf6d/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.74 2018/06/10 14:39:38 remi Exp $ */ +/* $OpenBSD: rde.c,v 1.75 2018/06/12 20:02:13 remi Exp $ */ /* * Copyright (c) 2004, 2005 Claudio Jeker <claudio@openbsd.org> @@ -640,7 +640,7 @@ rde_dispatch_parent(int fd, short event, void *bula) struct lsa *lsa; struct vertex *v; ssize_t n; - int shut = 0, wasvalid; + int shut = 0, link_ok, prev_link_ok; unsigned int ifindex; if (event & EV_READ) { @@ -710,20 +710,23 @@ rde_dispatch_parent(int fd, short event, void *bula) if (iface == NULL) fatalx("interface lost in rde"); - wasvalid = (iface->flags & IFF_UP) && + prev_link_ok = (iface->flags & IFF_UP) && LINK_STATE_IS_UP(iface->linkstate); if_update(iface, ifp->mtu, ifp->flags, ifp->if_type, ifp->linkstate, ifp->baudrate); /* Resend LSAs if interface state changes. */ - if (wasvalid != (iface->flags & IFF_UP) && - LINK_STATE_IS_UP(iface->linkstate)) { - area = area_find(rdeconf, iface->area_id); - if (!area) - fatalx("interface lost area"); - orig_intra_area_prefix_lsas(area); - } + link_ok = (iface->flags & IFF_UP) && + LINK_STATE_IS_UP(iface->linkstate); + if (prev_link_ok == link_ok) + break; + + area = area_find(rdeconf, iface->area_id); + if (!area) + fatalx("interface lost area"); + orig_intra_area_prefix_lsas(area); + break; case IMSG_IFADD: if ((iface = malloc(sizeof(struct iface))) == NULL) |