proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2026-01-06 23:40:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct build TLV functions

Browse Source 
* Functions that build TLVs in ospf_te.c and ospf_te.c use 'tlvh + 1'
to move the pointer to the TLV payload ifor strem_put().
 * Correct this by using TLV_DATA() macro which is saffer.

Signed-off-by: Olivier Dugeon <olivier.dugeon@orange.com>
This commit is contained in:
Olivier Dugeon 2017-07-31 18:03:00 +02:00
parent a6df2b80d7
commit 5d0df50feb
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ospfd/ospf_ri.c
View File

@ -506,7 +506,7 @@ static void build_tlv(struct stream *s, struct tlv_header *tlvh)
if (ntohs(tlvh->type) != 0) {
build_tlv_header(s, tlvh);
stream_put(s, tlvh + 1, TLV_BODY_SIZE(tlvh));
stream_put(s, TLV_DATA(tlvh), TLV_BODY_SIZE(tlvh));
}
return;
}

6
ospfd/ospf_te.c
View File

@ -1065,7 +1065,7 @@ static void build_router_tlv(struct stream *s)
struct tlv_header *tlvh = &OspfMplsTE.router_addr.header;
if (ntohs(tlvh->type) != 0) {
build_tlv_header(s, tlvh);
stream_put(s, tlvh + 1, TLV_BODY_SIZE(tlvh));
stream_put(s, TLV_DATA(tlvh), TLV_BODY_SIZE(tlvh));
}
return;
}
@ -1075,7 +1075,7 @@ static void build_link_subtlv(struct stream *s, struct tlv_header *tlvh)
if ((tlvh != NULL) && (ntohs(tlvh->type) != 0)) {
build_tlv_header(s, tlvh);
stream_put(s, tlvh + 1, TLV_BODY_SIZE(tlvh));
stream_put(s, TLV_DATA(tlvh), TLV_BODY_SIZE(tlvh));
}
return;
}
@ -2141,7 +2141,7 @@ static void ospf_mpls_te_show_info(struct vty *vty, struct ospf_lsa *lsa)
case TE_TLV_LINK:
sum += show_vty_link_header(vty, tlvh);
subfunc = ospf_mpls_te_show_link_subtlv;
next = tlvh + 1;
next = TLV_DATA(tlvh);
break;
default:
sum += show_vty_unknown_tlv(vty, tlvh);