Commit 66261211 authored by Ondřej Filip's avatar Ondřej Filip

Struct area_net changed.

parent b9ed99f7
......@@ -112,8 +112,8 @@ pref_el: prefix ';'
{
this_pref = cfg_allocz(sizeof(struct area_net));
add_tail(&this_area->net_list, NODE this_pref);
this_pref->net = $1.addr;
this_pref->mlen = $1.len;
this_pref->px.addr = $1.addr;
this_pref->px.len = $1.len;
}
;
......@@ -121,8 +121,8 @@ pref_hid: prefix HIDDEN ';'
{
this_pref = cfg_allocz(sizeof(struct area_net));
add_tail(&this_area->net_list, NODE this_pref);
this_pref->net = $1.addr;
this_pref->mlen = $1.len;
this_pref->px.addr = $1.addr;
this_pref->px.len = $1.len;
this_pref->hidden = 1;
}
;
......
......@@ -116,8 +116,8 @@ ospf_start(struct proto *p)
WALK_LIST(anet,ac->net_list)
{
antmp=mb_allocz(po->proto.pool, sizeof(struct area_net));
antmp->net=anet->net;
antmp->mlen=anet->mlen;
antmp->px.addr=anet->px.addr;
antmp->px.len=anet->px.len;
antmp->hidden=anet->hidden;
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)
{
antmp=mb_alloc(p->pool, sizeof(struct area_net));
antmp->net=anet->net;
antmp->mlen=anet->mlen;
antmp->px.addr=anet->px.addr;
antmp->px.len=anet->px.len;
antmp->hidden=anet->hidden;
add_tail(&oa->net_list, NODE antmp);
}
......@@ -836,7 +836,7 @@ ospf_sh(struct proto *p)
cli_msg(-1014,"\t\tArea networks:");
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");
}
}
......
......@@ -67,9 +67,10 @@ struct nbma_node {
struct area_net {
node n;
ip_addr net;
int mlen;
struct prefix px;
int hidden;
int active;
int oldactive;
};
struct ospf_area_config {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment