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

* isis_lsp.c: Make topology generator generate TE TLVs if necessary.

Browse Source 
Also take care of inserting dynamic hostname of topology TLVs into
	  cache.
This commit is contained in:
hasso 2005-09-28 18:26:25 +00:00
parent c1a03d4774
commit 9551eea446
2 changed files with 57 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isisd/ChangeLog
View File

@ -1,3 +1,9 @@
2005-09-28 Hasso Tepper <hasso at quagga.net>
* isis_lsp.c: Make topology generator generate TE TLVs if necessary.
Also take care of inserting dynamic hostname of topology TLVs into
cache.
2005-09-26 Hasso Tepper <hasso at quagga.net> 2005-09-26 Hasso Tepper <hasso at quagga.net>
* isis_spf.c: Changing cost from uint16_t to uint32_t. Unset * isis_spf.c: Changing cost from uint16_t to uint32_t. Unset

46
isisd/isis_lsp.c
View File

@ -2204,6 +2204,8 @@ generate_topology_lsps (struct isis_area *area)
build_topology_lsp_data (lsp, area, i); build_topology_lsp_data (lsp, area, i);
/* Checksum is also calculated here. */ /* Checksum is also calculated here. */
lsp_seqnum_update (lsp); lsp_seqnum_update (lsp);
/* Take care of inserting dynamic hostname into cache. */
isis_dynhn_insert (lspid, lsp->tlv_data.hostname, IS_LEVEL_1);
ref_time = area->lsp_refresh[0] > MAX_LSP_GEN_INTERVAL ? ref_time = area->lsp_refresh[0] > MAX_LSP_GEN_INTERVAL ?
MAX_LSP_GEN_INTERVAL : area->lsp_refresh[0]; MAX_LSP_GEN_INTERVAL : area->lsp_refresh[0];
@ -2243,6 +2245,7 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
struct listnode *node, *nnode; struct listnode *node, *nnode;
struct arc *arc; struct arc *arc;
struct is_neigh *is_neigh; struct is_neigh *is_neigh;
struct te_is_neigh *te_is_neigh;
char buff[200]; char buff[200];
struct tlvs tlv_data; struct tlvs tlv_data;
struct isis_lsp *lsp0 = lsp; struct isis_lsp *lsp0 = lsp;
@ -2277,7 +2280,10 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
memset (&tlv_data, 0, sizeof (struct tlvs)); memset (&tlv_data, 0, sizeof (struct tlvs));
if (tlv_data.is_neighs == NULL) if (tlv_data.is_neighs == NULL)
{
tlv_data.is_neighs = list_new (); tlv_data.is_neighs = list_new ();
tlv_data.is_neighs->del = free_tlv;
}
/* Add reachability for this IS for simulated 1. */ /* Add reachability for this IS for simulated 1. */
if (lsp_top_num == 1) if (lsp_top_num == 1)
@ -2308,8 +2314,9 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
else else
to_lsp = arc->from_node; to_lsp = arc->from_node;
is_neigh = XMALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh)); if (area->oldmetric)
memset (is_neigh, 0, sizeof (struct is_neigh)); {
is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct is_neigh));
memcpy (&is_neigh->neigh_id, area->topology_baseis, ISIS_SYS_ID_LEN); memcpy (&is_neigh->neigh_id, area->topology_baseis, ISIS_SYS_ID_LEN);
is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (to_lsp & 0xFF); is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (to_lsp & 0xFF);
@ -2321,12 +2328,31 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
listnode_add (tlv_data.is_neighs, is_neigh); listnode_add (tlv_data.is_neighs, is_neigh);
} }
if (area->newmetric)
{
uint32_t metric;
if (tlv_data.te_is_neighs == NULL)
{
tlv_data.te_is_neighs = list_new ();
tlv_data.te_is_neighs->del = free_tlv;
}
te_is_neigh = XCALLOC (MTYPE_ISIS_TLV, sizeof (struct te_is_neigh));
memcpy (&te_is_neigh->neigh_id, area->topology_baseis,
ISIS_SYS_ID_LEN);
te_is_neigh->neigh_id[ISIS_SYS_ID_LEN - 1] = (to_lsp & 0xFF);
te_is_neigh->neigh_id[ISIS_SYS_ID_LEN - 2] = ((to_lsp >> 8) & 0xFF);
metric = ((htonl(arc->distance) >> 8) & 0xffffff);
memcpy (te_is_neigh->te_metric, &metric, 3);
listnode_add (tlv_data.te_is_neighs, te_is_neigh);
}
}
while (tlv_data.is_neighs && listcount (tlv_data.is_neighs)) while (tlv_data.is_neighs && listcount (tlv_data.is_neighs))
{ {
if (lsp->tlv_data.is_neighs == NULL) if (lsp->tlv_data.is_neighs == NULL)
lsp->tlv_data.is_neighs = list_new (); lsp->tlv_data.is_neighs = list_new ();
lsp_tlv_fit (lsp, &tlv_data.is_neighs, lsp_tlv_fit (lsp, &tlv_data.is_neighs, &lsp->tlv_data.is_neighs,
&lsp->tlv_data.is_neighs,
IS_NEIGHBOURS_LEN, area->lsp_frag_threshold, IS_NEIGHBOURS_LEN, area->lsp_frag_threshold,
tlv_add_is_neighs); tlv_add_is_neighs);
if (tlv_data.is_neighs && listcount (tlv_data.is_neighs)) if (tlv_data.is_neighs && listcount (tlv_data.is_neighs))
@ -2334,6 +2360,18 @@ build_topology_lsp_data (struct isis_lsp *lsp, struct isis_area *area,
lsp0, area, IS_LEVEL_1); lsp0, area, IS_LEVEL_1);
} }
while (tlv_data.te_is_neighs && listcount (tlv_data.te_is_neighs))
{
if (lsp->tlv_data.te_is_neighs == NULL)
lsp->tlv_data.te_is_neighs = list_new ();
lsp_tlv_fit (lsp, &tlv_data.te_is_neighs, &lsp->tlv_data.te_is_neighs,
IS_NEIGHBOURS_LEN, area->lsp_frag_threshold,
tlv_add_te_is_neighs);
if (tlv_data.te_is_neighs && listcount (tlv_data.te_is_neighs))
lsp = lsp_next_frag (LSP_FRAGMENT (lsp->lsp_header->lsp_id) + 1,
lsp0, area, IS_LEVEL_1);
}
free_tlvs (&tlv_data); free_tlvs (&tlv_data);
return; return;
} }