mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-17 08:38:42 +00:00
Code Releases Activity

Fixes a bug related to implicit backbone on ABR.

Browse Source
This commit is contained in:
Ondrej Zajicek 2010-11-10 16:43:11 +01:00
parent c4443085a1
commit 5cdf264f93
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
proto/ospf/ospf.c
View File

@ -205,6 +205,7 @@ ospf_start(struct proto *p)
oa = mb_allocz(p->pool, sizeof(struct ospf_area)); oa = mb_allocz(p->pool, sizeof(struct ospf_area));
add_tail(&po->area_list, NODE oa); add_tail(&po->area_list, NODE oa);
po->areano++; po->areano++;
oa->ac = NULL;
oa->stub = 0; oa->stub = 0;
oa->areaid = 0; oa->areaid = 0;
oa->rt = NULL; oa->rt = NULL;

2
proto/ospf/ospf.h
View File

@ -701,7 +701,7 @@ struct ospf_area
{ {
node n; node n;
u32 areaid; u32 areaid;
struct ospf_area_config *ac; /* Related area config */ struct ospf_area_config *ac; /* Related area config, might be NULL */
int origrt; /* Rt lsa origination scheduled? */ int origrt; /* Rt lsa origination scheduled? */
struct top_hash_entry *rt; /* My own router LSA */ struct top_hash_entry *rt; /* My own router LSA */
struct top_hash_entry *pxr_lsa; /* Originated prefix LSA */ struct top_hash_entry *pxr_lsa; /* Originated prefix LSA */

15
proto/ospf/topology.c
View File

@ -157,6 +157,9 @@ get_seqnum(struct top_hash_entry *en)
static int static int
configured_stubnet(struct ospf_area *oa, struct ifa *a) configured_stubnet(struct ospf_area *oa, struct ifa *a)
{ {
if (!oa->ac)
return 0;
struct ospf_stubnet_config *sn; struct ospf_stubnet_config *sn;
WALK_LIST(sn, oa->ac->stubnet_list) WALK_LIST(sn, oa->ac->stubnet_list)
{ {
@ -309,8 +312,9 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length)
} }
struct ospf_stubnet_config *sn; struct ospf_stubnet_config *sn;
WALK_LIST(sn, oa->ac->stubnet_list) if (oa->ac)
if (!sn->hidden) WALK_LIST(sn, oa->ac->stubnet_list)
if (!sn->hidden)
{ {
ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link)); ln = lsab_alloc(po, sizeof(struct ospf_lsa_rt_link));
ln->type = LSART_STUB; ln->type = LSART_STUB;
@ -1197,7 +1201,7 @@ originate_prefix_rt_lsa_body(struct ospf_area *oa, u16 *length)
/* If there are some configured vlinks, add some global address, /* If there are some configured vlinks, add some global address,
which will be used as a vlink endpoint. */ which will be used as a vlink endpoint. */
if (!EMPTY_LIST(oa->ac->vlink_list) && !host_addr && vlink_addr) if (oa->ac && !EMPTY_LIST(oa->ac->vlink_list) && !host_addr && vlink_addr)
{ {
put_ipv6_prefix(lsab_alloc(po, IPV6_PREFIX_SPACE(MAX_PREFIX_LENGTH)), put_ipv6_prefix(lsab_alloc(po, IPV6_PREFIX_SPACE(MAX_PREFIX_LENGTH)),
vlink_addr->ip, MAX_PREFIX_LENGTH, OPT_PX_LA, 0); vlink_addr->ip, MAX_PREFIX_LENGTH, OPT_PX_LA, 0);
@ -1205,8 +1209,9 @@ originate_prefix_rt_lsa_body(struct ospf_area *oa, u16 *length)
} }
struct ospf_stubnet_config *sn; struct ospf_stubnet_config *sn;
WALK_LIST(sn, oa->ac->stubnet_list) if (oa->ac)
if (!sn->hidden) WALK_LIST(sn, oa->ac->stubnet_list)
if (!sn->hidden)
{ {
flags = (sn->px.len < MAX_PREFIX_LENGTH) ? 0 : OPT_PX_LA; flags = (sn->px.len < MAX_PREFIX_LENGTH) ? 0 : OPT_PX_LA;
put_ipv6_prefix(lsab_alloc(po, IPV6_PREFIX_SPACE(sn->px.len)), put_ipv6_prefix(lsab_alloc(po, IPV6_PREFIX_SPACE(sn->px.len)),