Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

cleanup in lsupd.c, indenting, "struct proto" removed...

Browse source
This commit is contained in:
Ondrej Filip 2004-06-04 21:05:43 +00:00
parent 9b7de4c4d1
commit 6f3203fabf
8 changed files with 308 additions and 277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
proto/ospf/iface.c
View file

@ -102,7 +102,7 @@ iface_chstate(struct ospf_iface *ifa, u8 state)
ifa->nlsa->lsa.age=LSA_MAXAGE;
if(state>=OSPF_IS_WAITING)
{
net_flush_lsa(ifa->nlsa,po,ifa->oa);
ospf_lsupd_flush_nlsa(ifa->nlsa,ifa->oa);
}
if(can_flush_lsa(ifa->oa)) flush_lsa(ifa->nlsa,ifa->oa);
ifa->nlsa=NULL;

4
proto/ospf/lsalib.c
View file

@ -1,7 +1,7 @@
/*
* BIRD -- OSPF
*
* (c) 1999 - 2000 Ondrej Filip <feela@network.cz>
* (c) 1999--2004 Ondrej Filip <feela@network.cz>
*
* Can be freely distributed and used under the terms of the GNU GPL.
*/
@ -70,7 +70,7 @@ ospf_age(struct ospf_area *oa)
en->inst_t=now;
en->ini_age=0;
lsasum_calculate(&en->lsa,en->lsa_body,po);
flood_lsa(NULL,NULL,&en->lsa,po,NULL,oa,1);
ospf_lsupd_flood(NULL,NULL,&en->lsa,NULL,oa,1);
continue;
}
if((en->lsa.age=(en->ini_age+(now-en->inst_t)))>=LSA_MAXAGE)

2
proto/ospf/lsreq.c
View file

@ -116,6 +116,6 @@ ospf_lsreq_receive(struct ospf_lsreq_packet *ps,
return;
}
}
ospf_lsupd_tx_list(n, &uplist);
ospf_lsupd_send_list(n, &uplist);
rfree(upslab);
}

133
proto/ospf/lsupd.c
View file

