proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 15:43:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ospfd: Remove the blocking of opaque LSAs origination & flooding 'optimisation'

Browse Source 
* Opaque support contains some kind of hack/optimisation to
  origination/flooding to suppress some origins/floods until an opaque LS
  Acks are received.  Previous versions of the code have already been shown
  to have bugs in them (see e16fd8a5, e.g.). It seems over-complex and fragile,
  plus its conceptually the wrong place to try implement flooding hacks that,
  AFAICT, do not depend particularly on the semantics of opaque LSA.

  Nuke.

Tested-by: Olivier Dugeon <olivier.dugeon@orange.com>
This commit is contained in:
Paul Jakma 2015-01-20 15:45:36 +00:00 committed by Donald Sharp
parent c117e02796
commit 801e0e1492
6 changed files with 6 additions and 248 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ospfd/ospf_flood.c
View File

@ -448,16 +448,6 @@ ospf_flood_through_interface (struct ospf_interface *oi,
zlog_debug ("Skip this neighbor: Not Opaque-capable."); zlog_debug ("Skip this neighbor: Not Opaque-capable.");
continue; continue;
} }
if (IS_OPAQUE_LSA_ORIGINATION_BLOCKED (oi->ospf->opaque)
&& IS_LSA_SELF (lsa)
&& onbr->state == NSM_Full)
{
/* Small attempt to reduce unnecessary retransmission. */
if (IS_DEBUG_OSPF (lsa, LSA_FLOODING))
zlog_debug ("Skip this neighbor: Initial flushing done.");
continue;
}
} }
#endif /* HAVE_OPAQUE_LSA */ #endif /* HAVE_OPAQUE_LSA */

197
ospfd/ospf_opaque.c
View File

