summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOndrej Filip <feela@network.cz>2000-04-17 22:42:42 +0200
committerOndrej Filip <feela@network.cz>2000-04-17 22:42:42 +0200
commit38130b863ffcab6b45484e4e5f1eca1dd933bb1a (patch)
tree1180ae19f81bb3b2582ce9424f41a75ba2a75856
parent52276996063bc4a0fbcb642f5075df1cde7ce684 (diff)
downloadbird-38130b863ffcab6b45484e4e5f1eca1dd933bb1a.tar
bird-38130b863ffcab6b45484e4e5f1eca1dd933bb1a.zip
Small change in LSA originating.
-rw-r--r--proto/ospf/lsupd.c33
-rw-r--r--proto/ospf/lsupd.h3
-rw-r--r--proto/ospf/topology.c1
3 files changed, 28 insertions, 9 deletions
diff --git a/proto/ospf/lsupd.c b/proto/ospf/lsupd.c
index f2554b2..62b6f76 100644
--- a/proto/ospf/lsupd.c
+++ b/proto/ospf/lsupd.c
@@ -16,7 +16,8 @@ ospf_lsupd_tx(struct ospf_neighbor *n)
void
flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
- struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff)
+ struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff,
+ struct ospf_area *oa)
{
struct ospf_iface *ifa;
struct ospf_neighbor *nn;
@@ -33,13 +34,13 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
}
else
{
- if(iff->oa->areaid==BACKBONE)
+ if(oa->areaid==BACKBONE)
{
- if((ifa->type!=OSPF_IT_VLINK)&&(ifa->oa!=iff->oa)) continue;
+ if((ifa->type!=OSPF_IT_VLINK)&&(ifa->oa!=oa)) continue;
}
else
{
- if(ifa->oa!=iff->oa) continue;
+ if(ifa->oa!=oa) continue;
}
}
ret=0;
@@ -92,16 +93,30 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_lsupd_packet *pk;
struct ospf_packet *op;
- if(ifa->type==OSPF_IT_NBMA) sk=iff->ip_sk;
- else sk=iff->hello_sk; /* FIXME is this tru for PTP? */
+ if(ifa->type==OSPF_IT_NBMA) sk=ifa->ip_sk;
+ else sk=ifa->hello_sk; /* FIXME is this true for PTP? */
pk=(struct ospf_lsupd_packet *)sk->tbuf;
op=(struct ospf_packet *)sk->tbuf;
fill_ospf_pkt_hdr(ifa, pk, LSUPD);
pk->lsano=htonl(1);
- memcpy(pk+1,hn,ntohs(hn->length));
- len=sizeof(struct ospf_lsupd_packet)+ntohs(hn->length);
+ if(hn!=NULL)
+ {
+ memcpy(pk+1,hn,ntohs(hn->length));
+ len=sizeof(struct ospf_lsupd_packet)+ntohs(hn->length);
+ }
+ else
+ {
+ u8 *help;
+ struct top_hash_entry *en;
+ htonlsah(hh,(struct ospf_lsa_header *)(pk+1));
+ help=(u8 *)(pk+1);
+ help+=sizeof(struct ospf_lsa_header);
+ en=ospf_hash_find_header(oa->gr,hh);
+ htonlsab(en->lsa_body,help,hh->type,hh->length);
+ len=hh->length;
+ }
op->length=htons(len);
ospf_pkt_finalize(ifa, op);
@@ -278,7 +293,7 @@ ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
/* pg 144 (5a) */
if(lsadb && ((lsadb->inst_t-now)<MINLSARRIVAL)) continue;
- flood_lsa(n,lsa,&lsatmp,po,ifa);
+ flood_lsa(n,lsa,&lsatmp,po,ifa,ifa->oa);
/* Remove old from all ret lists */
/* pg 144 (5c) */
diff --git a/proto/ospf/lsupd.h b/proto/ospf/lsupd.h
index 369eb76..82832ae 100644
--- a/proto/ospf/lsupd.h
+++ b/proto/ospf/lsupd.h
@@ -14,5 +14,8 @@ void ospf_lsupd_tx(struct ospf_neighbor *n);
void ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l);
void ospf_lsupd_rx(struct ospf_lsupd_packet *ps, struct proto *p,
struct ospf_iface *ifa, u16 size);
+void flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
+ struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff,
+ struct ospf_area *oa);
#endif /* _BIRD_OSPF_LSUPD_H_ */
diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c
index 371434b..4280e11 100644
--- a/proto/ospf/topology.c
+++ b/proto/ospf/topology.c
@@ -188,6 +188,7 @@ addifa_rtlsa(struct ospf_iface *ifa)
ifa->oa=oa;
oa->rt=originate_rt_lsa(oa,po);
+ flood_lsa(NULL,NULL,&oa->rt->lsa,po,NULL,oa);
}
struct top_hash_entry *