@ -1,7 +1,7 @@
/*
* BIRD -- OSPF
*
* (c) 2000-2004 Ondrej Filip <feela@network.cz>
* (c) 2000--2004 Ondrej Filip <feela@network.cz>
*
* Can be freely distributed and used under the terms of the GNU GPL.
*/
@ -9,7 +9,7 @@
#include "ospf.h"
/**
* flood_lsa - send received or generated lsa to the neighbors
* ospf_lsupd_flood - send received or generated lsa to the neighbors
* @n: neighbor than sent this lsa (or NULL if generated)
* @hn: LSA header followed by lsa body in network endianity (may be NULL)
* @hh: LSA header in host endianity (must be filled)
@ -22,41 +22,48 @@
*/
int
flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff,
ospf_lsupd_flood(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_lsa_header *hh, struct ospf_iface *iff,
struct ospf_area *oa, int rtl)
{
struct ospf_iface *ifa;
struct ospf_neighbor *nn;
struct top_hash_entry *en;
struct proto_ospf *po = oa->po;
struct proto *p = &po->proto;
int ret, retval = 0;
/* pg 148 */
WALK_LIST(NODE ifa, po->iface_list)
{
if(ifa->stub) continue;
if (ifa->stub)
continue;
if (hh->type == LSA_T_EXT)
{
if(ifa->type==OSPF_IT_VLINK) continue;
if(ifa->oa->stub) continue;
if (ifa->type == OSPF_IT_VLINK)
continue;
if (ifa->oa->stub)
continue;
}
else
{
if (oa->areaid == BACKBONE)
{
if((ifa->type!=OSPF_IT_VLINK)&&(ifa->oa!=oa)) continue;
if ((ifa->type != OSPF_IT_VLINK) && (ifa->oa != oa))
continue;
}
else
{
if(ifa->oa!=oa) continue;
if (ifa->oa != oa)
continue;
}
}
ret = 0;
WALK_LIST(NODE nn, ifa->neigh_list)
{
if(nn->state<NEIGHBOR_EXCHANGE) continue;
if (nn->state < NEIGHBOR_EXCHANGE)
continue;
if (nn->state < NEIGHBOR_FULL)
{
if ((en = ospf_hash_find_header(nn->lsrqh, hh)) != NULL)
@ -68,27 +75,33 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
break;
case CMP_SAME:
s_rem_node(SNODE en);
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
if (en->lsa_body != NULL)
mb_free(en->lsa_body);
en->lsa_body = NULL;
DBG("Removing from lsreq list for neigh %I\n", nn->rid);
ospf_hash_delete(nn->lsrqh, en);
if(EMPTY_SLIST(nn->lsrql)) ospf_neigh_sm(nn, INM_LOADDONE);
if (EMPTY_SLIST(nn->lsrql))
ospf_neigh_sm(nn, INM_LOADDONE);
continue;
break;
case CMP_NEWER:
s_rem_node(SNODE en);
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
if (en->lsa_body != NULL)
mb_free(en->lsa_body);
en->lsa_body = NULL;
DBG("Removing from lsreq list for neigh %I\n", nn->rid);
ospf_hash_delete(nn->lsrqh, en);
if(EMPTY_SLIST(nn->lsrql)) ospf_neigh_sm(nn, INM_LOADDONE);
if (EMPTY_SLIST(nn->lsrql))
ospf_neigh_sm(nn, INM_LOADDONE);
break;
default: bug("Bug in lsa_comp?");
default:
bug("Bug in lsa_comp?");
}
}
}
if(nn==n) continue;
if (nn == n)
continue;
if (rtl)
{
@ -110,7 +123,8 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
if ((en = ospf_hash_find_header(nn->lsrth, hh)) != NULL)
{
s_rem_node(SNODE en);
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
if (en->lsa_body != NULL)
mb_free(en->lsa_body);
en->lsa_body = NULL;
ospf_hash_delete(nn->lsrth, en);
}
@ -119,13 +133,16 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
ret = 1;
}
if(ret==0) continue; /* pg 150 (2) */
if (ret == 0)
continue; /* pg 150 (2) */
if (ifa == iff)
{
if((n->rid==iff->drid)||n->rid==iff->bdrid) continue; /* pg 150 (3) */
if(iff->state==OSPF_IS_BACKUP) continue; /* pg 150 (4) */
retval = 1; /* FIXME !!!!!!!!!!! */
if ((n->rid == iff->drid) || n->rid == iff->bdrid)
continue; /* pg 150 (3) */
if (iff->state == OSPF_IS_BACKUP)
continue; /* pg 150 (4) */
retval = 1;
}
{
@ -136,8 +153,10 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_packet *op;
struct ospf_lsa_header *lh;
if(ifa->type==OSPF_IT_NBMA) sk=ifa->ip_sk;
else sk=ifa->hello_sk; /* FIXME is this true 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;
@ -168,7 +187,8 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
age = ntohs(lh->age);
age += ifa->inftransdelay;
if( age > LSA_MAXAGE ) age = LSA_MAXAGE;
if (age > LSA_MAXAGE)
age = LSA_MAXAGE;
lh->age = htons(age);
op->length = htons(len);
@ -179,14 +199,16 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
{
if ((ifa->state == OSPF_IS_BACKUP) || (ifa->state == OSPF_IS_DR))
sk_send_to_agt(sk, len, ifa, NEIGHBOR_EXCHANGE);
else sk_send_to_bdr(sk ,len, ifa);
else
sk_send_to_bdr(sk, len, ifa);
}
else
{
if ((ifa->state == OSPF_IS_BACKUP) || (ifa->state == OSPF_IS_DR) ||
(ifa->type == OSPF_IT_PTP))
sk_send_to(sk, len, AllSPFRouters, OSPF_PROTO);
else sk_send_to(sk,len, AllDRouters, OSPF_PROTO);
else
sk_send_to(sk, len, AllDRouters, OSPF_PROTO);
}
}
}
@ -194,7 +216,7 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
}
void /* I send all I received in LSREQ */
ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
ospf_lsupd_send_list(struct ospf_neighbor *n, list * l)
{
struct l_lsr_head *llsh;
u16 len;
@ -207,7 +229,8 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
u8 ii;
u8 *jj = n->ifa->ip_sk->tbuf;
if(EMPTY_LIST(*l)) return;
if (EMPTY_LIST(*l))
return;
pk = (struct ospf_lsupd_packet *) n->ifa->ip_sk->tbuf;
op = (struct ospf_packet *) n->ifa->ip_sk->tbuf;
@ -222,7 +245,8 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l)
WALK_LIST(llsh, *l)
{
if ((en = ospf_hash_find(n->ifa->oa->gr, llsh->lsh.id, llsh->lsh.rt,
llsh->lsh.type))==NULL) continue; /* Probably flushed LSA */
llsh->lsh.type)) == NULL)
continue; /* Probably flushed LSA */
DBG("Sending ID=%I, Type=%u, RT=%I Sn: 0x%x Age: %u\n",
llsh->lsh.id, llsh->lsh.type, llsh->lsh.rt, en->lsa.sn, en->lsa.age);
@ -278,19 +302,20 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
if ((n = find_neigh(ifa, nrid)) == NULL)
{
OSPF_TRACE(D_PACKETS, "Received lsupd from unknown neighbor! (%I)",
nrid);
OSPF_TRACE(D_PACKETS, "Received lsupd from unknown neighbor! (%I)", nrid);
return;
}
if (n->state < NEIGHBOR_EXCHANGE)
{
OSPF_TRACE(D_PACKETS, "Received lsupd in lesser state than EXCHANGE from (%I)",
OSPF_TRACE(D_PACKETS,
"Received lsupd in lesser state than EXCHANGE from (%I)",
n->ip);
return;
}
if(size<=(sizeof(struct ospf_lsupd_packet)+sizeof(struct ospf_lsa_header)))
if (size <=
(sizeof(struct ospf_lsupd_packet) + sizeof(struct ospf_lsa_header)))
{
log(L_WARN "Received lsupd from %I is too short!", n->ip);
return;
@ -311,14 +336,16 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
int diff = ((u8 *) lsa) - ((u8 *) ps);
u16 chsum, lenn = ntohs(lsa->length);
if(((diff+sizeof(struct ospf_lsa_header))>=size) || ((lenn+diff)>size))
if (((diff + sizeof(struct ospf_lsa_header)) >= size)
|| ((lenn + diff) > size))
{
log(L_WARN "Received lsupd from %I is too short!", n->ip);
ospf_neigh_sm(n, INM_BADLSREQ);
break;
}
if((lenn<=sizeof(struct ospf_lsa_header))||(lenn!=(4*(lenn/4))))
if ((lenn <= sizeof(struct ospf_lsa_header))
|| (lenn != (4 * (lenn / 4))))
{
log(L_WARN "Received LSA from %I with bad length", n->ip);
ospf_neigh_sm(n, INM_BADLSREQ);
@ -384,7 +411,8 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
{
WALK_LIST(nifa, po->iface_list)
{
if(ipa_compare(nifa->iface->addr->ip,ipa_from_u32(lsatmp.id))==0)
if (ipa_compare(nifa->iface->addr->ip, ipa_from_u32(lsatmp.id)) ==
0)
{
self = 1;
break;
@ -411,10 +439,10 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
lsatmp.id, lsatmp.rt);
lsasum_check(lsa, (lsa + 1), po); /* It also calculates chsum! */
lsatmp.checksum = ntohs(lsa->checksum);
flood_lsa(NULL,lsa,&lsatmp,po,NULL,oa,0);
ospf_lsupd_flood(NULL, lsa, &lsatmp, NULL, oa, 0);
if (en = ospf_hash_find_header(oa->gr, &lsatmp))
{
flood_lsa(NULL,NULL,&en->lsa,po,NULL,oa,1);
ospf_lsupd_flood(NULL, NULL, &en->lsa, NULL, oa, 1);
}
continue;
}
@ -427,14 +455,16 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
continue;
}
if(flood_lsa(n,lsa,&lsatmp,po,ifa,ifa->oa,1)==0)
if (ospf_lsupd_flood(n, lsa, &lsatmp, ifa, ifa->oa, 1) == 0)
{
DBG("Wasn't flooded back\n"); /* ps 144(5e), pg 153 */
if (ifa->state == OSPF_IS_BACKUP)
{
if(ifa->drid==n->rid) ospf_lsack_enqueue(n, lsa, ACKL_DELAY);
if (ifa->drid == n->rid)
ospf_lsack_enqueue(n, lsa, ACKL_DELAY);
}
else ospf_lsack_enqueue(n, lsa, ACKL_DELAY);
else
ospf_lsack_enqueue(n, lsa, ACKL_DELAY);
}
/* Remove old from all ret lists */
@ -448,7 +478,8 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
if ((en = ospf_hash_find_header(ntmp->lsrth, &lsadb->lsa)) != NULL)
{
s_rem_node(SNODE en);
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
if (en->lsa_body != NULL)
mb_free(en->lsa_body);
en->lsa_body = NULL;
ospf_hash_delete(ntmp->lsrth, en);
}
@ -463,7 +494,8 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
} /* FIXME lsack? */
/* pg 144 (5d) */
body=mb_alloc(p->pool,lsatmp.length-sizeof(struct ospf_lsa_header));
body =
mb_alloc(p->pool, lsatmp.length - sizeof(struct ospf_lsa_header));
ntohlsab(lsa + 1, body, lsatmp.type,
lsatmp.length - sizeof(struct ospf_lsa_header));
lsadb = lsa_install_new(&lsatmp, body, oa);
@ -483,12 +515,14 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
{
/* pg145 (7a) */
s_rem_node(SNODE en);
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
if (en->lsa_body != NULL)
mb_free(en->lsa_body);
en->lsa_body = NULL;
ospf_hash_delete(n->lsrth, en);
if (ifa->state == OSPF_IS_BACKUP)
{
if(n->rid==ifa->drid) ospf_lsack_enqueue(n, lsa, ACKL_DELAY);
if (n->rid == ifa->drid)
ospf_lsack_enqueue(n, lsa, ACKL_DELAY);
}
}
else
@ -514,7 +548,7 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
ll.lsh.rt = lsadb->lsa.rt;
ll.lsh.type = lsadb->lsa.type;
add_tail(&l, NODE & ll);
ospf_lsupd_tx_list(n, &l);
ospf_lsupd_send_list(n, &l);
}
}
@ -528,10 +562,10 @@ ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
}
void
net_flush_lsa(struct top_hash_entry *en, struct proto_ospf *po,
struct ospf_area *oa)
ospf_lsupd_flush_nlsa(struct top_hash_entry *en, struct ospf_area *oa)
{
struct ospf_lsa_header *lsa = &en->lsa;
struct proto_ospf *po = oa->po;
struct proto *p = &po->proto;
lsa->age = LSA_MAXAGE;
@ -540,6 +574,5 @@ net_flush_lsa(struct top_hash_entry *en, struct proto_ospf *po,
OSPF_TRACE(D_EVENTS, "Premature aging self originated lsa!");
OSPF_TRACE(D_EVENTS, "Type: %d, Id: %I, Rt: %I", lsa->type,
lsa->id, lsa->rt);
flood_lsa(NULL,NULL,lsa,po,NULL,oa,0);
ospf_lsupd_flood(NULL, NULL, lsa, NULL, oa, 0);
}

12
proto/ospf/lsupd.h
View file

@ -1,7 +1,7 @@
/*
* BIRD -- OSPF
*
* (c) 2000 Ondrej Filip <feela@network.cz>
* (c) 2000--2004 Ondrej Filip <feela@network.cz>
*
* Can be freely distributed and used under the terms of the GNU GPL.
*
@ -10,14 +10,12 @@
#ifndef _BIRD_OSPF_LSUPD_H_
#define _BIRD_OSPF_LSUPD_H_
void ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l);
void ospf_lsupd_send_list(struct ospf_neighbor *n, list * l);
void ospf_lsupd_receive(struct ospf_lsupd_packet *ps,
struct ospf_iface *ifa, u16 size);
int flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_lsa_header *hh, struct proto_ospf *po, struct ospf_iface *iff,
int ospf_lsupd_flood(struct ospf_neighbor *n, struct ospf_lsa_header *hn,
struct ospf_lsa_header *hh, struct ospf_iface *iff,
struct ospf_area *oa, int rtl);
void net_flush_lsa(struct top_hash_entry *en, struct proto_ospf *po,
struct ospf_area *oa);
void ospf_lsupd_flush_nlsa(struct top_hash_entry *en, struct ospf_area *oa);
#endif /* _BIRD_OSPF_LSUPD_H_ */

2
proto/ospf/neighbor.c
View file

@ -600,7 +600,7 @@ rxmt_timer_hook(timer *timer)
en->lsa.id, en->lsa.rt, en->lsa.type);
add_tail(&uplist, NODE llsh);
}
ospf_lsupd_tx_list(n, &uplist);
ospf_lsupd_send_list(n, &uplist);
rfree(upslab);
}
}