@ -1317,12 +1317,6 @@ ospf_opaque_lsa_originate_schedule (struct ospf_interface *oi, int *delay0)
zlog_debug ("ospf_opaque_lsa_originate_schedule: Not operational."); zlog_debug ("ospf_opaque_lsa_originate_schedule: Not operational.");
goto out; /* This is not an error. */ goto out; /* This is not an error. */
} }
if (IS_OPAQUE_LSA_ORIGINATION_BLOCKED (top->opaque))
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("ospf_opaque_lsa_originate_schedule: Under blockade.");
goto out; /* This is not an error, too. */
}
if (delay0 != NULL) if (delay0 != NULL)
delay = *delay0; delay = *delay0;
@ -1765,12 +1759,6 @@ ospf_opaque_lsa_reoriginate_schedule (void *lsa_type_dependent,
zlog_debug ("ospf_opaque_lsa_reoriginate_schedule: Not operational."); zlog_debug ("ospf_opaque_lsa_reoriginate_schedule: Not operational.");
goto out; /* This is not an error. */ goto out; /* This is not an error. */
} }
if (IS_OPAQUE_LSA_ORIGINATION_BLOCKED (top->opaque))
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("ospf_opaque_lsa_reoriginate_schedule: Under blockade.");
goto out; /* This is not an error, too. */
}
/* Generate a dummy lsa to be passed for a lookup function. */ /* Generate a dummy lsa to be passed for a lookup function. */
lsa = pseudo_lsa (oi, area, lsa_type, opaque_type); lsa = pseudo_lsa (oi, area, lsa_type, opaque_type);
@ -2132,12 +2120,6 @@ out:
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/
static void ospf_opaque_exclude_lsa_from_lsreq (struct route_table *nbrs, struct ospf_neighbor *inbr, struct ospf_lsa *lsa); static void ospf_opaque_exclude_lsa_from_lsreq (struct route_table *nbrs, struct ospf_neighbor *inbr, struct ospf_lsa *lsa);
#ifdef BUGGY_UNLOCK
static void ospf_opaque_type9_lsa_rxmt_nbr_check (struct ospf_interface *oi);
static void ospf_opaque_type10_lsa_rxmt_nbr_check (struct ospf_area *area);
static void ospf_opaque_type11_lsa_rxmt_nbr_check (struct ospf *top);
static unsigned long ospf_opaque_nrxmt_self (struct route_table *nbrs, int lsa_type);
#endif /* BUGGY_UNLOCK */
void void
ospf_opaque_adjust_lsreq (struct ospf_neighbor *nbr, struct list *lsas) ospf_opaque_adjust_lsreq (struct ospf_neighbor *nbr, struct list *lsas)
@ -2246,13 +2228,10 @@ ospf_opaque_self_originated_lsa_received (struct ospf_neighbor *nbr,
struct ospf_lsa *lsa) struct ospf_lsa *lsa)
{ {
struct ospf *top; struct ospf *top;
u_char before;
if ((top = oi_to_top (nbr->oi)) == NULL) if ((top = oi_to_top (nbr->oi)) == NULL)
return; return;
before = IS_OPAQUE_LSA_ORIGINATION_BLOCKED (top->opaque);
/* /*
* Since these LSA entries are not yet installed into corresponding * Since these LSA entries are not yet installed into corresponding
* LSDB, just flush them without calling ospf_ls_maxage() afterward. * LSDB, just flush them without calling ospf_ls_maxage() afterward.
@ -2261,197 +2240,21 @@ ospf_opaque_self_originated_lsa_received (struct ospf_neighbor *nbr,
switch (lsa->data->type) switch (lsa->data->type)
{ {
case OSPF_OPAQUE_LINK_LSA: case OSPF_OPAQUE_LINK_LSA:
SET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_09_LSA_BIT);
ospf_flood_through_area (nbr->oi->area, NULL/*inbr*/, lsa); ospf_flood_through_area (nbr->oi->area, NULL/*inbr*/, lsa);
break; break;
case OSPF_OPAQUE_AREA_LSA: case OSPF_OPAQUE_AREA_LSA:
SET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_10_LSA_BIT);
ospf_flood_through_area (nbr->oi->area, NULL/*inbr*/, lsa); ospf_flood_through_area (nbr->oi->area, NULL/*inbr*/, lsa);
break; break;
case OSPF_OPAQUE_AS_LSA: case OSPF_OPAQUE_AS_LSA:
SET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_11_LSA_BIT);
ospf_flood_through_as (top, NULL/*inbr*/, lsa); ospf_flood_through_as (top, NULL/*inbr*/, lsa);
break; break;
default: default:
zlog_warn ("ospf_opaque_self_originated_lsa_received: Unexpected LSA-type(%u)", lsa->data->type); zlog_warn ("ospf_opaque_self_originated_lsa_received: Unexpected LSA-type(%u)", lsa->data->type);
return; return;
} }
ospf_lsa_discard (lsa); /* List "lsas" will be deleted by caller. */ ospf_lsa_discard (lsa); /* List "lsas" will be deleted by caller. */
if (before == 0 && IS_OPAQUE_LSA_ORIGINATION_BLOCKED (top->opaque))
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Block Opaque-LSA origination: OFF -> ON");
}
} }
void
ospf_opaque_ls_ack_received (struct ospf_neighbor *nbr, struct ospf_lsa *lsa)
{
struct ospf *top;
int delay;
struct ospf_interface *oi;
struct listnode *node, *nnode;
if ((top = oi_to_top (nbr->oi)) == NULL)
return;
if (!IS_OPAQUE_LSA_ORIGINATION_BLOCKED (top->opaque))
return;
switch (lsa->data->type)
{
case OSPF_OPAQUE_LINK_LSA:
if (CHECK_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_09_LSA_BIT))
UNSET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_09_LSA_BIT);
/* BUGGY_UNLOCK: ospf_opaque_type9_lsa_rxmt_nbr_check (nbr->oi); */
/* Callback function... */
break;
case OSPF_OPAQUE_AREA_LSA:
if (CHECK_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_10_LSA_BIT))
UNSET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_10_LSA_BIT);
/* BUGGY_UNLOCK: ospf_opaque_type10_lsa_rxmt_nbr_check (nbr->oi->area); */
/* Callback function... */
break;
case OSPF_OPAQUE_AS_LSA:
if (CHECK_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_11_LSA_BIT))
UNSET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_11_LSA_BIT);
/* BUGGY_UNLOCK: ospf_opaque_type11_lsa_rxmt_nbr_check (top); */
/* Callback function... */
break;
default:
zlog_warn ("ospf_opaque_ls_ack_received: Unexpected LSA-type(%u)", lsa->data->type);
return;
}
if (IS_OPAQUE_LSA_ORIGINATION_BLOCKED (top->opaque))
return; /* Blocking still in progress. */
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Block Opaque-LSA origination: ON -> OFF");
if (! CHECK_FLAG (top->config, OSPF_OPAQUE_CAPABLE))
return; /* Opaque capability condition must have changed. */
/* Ok, let's start origination of Opaque-LSAs. */
delay = OSPF_MIN_LS_INTERVAL;
for (ALL_LIST_ELEMENTS (top->oiflist, node, nnode, oi))
{
if (! ospf_if_is_enable (oi)
|| ospf_nbr_count_opaque_capable (oi) == 0)
continue;
ospf_opaque_lsa_originate_schedule (oi, &delay);
}
return;
}
#ifdef BUGGY_UNLOCK
static void
ospf_opaque_type9_lsa_rxmt_nbr_check (struct ospf_interface *oi)
{
unsigned long n;
n = ospf_opaque_nrxmt_self (oi->nbrs, OSPF_OPAQUE_LINK_LSA);
if (n == 0)
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Self-originated type-9 Opaque-LSAs: OI(%s): Flush completed", IF_NAME (oi));
UNSET_FLAG (oi->area->ospf->opaque, OPAQUE_BLOCK_TYPE_09_LSA_BIT);
}
return;
}
static void
ospf_opaque_type10_lsa_rxmt_nbr_check (struct ospf_area *area)
{
struct listnode *node;
struct ospf_interface *oi;
unsigned long n = 0;
for (ALL_LIST_ELEMENTS_RO (area->oiflist, node, oi))
{
if (area->area_id.s_addr != OSPF_AREA_BACKBONE
&& oi->type == OSPF_IFTYPE_VIRTUALLINK)
continue;
n = ospf_opaque_nrxmt_self (oi->nbrs, OSPF_OPAQUE_AREA_LSA);
if (n > 0)
break;
}
if (n == 0)
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Self-originated type-10 Opaque-LSAs: AREA(%s): Flush completed", inet_ntoa (area->area_id));
UNSET_FLAG (area->ospf->opaque, OPAQUE_BLOCK_TYPE_10_LSA_BIT);
}
return;
}
static void
ospf_opaque_type11_lsa_rxmt_nbr_check (struct ospf *top)
{
struct listnode *node;
struct ospf_interface *oi;
unsigned long n = 0;
for (ALL_LIST_ELEMENTS_RO (top->oiflist, node, oi))
{
switch (oi->type)
{
case OSPF_IFTYPE_VIRTUALLINK:
continue;
default:
break;
}
n = ospf_opaque_nrxmt_self (oi->nbrs, OSPF_OPAQUE_AS_LSA);
if (n > 0)
goto out;
}
if (n == 0)
{
if (IS_DEBUG_OSPF_EVENT)
zlog_debug ("Self-originated type-11 Opaque-LSAs: Flush completed");
UNSET_FLAG (top->opaque, OPAQUE_BLOCK_TYPE_11_LSA_BIT);
}
out:
return;
}
static unsigned long
ospf_opaque_nrxmt_self (struct route_table *nbrs, int lsa_type)
{
struct route_node *rn;
struct ospf_neighbor *nbr;
struct ospf *top;
unsigned long n = 0;
for (rn = route_top (nbrs); rn; rn = route_next (rn))
{
if ((nbr = rn->info) == NULL)
continue;
if ((top = oi_to_top (nbr->oi)) == NULL)
continue;
if (IPV4_ADDR_SAME (&nbr->router_id, &top->router_id))
continue;
n += ospf_ls_retransmit_count_self (nbr, lsa_type);
}
return n;
}
#endif /* BUGGY_UNLOCK */
/*------------------------------------------------------------------------* /*------------------------------------------------------------------------*
* Followings are util functions; probably be used by Opaque-LSAs only... * Followings are util functions; probably be used by Opaque-LSAs only...
*------------------------------------------------------------------------*/ *------------------------------------------------------------------------*/

