diff options
| author | Ondrej Zajicek <santiago@crfreenet.org> | 2010-03-26 18:53:31 +0100 |
|---|---|---|
| committer | Ondrej Zajicek <santiago@crfreenet.org> | 2010-03-26 18:53:31 +0100 |
| commit | eb0f129fcedcecbee85403095abad8f59b82683c (patch) | |
| tree | 562179cf65bcdcfe1fc2ea42b401ddce620de350 /proto/ospf/neighbor.c | |
| parent | b1c030b0ba59eed6da5271ed592d6b93ed088518 (diff) | |
| parent | 48cff379a718998cd984d60fb6f8b48cb961c0f1 (diff) | |
| download | bird-eb0f129fcedcecbee85403095abad8f59b82683c.tar bird-eb0f129fcedcecbee85403095abad8f59b82683c.zip | |
Merge branch 'socket2' into new
Diffstat (limited to 'proto/ospf/neighbor.c')
| -rw-r--r-- | proto/ospf/neighbor.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c index 13abc56..69c5880 100644 --- a/proto/ospf/neighbor.c +++ b/proto/ospf/neighbor.c @@ -449,13 +449,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; |