summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorremi <remi@cvs.openbsd.org>2019-04-23 06:15:15 +0000
committerremi <remi@cvs.openbsd.org>2019-04-23 06:15:15 +0000
commit0652f857a6cac245c1cf16f4c8c61648480f202d (patch)
tree69f2ccba3447a735630bc0267b657058462b9e43
parentbce60acd42f01101bfcaa3f12153d0e9b144dc12 (diff)
Use the network address instead of the interface address for the "link id"
of P2P interfaces "stub net" LS. This is related to revision 1.77 of rde_spf.c. Problem reported by Mitchll Krome on tech@. ok benno@
-rw-r--r--usr.sbin/ospfd/ospfe.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.sbin/ospfd/ospfe.c b/usr.sbin/ospfd/ospfe.c
index 019cc944edb..d17c5ef09d5 100644
--- a/usr.sbin/ospfd/ospfe.c
+++ b/usr.sbin/ospfd/ospfe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ospfe.c,v 1.104 2019/04/23 06:08:57 remi Exp $ */
+/* $OpenBSD: ospfe.c,v 1.105 2019/04/23 06:15:14 remi Exp $ */
/*
* Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -909,7 +909,8 @@ orig_rtr_lsa(struct area *area)
rtr_link.id = nbr->addr.s_addr;
rtr_link.data = 0xffffffff;
} else {
- rtr_link.id = iface->addr.s_addr;
+ rtr_link.id = iface->addr.s_addr &
+ iface->mask.s_addr;
rtr_link.data = iface->mask.s_addr;
}
rtr_link.type = LINK_TYPE_STUB_NET;