20
ospfd/ospf_opaque.h
View File

@ -31,23 +31,6 @@
(type) == OSPF_OPAQUE_AREA_LSA || \ (type) == OSPF_OPAQUE_AREA_LSA || \
(type) == OSPF_OPAQUE_AS_LSA) (type) == OSPF_OPAQUE_AS_LSA)
/*
* Usage of Opaque-LSA administrative flags in "struct ospf".
*
* 7 6 5 4 3 2 1 0
* +---+---+---+---+---+---+---+---+
* |///|///|///|///|B11|B10|B09| O |
* +---+---+---+---+---+---+---+---+
* |<--------->| A
* | +--- Operation status (operational = 1)
* +----------- Blocking status for each LSA type
*/
#define IS_OPAQUE_LSA_ORIGINATION_BLOCKED(V) \
CHECK_FLAG((V), (OPAQUE_BLOCK_TYPE_09_LSA_BIT | \
OPAQUE_BLOCK_TYPE_10_LSA_BIT | \
OPAQUE_BLOCK_TYPE_11_LSA_BIT))
/* /*
* Opaque LSA's link state ID is redefined as follows. * Opaque LSA's link state ID is redefined as follows.
* *
@ -156,9 +139,6 @@ extern void ospf_opaque_adjust_lsreq (struct ospf_neighbor *nbr,
extern void ospf_opaque_self_originated_lsa_received (struct ospf_neighbor extern void ospf_opaque_self_originated_lsa_received (struct ospf_neighbor
*nbr, *nbr,
struct ospf_lsa *lsa); struct ospf_lsa *lsa);
extern void ospf_opaque_ls_ack_received (struct ospf_neighbor *nbr,
struct ospf_lsa *lsa);
extern void htonf (float *src, float *dst); extern void htonf (float *src, float *dst);
extern void ntohf (float *src, float *dst); extern void ntohf (float *src, float *dst);
extern struct ospf *oi_to_top (struct ospf_interface *oi); extern struct ospf *oi_to_top (struct ospf_interface *oi);

7
ospfd/ospf_packet.c
View File

@ -2160,14 +2160,7 @@ ospf_ls_ack (struct ip *iph, struct ospf_header *ospfh,
lsr = ospf_ls_retransmit_lookup (nbr, lsa); lsr = ospf_ls_retransmit_lookup (nbr, lsa);
if (lsr != NULL && ospf_lsa_more_recent (lsr, lsa) == 0) if (lsr != NULL && ospf_lsa_more_recent (lsr, lsa) == 0)
{
#ifdef HAVE_OPAQUE_LSA
if (IS_OPAQUE_LSA (lsr->data->type))
ospf_opaque_ls_ack_received (nbr, lsr);
#endif /* HAVE_OPAQUE_LSA */
ospf_ls_retransmit_delete (nbr, lsr); ospf_ls_retransmit_delete (nbr, lsr);
}
lsa->data = NULL; lsa->data = NULL;
ospf_lsa_discard (lsa); ospf_lsa_discard (lsa);

