proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-04 21:05:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: don't infer spftree from address family

Browse Source 
Instead of using the address family to determine which spftree structure
should be used, specify it explicitly. With the advent of ipv6 dst-src
routing, the tree cannot be uniquely determined from the family.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
This commit is contained in:
Christian Franke 2018-07-26 15:08:11 +02:00
parent be985ba059
commit 6d38d0785c
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
isisd/isis_spf.c
View File

@ -285,6 +285,7 @@ struct isis_spftree {
uint16_t mtid; uint16_t mtid;
int family; int family;
int level; int level;
enum spf_tree_id tree_id;
}; };
@ -1222,7 +1223,7 @@ static void add_to_paths(struct isis_spftree *spftree,
} }
static void init_spt(struct isis_spftree *spftree, int mtid, int level, static void init_spt(struct isis_spftree *spftree, int mtid, int level,
int family) int family, enum spf_tree_id tree_id)
{ {
isis_vertex_queue_clear(&spftree->tents); isis_vertex_queue_clear(&spftree->tents);
isis_vertex_queue_clear(&spftree->paths); isis_vertex_queue_clear(&spftree->paths);
@ -1230,44 +1231,50 @@ static void init_spt(struct isis_spftree *spftree, int mtid, int level,
spftree->mtid = mtid; spftree->mtid = mtid;
spftree->level = level; spftree->level = level;
spftree->family = family; spftree->family = family;
spftree->tree_id = tree_id;
return; return;
} }
static int isis_run_spf(struct isis_area *area, int level, int family, static int isis_run_spf(struct isis_area *area, int level,
enum spf_tree_id tree_id,
uint8_t *sysid, struct timeval *nowtv) uint8_t *sysid, struct timeval *nowtv)
{ {
int retval = ISIS_OK; int retval = ISIS_OK;
struct isis_vertex *vertex; struct isis_vertex *vertex;
struct isis_vertex *root_vertex; struct isis_vertex *root_vertex;
struct isis_spftree *spftree = NULL; struct isis_spftree *spftree = area->spftree[tree_id][level - 1];
uint8_t lsp_id[ISIS_SYS_ID_LEN + 2]; uint8_t lsp_id[ISIS_SYS_ID_LEN + 2];
struct isis_lsp *lsp; struct isis_lsp *lsp;
struct timeval time_now; struct timeval time_now;
unsigned long long start_time, end_time; unsigned long long start_time, end_time;
uint16_t mtid; uint16_t mtid = 0;
/* Get time that can't roll backwards. */ /* Get time that can't roll backwards. */
start_time = nowtv->tv_sec; start_time = nowtv->tv_sec;
start_time = (start_time * 1000000) + nowtv->tv_usec; start_time = (start_time * 1000000) + nowtv->tv_usec;
if (family == AF_INET) int family = -1;
spftree = area->spftree[SPFTREE_IPV4][level - 1]; switch (tree_id) {
else if (family == AF_INET6) case SPFTREE_IPV4:
spftree = area->spftree[SPFTREE_IPV6][level - 1]; family = AF_INET;
mtid = ISIS_MT_IPV4_UNICAST;
break;
case SPFTREE_IPV6:
family = AF_INET6;
mtid = isis_area_ipv6_topology(area);
break;
case SPFTREE_COUNT:
assert(!"isis_run_spf should never be called with SPFTREE_COUNT as argument!");
return ISIS_WARNING;
}
assert(spftree); assert(spftree);
assert(sysid); assert(sysid);
/* We only support ipv4-unicast and ipv6-unicast as topologies for now
*/
if (family == AF_INET6)
mtid = isis_area_ipv6_topology(area);
else
mtid = ISIS_MT_IPV4_UNICAST;
/* /*
* C.2.5 Step 0 * C.2.5 Step 0
*/ */
init_spt(spftree, mtid, level, family); init_spt(spftree, mtid, level, family, tree_id);
/* a) */ /* a) */
root_vertex = isis_spf_add_root(spftree, sysid); root_vertex = isis_spf_add_root(spftree, sysid);
/* b) */ /* b) */
@ -1365,10 +1372,10 @@ static int isis_run_spf_cb(struct thread *thread)
area->area_tag, level); area->area_tag, level);
if (area->ip_circuits) if (area->ip_circuits)
retval = isis_run_spf(area, level, AF_INET, isis->sysid, retval = isis_run_spf(area, level, SPFTREE_IPV4, isis->sysid,
&thread->real); &thread->real);
if (area->ipv6_circuits) if (area->ipv6_circuits)
retval = isis_run_spf(area, level, AF_INET6, isis->sysid, retval = isis_run_spf(area, level, SPFTREE_IPV6, isis->sysid,
&thread->real); &thread->real);
isis_area_verify_routes(area); isis_area_verify_routes(area);