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/lsack.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/lsack.c')
| -rw-r--r-- | proto/ospf/lsack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/proto/ospf/lsack.c b/proto/ospf/lsack.c index 14832b8..bb1afa0 100644 --- a/proto/ospf/lsack.c +++ b/proto/ospf/lsack.c @@ -37,7 +37,7 @@ ospf_lsack_send(struct ospf_neighbor *n, int queue) struct ospf_lsa_header *h; struct lsah_n *no; struct ospf_iface *ifa = n->ifa; - struct proto *p = &n->ifa->proto->proto; + struct proto *p = &n->ifa->oa->po->proto; if (EMPTY_LIST(n->ackl[queue])) return; @@ -122,7 +122,7 @@ ospf_lsack_receive(struct ospf_lsack_packet *ps, struct ospf_lsa_header lsa, *plsa; u16 nolsa; struct top_hash_entry *en; - struct proto *p = (struct proto *) ifa->proto; + struct proto *p = &ifa->oa->po->proto; unsigned int size = ntohs(ps->ospf_packet.length), i; OSPF_TRACE(D_PACKETS, "Received LS ack from %I", n->ip); @@ -146,7 +146,7 @@ ospf_lsack_receive(struct ospf_lsack_packet *ps, for (i = 0; i < nolsa; i++) { ntohlsah(plsa + i, &lsa); - if ((en = ospf_hash_find_header(n->lsrth, &lsa)) == NULL) + if ((en = ospf_hash_find_header(n->lsrth, n->ifa->oa->areaid, &lsa)) == NULL) continue; /* pg 155 */ if (lsa_comp(&lsa, &en->lsa) != CMP_SAME) /* pg 156 */ |