7
ospfd/ospf_vty.c
View File

@ -3373,16 +3373,11 @@ show_ip_ospf_common (struct vty *vty, struct ospf *ospf, u_char use_json)
{ {
json_object_boolean_true_add(json, "opaqueCapable"); json_object_boolean_true_add(json, "opaqueCapable");
} }
if (IS_OPAQUE_LSA_ORIGINATION_BLOCKED (ospf->opaque))
{
json_object_boolean_true_add(json, "lsaOpaqueOriginationBlocked");
}
} }
else else
{ {
vty_out (vty, " OpaqueCapability flag is %s%s%s", vty_out (vty, " OpaqueCapability flag is %s%s",
CHECK_FLAG (ospf->config, OSPF_OPAQUE_CAPABLE) ? "enabled" : "disabled", CHECK_FLAG (ospf->config, OSPF_OPAQUE_CAPABLE) ? "enabled" : "disabled",
IS_OPAQUE_LSA_ORIGINATION_BLOCKED (ospf->opaque) ? " (origination blocked)" : "",
VTY_NEWLINE); VTY_NEWLINE);
} }
#endif /* HAVE_OPAQUE_LSA */ #endif /* HAVE_OPAQUE_LSA */

3
ospfd/ospfd.h
View File

@ -169,9 +169,6 @@ struct ospf
/* Opaque-LSA administrative flags. */ /* Opaque-LSA administrative flags. */
u_char opaque; u_char opaque;
#define OPAQUE_OPERATION_READY_BIT (1 << 0) #define OPAQUE_OPERATION_READY_BIT (1 << 0)
#define OPAQUE_BLOCK_TYPE_09_LSA_BIT (1 << 1)
#define OPAQUE_BLOCK_TYPE_10_LSA_BIT (1 << 2)
#define OPAQUE_BLOCK_TYPE_11_LSA_BIT (1 << 3)
#endif /* HAVE_OPAQUE_LSA */ #endif /* HAVE_OPAQUE_LSA */
/* RFC3137 stub router. Configured time to stay stub / max-metric */ /* RFC3137 stub router. Configured time to stay stub / max-metric */