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

Struct area_net changed.

Browse source
This commit is contained in:
Ondrej Filip 2004-06-06 09:13:37 +00:00
parent b9ed99f738
commit 66261211a9
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
proto/ospf/config.Y
View file

@ -112,8 +112,8 @@ pref_el: prefix ';'
{ {
this_pref = cfg_allocz(sizeof(struct area_net)); this_pref = cfg_allocz(sizeof(struct area_net));
add_tail(&this_area->net_list, NODE this_pref); add_tail(&this_area->net_list, NODE this_pref);
this_pref->net = $1.addr; this_pref->px.addr = $1.addr;
this_pref->mlen = $1.len; this_pref->px.len = $1.len;
} }
; ;
@ -121,8 +121,8 @@ pref_hid: prefix HIDDEN ';'
{ {
this_pref = cfg_allocz(sizeof(struct area_net)); this_pref = cfg_allocz(sizeof(struct area_net));
add_tail(&this_area->net_list, NODE this_pref); add_tail(&this_area->net_list, NODE this_pref);
this_pref->net = $1.addr; this_pref->px.addr = $1.addr;
this_pref->mlen = $1.len; this_pref->px.len = $1.len;
this_pref->hidden = 1; this_pref->hidden = 1;
} }
; ;

10
proto/ospf/ospf.c
View file

@ -116,8 +116,8 @@ ospf_start(struct proto *p)
WALK_LIST(anet,ac->net_list) WALK_LIST(anet,ac->net_list)
{ {
antmp=mb_allocz(po->proto.pool, sizeof(struct area_net)); antmp=mb_allocz(po->proto.pool, sizeof(struct area_net));
antmp->net=anet->net; antmp->px.addr=anet->px.addr;
antmp->mlen=anet->mlen; antmp->px.len=anet->px.len;
antmp->hidden=anet->hidden; antmp->hidden=anet->hidden;
add_tail(&oa->net_list, NODE antmp); add_tail(&oa->net_list, NODE antmp);
} }
@ -542,8 +542,8 @@ ospf_reconfigure(struct proto *p, struct proto_config *c)
WALK_LIST(anet, ac2->net_list) WALK_LIST(anet, ac2->net_list)
{ {
antmp=mb_alloc(p->pool, sizeof(struct area_net)); antmp=mb_alloc(p->pool, sizeof(struct area_net));
antmp->net=anet->net; antmp->px.addr=anet->px.addr;
antmp->mlen=anet->mlen; antmp->px.len=anet->px.len;
antmp->hidden=anet->hidden; antmp->hidden=anet->hidden;
add_tail(&oa->net_list, NODE antmp); add_tail(&oa->net_list, NODE antmp);
} }
@ -836,7 +836,7 @@ ospf_sh(struct proto *p)
cli_msg(-1014,"\t\tArea networks:"); cli_msg(-1014,"\t\tArea networks:");
WALK_LIST(anet, oa->net_list) WALK_LIST(anet, oa->net_list)
{ {
cli_msg(-1014,"\t\t\t%1I/%u\t%s", anet->net, anet->mlen, cli_msg(-1014,"\t\t\t%1I/%u\t%s", anet->px.addr, anet->px.len,
anet->hidden ? "Hidden" : "Advertise"); anet->hidden ? "Hidden" : "Advertise");
} }
} }

5
proto/ospf/ospf.h
View file

@ -67,9 +67,10 @@ struct nbma_node {
struct area_net { struct area_net {
node n; node n;
ip_addr net; struct prefix px;
int mlen;
int hidden; int hidden;
int active;
int oldactive;
}; };
struct ospf_area_config { struct ospf_area_config {