2
proto/ospf/ospf.c
View file

@ -405,7 +405,7 @@ ospf_rt_notify(struct proto *p, net *n, rte *new, rte *old, ea_list *attrs)
ext=en->lsa_body;
if(ipa_compare(ext->netmask, ipa_mkmask(n->n.pxlen))==0)
{
net_flush_lsa(en,po,oa);
ospf_lsupd_flush_nlsa(en,oa);
break;
}
}

10
proto/ospf/topology.c
View file

@ -2,7 +2,7 @@
* BIRD -- OSPF Topological Database
*
* (c) 1999 Martin Mares <mj@ucw.cz>
* (c) 1999 - 2000 Ondrej Filip <feela@network.cz>
* (c) 1999 - 2004 Ondrej Filip <feela@network.cz>
*
* Can be freely distributed and used under the terms of the GNU GPL.
*/
@ -215,7 +215,7 @@ originate_rt_lsa(struct ospf_area *oa)
lsasum_calculate(&lsa,body,po);
en=lsa_install_new(&lsa, body, oa);
oa->rt=en;
flood_lsa(NULL,NULL,&oa->rt->lsa,po,NULL,oa,1);
ospf_lsupd_flood(NULL,NULL,&oa->rt->lsa,NULL,oa,1);
schedule_rtcalc(oa);
oa->origrt=0;
}
@ -282,7 +282,7 @@ originate_net_lsa(struct ospf_iface *ifa)
ifa->iface->name);
ifa->nlsa->lsa.sn+=1;
ifa->nlsa->lsa.age=LSA_MAXAGE;
flood_lsa(NULL,NULL,&ifa->nlsa->lsa,po,NULL,ifa->oa,0);
ospf_lsupd_flood(NULL,NULL,&ifa->nlsa->lsa,NULL,ifa->oa,0);
s_rem_node(SNODE ifa->nlsa);
if(ifa->nlsa->lsa_body!=NULL) mb_free(ifa->nlsa->lsa_body);
ifa->nlsa->lsa_body=NULL;
@ -312,7 +312,7 @@ originate_net_lsa(struct ospf_iface *ifa)
body=originate_net_lsa_body(ifa, &lsa.length, po);
lsasum_calculate(&lsa,body,po);
ifa->nlsa=lsa_install_new(&lsa, body, ifa->oa);
flood_lsa(NULL,NULL,&ifa->nlsa->lsa,po,NULL,ifa->oa,1);
ospf_lsupd_flood(NULL,NULL,&ifa->nlsa->lsa,NULL,ifa->oa,1);
ifa->orignet=0;
}
@ -445,7 +445,7 @@ originate_ext_lsa(net *n, rte *e, struct proto_ospf *po, struct ea_list *attrs)
WALK_LIST(oa, po->area_list)
{
en=lsa_install_new(&lsa, body, oa);
flood_lsa(NULL,NULL,&en->lsa,po,NULL,oa,1);
ospf_lsupd_flood(NULL,NULL,&en->lsa,NULL,oa,1);
body=originate_ext_lsa_body(n, e, po, attrs);
}
mb_free(body);