proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-09 13:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

isisd: add TLV_SIZE_MISMATCH for tlvs length mismatch

Browse Source 
Basically in frrouting source code principle,
the log string should not be a complicated abstraction
or streamlined for grep.

But for log format for the "TLV size does not match ..."
can be unified, which makes development easier.

> $ grep "TLV size does not match expected size for" isisd/isis_tlvs.c
>    "TLV size does not match expected size for Administrative Group!\n");
>    "TLV size does not match expected size for Local IPv6 address!\n");
>    ...(snip)...
>    "TLV size does not match expected size for Adjacency SID!\n");
>          "TLV size does not match expected size for Adjacency SID!\n");
>          "TLV size does not match expected size for Adjacency SID!\n");
>    "TLV size does not match expected size for LAN-Adjacency SID!\n");
>          "TLV size does not match expected size for LAN-Adjacency SID!\n");
>          "TLV size does not match expected size for LAN-Adjacency SID!\n");
>
> $ grep "TLV size does not match expected size for" isisd/isis_tlvs.c | wc -l
> 25

Signed-off-by: Hiroki Shirokura <hiroki.shirokura@linecorp.com>
Signed-off-by: Louis Scalbert <louis.scalbert@6wind.com>
This commit is contained in:
Hiroki Shirokura 2022-01-04 01:13:50 +00:00 committed by Louis Scalbert
parent 9b19f67e38
commit d4f58e0b84
1 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
isisd/isis_tlvs.c
View File

