summaryrefslogtreecommitdiffstats
path: root/proto/ospf/neighbor.c
diff options
context:
space:
mode:
authorOndrej Zajicek <santiago@crfreenet.org>2010-02-11 10:23:35 +0100
committerOndrej Zajicek <santiago@crfreenet.org>2010-02-11 10:23:35 +0100
commit353729f513aa6a1f9e7f66083a0f9d2117fe2be5 (patch)
tree2ce53e3f1b1eb40b852de490db8a65eb681fadfd /proto/ospf/neighbor.c
parent75f8861898d53f43cb23dbba9c776bce223c18c8 (diff)
downloadbird-353729f513aa6a1f9e7f66083a0f9d2117fe2be5.tar
bird-353729f513aa6a1f9e7f66083a0f9d2117fe2be5.zip
Temporary OSPF commit - socket changes.
Diffstat (limited to 'proto/ospf/neighbor.c')
-rw-r--r--proto/ospf/neighbor.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c
index 0411d48..89acf54 100644
--- a/proto/ospf/neighbor.c
+++ b/proto/ospf/neighbor.c
@@ -450,13 +450,12 @@ bdr_election(struct ospf_iface *ifa)
me.state = NEIGHBOR_2WAY;
me.rid = myid;
me.priority = ifa->priority;
+ me.ip = ifa->addr->ip;
#ifdef OSPFv2
- me.ip = ifa->iface->addr->ip;
me.dr = ipa_to_u32(ifa->drip);
me.bdr = ipa_to_u32(ifa->bdrip);
#else /* OSPFv3 */
- me.ip = ifa->lladdr;
me.dr = ifa->drid;
me.bdr = ifa->bdrid;
me.iface_id = ifa->iface->index;