matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

ospf6d: Fix crash when '[no] ipv6 ospf6 advertise prefix-list' is in startup-config

Browse source 
* ospf6_interface.c: When '[no] ipv6 ospf6 advertise prefix-list'
  appears in the startup configuration for ospf6d, a crash occurs,
  because ospf6d attempts to schedule LSAs when the 'oi->area'
  structure has not yet been initialized.

  Now, when the command above is issued (either in the startup
  configuration or at runtime), ospf6d will only schedule LSAs if
  the 'oi->area' structure has been initalized. A similar test is
  already used when handling the commands 'ipv6 ospf6 priority'
  and 'ipv6 ospf6 cost'.
This commit is contained in:
David Ward 2010-01-05 02:45:39 +00:00 committed by Greg Troxel
parent 85c4968bb1
commit 2470e99e82
1 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ospf6d/ospf6_interface.c
View file

@ -1394,13 +1394,17 @@ DEFUN (ipv6_ospf6_advertise_prefix_list,
oi->plist_name = XSTRDUP (MTYPE_PREFIX_LIST_STR, argv[0]); oi->plist_name = XSTRDUP (MTYPE_PREFIX_LIST_STR, argv[0]);
ospf6_interface_connected_route_update (oi->interface); ospf6_interface_connected_route_update (oi->interface);
OSPF6_LINK_LSA_SCHEDULE (oi);
if (oi->state == OSPF6_INTERFACE_DR) if (oi->area)
{ {
OSPF6_NETWORK_LSA_SCHEDULE (oi); OSPF6_LINK_LSA_SCHEDULE (oi);
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi); if (oi->state == OSPF6_INTERFACE_DR)
{
OSPF6_NETWORK_LSA_SCHEDULE (oi);
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
}
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
} }
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
@ -1433,13 +1437,17 @@ DEFUN (no_ipv6_ospf6_advertise_prefix_list,
} }
ospf6_interface_connected_route_update (oi->interface); ospf6_interface_connected_route_update (oi->interface);
OSPF6_LINK_LSA_SCHEDULE (oi);
if (oi->state == OSPF6_INTERFACE_DR) if (oi->area)
{ {
OSPF6_NETWORK_LSA_SCHEDULE (oi); OSPF6_LINK_LSA_SCHEDULE (oi);
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi); if (oi->state == OSPF6_INTERFACE_DR)
{
OSPF6_NETWORK_LSA_SCHEDULE (oi);
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_TRANSIT (oi);
}
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
} }
OSPF6_INTRA_PREFIX_LSA_SCHEDULE_STUB (oi->area);
return CMD_SUCCESS; return CMD_SUCCESS;
} }