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/lsreq.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/lsreq.c')
| -rw-r--r-- | proto/ospf/lsreq.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/proto/ospf/lsreq.c b/proto/ospf/lsreq.c index 64f1082..3c8b722 100644 --- a/proto/ospf/lsreq.c +++ b/proto/ospf/lsreq.c @@ -18,7 +18,7 @@ ospf_lsreq_send(struct ospf_neighbor *n) struct ospf_lsreq_header *lsh; u16 length; int i, j; - struct proto *p = &n->ifa->proto->proto; + struct proto *p = &n->ifa->oa->po->proto; pk = (struct ospf_lsreq_packet *) n->ifa->ip_sk->tbuf; op = (struct ospf_packet *) n->ifa->ip_sk->tbuf; @@ -73,7 +73,9 @@ ospf_lsreq_receive(struct ospf_lsreq_packet *ps, slab *upslab; unsigned int size = ntohs(ps->ospf_packet.length); int i, lsano; - struct proto *p = (struct proto *) ifa->proto; + struct ospf_area *oa = ifa->oa; + struct proto_ospf *po = oa->po; + struct proto *p = &po->proto; if (n->state < NEIGHBOR_EXCHANGE) return; @@ -96,7 +98,7 @@ ospf_lsreq_receive(struct ospf_lsreq_packet *ps, llsh->lsh.rt = ntohl(lsh->rt); llsh->lsh.type = lsh->type; add_tail(&uplist, NODE llsh); - if (ospf_hash_find(n->ifa->oa->gr, llsh->lsh.id, llsh->lsh.rt, + if (ospf_hash_find(po->gr, oa->areaid, llsh->lsh.id, llsh->lsh.rt, llsh->lsh.type) == NULL) { log(L_WARN |