listnode_add (new->area->opaque_lsa_self, oipt);
break;
case OSPF_OPAQUE_AS_LSA:
- top = ospf_top;
+ top = ospf_lookup ();
if (new->area != NULL && (top = new->area->ospf) == NULL)
{
free_opaque_info_per_type ((void *) oipt);
zlog_warn ("Type-10 Opaque-LSA: Reference to AREA is missing?");
break;
case OSPF_OPAQUE_AS_LSA:
- top = ospf_top;
+ top = ospf_lookup ();
if ((area = lsa->area) != NULL && (top = area->ospf) == NULL)
{
zlog_warn ("Type-11 Opaque-LSA: Reference to OSPF is missing?");
/* Switch output functionality by vty address. */
if (vty != NULL)
{
- vty_out (vty, " Opaque-Type %u (%s)%s", opaque_type, ospf_opaque_type_name (opaque_type), VTY_NEWLINE);
+ vty_out (vty, " Opaque-Type %u (%s)%s", opaque_type,
+ ospf_opaque_type_name (opaque_type), VTY_NEWLINE);
vty_out (vty, " Opaque-ID 0x%x%s", opaque_id, VTY_NEWLINE);
vty_out (vty, " Opaque-Info: %u octets of data%s%s",
}
else
{
- zlog_info (" Opaque-Type %u (%s)", opaque_type, ospf_opaque_type_name (opaque_type));
+ zlog_info (" Opaque-Type %u (%s)", opaque_type,
+ ospf_opaque_type_name (opaque_type));
zlog_info (" Opaque-ID 0x%x", opaque_id);
zlog_info (" Opaque-Info: %u octets of data%s",
}
break;
case OSPF_OPAQUE_AS_LSA:
- top = ospf_top;
+ top = ospf_lookup ();
if (lsa->area != NULL && (top = lsa->area->ospf) == NULL)
{
/* Above conditions must have passed. */
void
ospf_opaque_lsa_refresh (struct ospf_lsa *lsa)
{
- struct ospf *ospf = ospf_top;
+ struct ospf *ospf;
struct ospf_opaque_functab *functab;
+ ospf = ospf_lookup ();
+
if ((functab = ospf_opaque_functab_lookup (lsa)) == NULL
|| functab->lsa_refresher == NULL)
{
void
ospf_opaque_lsa_refresh_schedule (struct ospf_lsa *lsa0)
{
- struct ospf *ospf = ospf_top;
+ struct ospf *ospf = ospf;
struct opaque_info_per_type *oipt;
struct opaque_info_per_id *oipi;
struct ospf_lsa *lsa;
int delay;
+ ospf = ospf_lookup ();
+
if ((oipt = lookup_opaque_info_by_type (lsa0)) == NULL
|| (oipi = lookup_opaque_info_by_id (oipt, lsa0)) == NULL)
{
void
ospf_opaque_lsa_flush_schedule (struct ospf_lsa *lsa0)
{
- struct ospf *ospf = ospf_top;
+ struct ospf *ospf = ospf;
struct opaque_info_per_type *oipt;
struct opaque_info_per_id *oipi;
struct ospf_lsa *lsa;
+ ospf = ospf_lookup ();
+
if ((oipt = lookup_opaque_info_by_type (lsa0)) == NULL
|| (oipi = lookup_opaque_info_by_id (oipt, lsa0)) == NULL)
{