diff options
| author | Ondrej Filip <feela@network.cz> | 2004-07-15 18:37:52 +0200 |
|---|---|---|
| committer | Ondrej Filip <feela@network.cz> | 2004-07-15 18:37:52 +0200 |
| commit | 86c84d76b706e77ec5977a3c9e300b0fca9f6b10 (patch) | |
| tree | 77663b13c8f4741893df9d4334c032c848820c46 /proto/ospf/hello.c | |
| parent | 777acf91bb0d8ca0f33f367ae5fa00f46dde5a9a (diff) | |
| download | bird-86c84d76b706e77ec5977a3c9e300b0fca9f6b10.tar bird-86c84d76b706e77ec5977a3c9e300b0fca9f6b10.zip | |
Huge OSPF database redesign. Since now, all LSAs of all areas
are in single database. This avoids duplication of external LSAs and
fixes bug in external LSA distribution.
Diffstat (limited to 'proto/ospf/hello.c')
| -rw-r--r-- | proto/ospf/hello.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/proto/ospf/hello.c b/proto/ospf/hello.c index 350bad7..58d1423 100644 --- a/proto/ospf/hello.c +++ b/proto/ospf/hello.c @@ -16,7 +16,7 @@ ospf_hello_receive(struct ospf_hello_packet *ps, ip_addr olddr, oldbdr; ip_addr mask; char *beg = "Bad OSPF hello packet from ", *rec = " received: "; - struct proto *p = (struct proto *) ifa->proto; + struct proto *p = (struct proto *) ifa->oa->po; unsigned int size = ntohs(ps->ospf_packet.length), i, twoway, oldpriority, eligible = 0, peers; OSPF_TRACE(D_PACKETS, "Received hello from %I via %s%s", faddr, @@ -172,6 +172,7 @@ ospf_hello_send(timer * timer, int poll, struct ospf_neighbor *dirn) u32 *pp; int i, send; struct nbma_node *nb; + if (timer == NULL) ifa = dirn->ifa; else @@ -183,7 +184,7 @@ ospf_hello_send(timer * timer, int poll, struct ospf_neighbor *dirn) if (ifa->stub) return; /* Don't send any packet on stub iface */ - p = (struct proto *) (ifa->proto); + p = (struct proto *) (ifa->oa->po); DBG("%s: Hello/Poll timer fired on interface %s.\n", p->name, ifa->iface->name); /* Now we should send a hello packet */ |