@ -30,6 +30,10 @@
#include "isisd/isis_te.h" #include "isisd/isis_te.h"
#include "isisd/isis_sr.h" #include "isisd/isis_sr.h"
#define TLV_SIZE_MISMATCH(log, indent, target) \
sbuf_push(log, indent, \
"TLV size does not match expected size for " target "!\n")
DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS TLVs"); DEFINE_MTYPE_STATIC(ISISD, ISIS_TLV, "ISIS TLVs");
DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs"); DEFINE_MTYPE(ISISD, ISIS_SUBTLV, "ISIS Sub-TLVs");
DEFINE_MTYPE_STATIC(ISISD, ISIS_MT_ITEM_LIST, "ISIS MT Item Lists"); DEFINE_MTYPE_STATIC(ISISD, ISIS_MT_ITEM_LIST, "ISIS MT Item Lists");
@ -896,8 +900,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
/* Standard Metric as defined in RFC5305 */ /* Standard Metric as defined in RFC5305 */
case ISIS_SUBTLV_ADMIN_GRP: case ISIS_SUBTLV_ADMIN_GRP:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Administrative Group!\n"); "Administrative Group");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->adm_group = stream_getl(s); exts->adm_group = stream_getl(s);
@ -915,8 +919,7 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_LLRI: case ISIS_SUBTLV_LLRI:
if (subtlv_len != ISIS_SUBTLV_LLRI_SIZE) { if (subtlv_len != ISIS_SUBTLV_LLRI_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent, "Link ID");
"TLV size does not match expected size for Link ID!\n");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->local_llri = stream_getl(s); exts->local_llri = stream_getl(s);
@ -926,8 +929,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_LOCAL_IPADDR: case ISIS_SUBTLV_LOCAL_IPADDR:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Local IP address!\n"); "Local IP address");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
stream_get(&exts->local_addr.s_addr, s, 4); stream_get(&exts->local_addr.s_addr, s, 4);
@ -936,8 +939,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_RMT_IPADDR: case ISIS_SUBTLV_RMT_IPADDR:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Remote IP address!\n"); "Remote IP address");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
stream_get(&exts->neigh_addr.s_addr, s, 4); stream_get(&exts->neigh_addr.s_addr, s, 4);
@ -946,8 +949,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_LOCAL_IPADDR6: case ISIS_SUBTLV_LOCAL_IPADDR6:
if (subtlv_len != ISIS_SUBTLV_IPV6_ADDR_SIZE) { if (subtlv_len != ISIS_SUBTLV_IPV6_ADDR_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Local IPv6 address!\n"); "Local IPv6 address");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
stream_get(&exts->local_addr6, s, 16); stream_get(&exts->local_addr6, s, 16);
@ -956,8 +959,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_RMT_IPADDR6: case ISIS_SUBTLV_RMT_IPADDR6:
if (subtlv_len != ISIS_SUBTLV_IPV6_ADDR_SIZE) { if (subtlv_len != ISIS_SUBTLV_IPV6_ADDR_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Remote IPv6 address!\n"); "Remote IPv6 address");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
stream_get(&exts->neigh_addr6, s, 16); stream_get(&exts->neigh_addr6, s, 16);
@ -966,8 +969,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_MAX_BW: case ISIS_SUBTLV_MAX_BW:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Maximum Bandwidth!\n"); "Maximum Bandwidth");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->max_bw = stream_getf(s); exts->max_bw = stream_getf(s);
@ -976,8 +979,9 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_MAX_RSV_BW: case ISIS_SUBTLV_MAX_RSV_BW:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(
"TLV size does not match expected size for Maximum Reservable Bandwidth!\n"); log, indent,
"Maximum Reservable Bandwidth");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->max_rsv_bw = stream_getf(s); exts->max_rsv_bw = stream_getf(s);
@ -986,8 +990,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_UNRSV_BW: case ISIS_SUBTLV_UNRSV_BW:
if (subtlv_len != ISIS_SUBTLV_UNRSV_BW_SIZE) { if (subtlv_len != ISIS_SUBTLV_UNRSV_BW_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Unreserved Bandwidth!\n"); "Unreserved Bandwidth");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
for (int i = 0; i < MAX_CLASS_TYPE; i++) for (int i = 0; i < MAX_CLASS_TYPE; i++)
@ -997,8 +1001,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_TE_METRIC: case ISIS_SUBTLV_TE_METRIC:
if (subtlv_len != ISIS_SUBTLV_TE_METRIC_SIZE) { if (subtlv_len != ISIS_SUBTLV_TE_METRIC_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Traffic Engineering Metric!\n"); "Traffic Engineering Metric");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->te_metric = stream_get3(s); exts->te_metric = stream_get3(s);
@ -1007,8 +1011,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_RAS: case ISIS_SUBTLV_RAS:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Remote AS number!\n"); "Remote AS number");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->remote_as = stream_getl(s); exts->remote_as = stream_getl(s);
@ -1017,8 +1021,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_RIP: case ISIS_SUBTLV_RIP:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Remote ASBR IP Address!\n"); "Remote ASBR IP Address");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
stream_get(&exts->remote_ip.s_addr, s, 4); stream_get(&exts->remote_ip.s_addr, s, 4);
@ -1028,8 +1032,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
/* Extended Metrics as defined in RFC 7810 */ /* Extended Metrics as defined in RFC 7810 */
case ISIS_SUBTLV_AV_DELAY: case ISIS_SUBTLV_AV_DELAY:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Average Link Delay!\n"); "Average Link Delay");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->delay = stream_getl(s); exts->delay = stream_getl(s);
@ -1038,8 +1042,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_MM_DELAY: case ISIS_SUBTLV_MM_DELAY:
if (subtlv_len != ISIS_SUBTLV_MM_DELAY_SIZE) { if (subtlv_len != ISIS_SUBTLV_MM_DELAY_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Min/Max Link Delay!\n"); "Min/Max Link Delay");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->min_delay = stream_getl(s); exts->min_delay = stream_getl(s);
@ -1049,8 +1053,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_DELAY_VAR: case ISIS_SUBTLV_DELAY_VAR:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Delay Variation!\n"); "Delay Variation");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->delay_var = stream_getl(s); exts->delay_var = stream_getl(s);
@ -1059,8 +1063,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_PKT_LOSS: case ISIS_SUBTLV_PKT_LOSS:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for Link Packet Loss!\n"); "Link Packet Loss");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->pkt_loss = stream_getl(s); exts->pkt_loss = stream_getl(s);
@ -1069,8 +1073,9 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_RES_BW: case ISIS_SUBTLV_RES_BW:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(
"TLV size does not match expected size for Unidirectional Residual Bandwidth!\n"); log, indent,
"Unidirectional Residual Bandwidth");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->res_bw = stream_getf(s); exts->res_bw = stream_getf(s);
@ -1079,8 +1084,9 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_AVA_BW: case ISIS_SUBTLV_AVA_BW:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(
"TLV size does not match expected size for Unidirectional Available Bandwidth!\n"); log, indent,
"Unidirectional Available Bandwidth");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->ava_bw = stream_getf(s); exts->ava_bw = stream_getf(s);
@ -1089,8 +1095,9 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
break; break;
case ISIS_SUBTLV_USE_BW: case ISIS_SUBTLV_USE_BW:
if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) { if (subtlv_len != ISIS_SUBTLV_DEF_SIZE) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(
"TLV size does not match expected size for Unidirectional Utilized Bandwidth!\n"); log, indent,
"Unidirectional Utilized Bandwidth");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
exts->use_bw = stream_getf(s); exts->use_bw = stream_getf(s);
@ -1101,8 +1108,7 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
case ISIS_SUBTLV_ADJ_SID: case ISIS_SUBTLV_ADJ_SID:
if (subtlv_len != ISIS_SUBTLV_ADJ_SID_SIZE if (subtlv_len != ISIS_SUBTLV_ADJ_SID_SIZE
&& subtlv_len != ISIS_SUBTLV_ADJ_SID_SIZE + 1) { && subtlv_len != ISIS_SUBTLV_ADJ_SID_SIZE + 1) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent, "Adjacency SID");
"TLV size does not match expected size for Adjacency SID!\n");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
struct isis_adj_sid *adj; struct isis_adj_sid *adj;
@ -1113,9 +1119,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
adj->weight = stream_getc(s); adj->weight = stream_getc(s);
if (adj->flags & EXT_SUBTLV_LINK_ADJ_SID_VFLG if (adj->flags & EXT_SUBTLV_LINK_ADJ_SID_VFLG
&& subtlv_len != ISIS_SUBTLV_ADJ_SID_SIZE) { && subtlv_len != ISIS_SUBTLV_ADJ_SID_SIZE) {
sbuf_push( TLV_SIZE_MISMATCH(log, indent,
log, indent, "Adjacency SID");
"TLV size does not match expected size for Adjacency SID!\n");
stream_forward_getp(s, subtlv_len - 2); stream_forward_getp(s, subtlv_len - 2);
XFREE(MTYPE_ISIS_SUBTLV, adj); XFREE(MTYPE_ISIS_SUBTLV, adj);
break; break;
@ -1125,9 +1130,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
&& subtlv_len && subtlv_len
!= ISIS_SUBTLV_ADJ_SID_SIZE != ISIS_SUBTLV_ADJ_SID_SIZE
+ 1) { + 1) {
sbuf_push( TLV_SIZE_MISMATCH(log, indent,
log, indent, "Adjacency SID");
"TLV size does not match expected size for Adjacency SID!\n");
stream_forward_getp(s, subtlv_len - 2); stream_forward_getp(s, subtlv_len - 2);
XFREE(MTYPE_ISIS_SUBTLV, adj); XFREE(MTYPE_ISIS_SUBTLV, adj);
break; break;
@ -1152,8 +1156,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
case ISIS_SUBTLV_LAN_ADJ_SID: case ISIS_SUBTLV_LAN_ADJ_SID:
if (subtlv_len != ISIS_SUBTLV_LAN_ADJ_SID_SIZE if (subtlv_len != ISIS_SUBTLV_LAN_ADJ_SID_SIZE
&& subtlv_len != ISIS_SUBTLV_LAN_ADJ_SID_SIZE + 1) { && subtlv_len != ISIS_SUBTLV_LAN_ADJ_SID_SIZE + 1) {
sbuf_push(log, indent, TLV_SIZE_MISMATCH(log, indent,
"TLV size does not match expected size for LAN-Adjacency SID!\n"); "LAN-Adjacency SID");
stream_forward_getp(s, subtlv_len); stream_forward_getp(s, subtlv_len);
} else { } else {
struct isis_lan_adj_sid *lan; struct isis_lan_adj_sid *lan;
@ -1168,9 +1172,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
if (lan->flags & EXT_SUBTLV_LINK_ADJ_SID_VFLG if (lan->flags & EXT_SUBTLV_LINK_ADJ_SID_VFLG
&& subtlv_len && subtlv_len
!= ISIS_SUBTLV_LAN_ADJ_SID_SIZE) { != ISIS_SUBTLV_LAN_ADJ_SID_SIZE) {
sbuf_push( TLV_SIZE_MISMATCH(log, indent,
log, indent, "LAN-Adjacency SID");
"TLV size does not match expected size for LAN-Adjacency SID!\n");
stream_forward_getp( stream_forward_getp(
s, subtlv_len - 2 s, subtlv_len - 2
- ISIS_SYS_ID_LEN); - ISIS_SYS_ID_LEN);
@ -1182,9 +1185,8 @@ static int unpack_item_ext_subtlvs(uint16_t mtid, uint8_t len, struct stream *s,
&& subtlv_len && subtlv_len
!= ISIS_SUBTLV_LAN_ADJ_SID_SIZE != ISIS_SUBTLV_LAN_ADJ_SID_SIZE
+ 1) { + 1) {
sbuf_push( TLV_SIZE_MISMATCH(log, indent,
log, indent, "LAN-Adjacency SID");
"TLV size does not match expected size for LAN-Adjacency SID!\n");
stream_forward_getp( stream_forward_getp(
s, subtlv_len - 2 s, subtlv_len - 2
- ISIS_SYS_ID_LEN); - ISIS_SYS_ID_LEN);