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

* isis_lsp.c: Put correct metric info into TE TLV's. Wide metric is

Browse Source 
used only if only wide metric style (extended TLV's) is in use.
This commit is contained in:
hasso 2005-09-26 18:06:47 +00:00
parent 81ad8f6a10
commit 309ddb199a
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/ChangeLog
View File

@ -1,3 +1,8 @@
2005-09-26 Hasso Tepper <hasso at quagga.net>
* isis_lsp.c: Put correct metric info into TE TLV's. Wide metric is
used only if only wide metric style (extended TLV's) is in use.
2005-09-26 Hasso Tepper <hasso at quagga.net>
* isis_tlv.[ch]: New function tlv_add_in_addr() to put just one IPv4

18
isisd/isis_lsp.c
View File

@ -1199,7 +1199,12 @@ lsp_build_nonpseudo (struct isis_lsp *lsp, struct isis_area *area)
te_ipreach = XCALLOC (MTYPE_ISIS_TLV,
sizeof (struct te_ipv4_reachability) +
((ipv4->prefixlen + 7)/8) - 1);
te_ipreach->te_metric = htonl (*circuit->te_metric);
if (area->oldmetric)
te_ipreach->te_metric = htonl (circuit->metrics[level - 1].metric_default);
else
te_ipreach->te_metric = htonl (circuit->te_metric[level - 1]);
te_ipreach->control = (ipv4->prefixlen & 0x3F);
memcpy (&te_ipreach->prefix_start, &ipv4->prefix.s_addr,
(ipv4->prefixlen + 7)/8);
@ -1225,8 +1230,13 @@ lsp_build_nonpseudo (struct isis_lsp *lsp, struct isis_area *area)
{
ip6reach =
XCALLOC (MTYPE_ISIS_TLV, sizeof (struct ipv6_reachability));
if (area->oldmetric)
ip6reach->metric =
htonl (circuit->metrics[level - 1].metric_default);
else
ip6reach->metric = htonl (circuit->te_metric[level - 1]);
ip6reach->control_info = 0;
ip6reach->prefix_len = ipv6->prefixlen;
memcpy (&ip6prefix, &ipv6, sizeof(ip6prefix));
@ -1278,7 +1288,13 @@ lsp_build_nonpseudo (struct isis_lsp *lsp, struct isis_area *area)
else
memcpy (te_is_neigh->neigh_id,
circuit->u.bc.l2_desig_is, ISIS_SYS_ID_LEN + 1);
if (area->oldmetric)
metric =
((htonl(circuit->metrics[level - 1].metric_default) >> 8)
& 0xffffff);
else
metric = ((htonl(*circuit->te_metric) >> 8) & 0xffffff);
memcpy (te_is_neigh->te_metric, &metric, 3);
listnode_add (tlv_data.te_is_neighs, te_is_neigh);
}