Skip to content

Commit cbcd977

Browse files
fxlbfxlb
committed
LDP: Fix typos in a variable name
s/tlv_len/tlv_tlen/ This is a follow-up to 59d7ea4.
1 parent 96529ea commit cbcd977

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎print-ldp.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -316,28 +316,28 @@ ldp_tlv_print(netdissect_options *ndo,
316316
switch(tlv_type) {
317317

318318
case LDP_TLV_COMMON_HELLO:
319-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
319+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
320320
ND_PRINT("\n\t Hold Time: %us, Flags: [%s Hello%s]",
321321
GET_BE_U_2(tptr),
322322
(GET_BE_U_2(tptr + 2)&0x8000) ? "Targeted" : "Link",
323323
(GET_BE_U_2(tptr + 2)&0x4000) ? ", Request for targeted Hellos" : "");
324324
break;
325325

326326
case LDP_TLV_IPV4_TRANSPORT_ADDR:
327-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
327+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
328328
ND_PRINT("\n\t IPv4 Transport Address: %s", GET_IPADDR_STRING(tptr));
329329
break;
330330
case LDP_TLV_IPV6_TRANSPORT_ADDR:
331-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 16);
331+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 16);
332332
ND_PRINT("\n\t IPv6 Transport Address: %s", GET_IP6ADDR_STRING(tptr));
333333
break;
334334
case LDP_TLV_CONFIG_SEQ_NUMBER:
335-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
335+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
336336
ND_PRINT("\n\t Sequence Number: %u", GET_BE_U_4(tptr));
337337
break;
338338

339339
case LDP_TLV_ADDRESS_LIST:
340-
ND_ICHECKMSG_U("tlv length", tlv_len, <,
340+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <,
341341
LDP_TLV_ADDRESS_LIST_AFNUM_LEN);
342342
af = GET_BE_U_2(tptr);
343343
tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
@@ -366,12 +366,12 @@ ldp_tlv_print(netdissect_options *ndo,
366366
break;
367367

368368
case LDP_TLV_HOP_COUNT:
369-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 1);
369+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);
370370
ND_PRINT("\n\t Hop Count: %u", GET_U_1(tptr));
371371
break;
372372

373373
case LDP_TLV_PATH_VECTOR:
374-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
374+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
375375
ND_PRINT("\n\t Path Vector: %s", GET_IPADDR_STRING(tptr));
376376
tptr += 4;
377377
tlv_tlen -= 4;
@@ -383,7 +383,7 @@ ldp_tlv_print(netdissect_options *ndo,
383383
break;
384384

385385
case LDP_TLV_COMMON_SESSION:
386-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 14);
386+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 14);
387387
ND_PRINT("\n\t Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",
388388
GET_BE_U_2(tptr), GET_BE_U_2(tptr + 2),
389389
(GET_BE_U_2(tptr + 4)&0x8000) ? "On Demand" : "Unsolicited",
@@ -398,7 +398,7 @@ ldp_tlv_print(netdissect_options *ndo,
398398
break;
399399

400400
case LDP_TLV_FEC:
401-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 1);
401+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);
402402
fec_type = GET_U_1(tptr);
403403
ND_PRINT("\n\t %s FEC (0x%02x)",
404404
tok2str(ldp_fec_values, "Unknown", fec_type),
@@ -411,7 +411,7 @@ ldp_tlv_print(netdissect_options *ndo,
411411
case LDP_FEC_WILDCARD:
412412
break;
413413
case LDP_FEC_PREFIX:
414-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 2);
414+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 2);
415415
af = GET_BE_U_2(tptr);
416416
tptr+=2;
417417
tlv_tlen-=2;
@@ -445,7 +445,7 @@ ldp_tlv_print(netdissect_options *ndo,
445445
* We assume the type was supposed to be one of the MPLS
446446
* Pseudowire Types.
447447
*/
448-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 7);
448+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 7);
449449
vc_info_len = GET_U_1(tptr + 2);
450450

451451
/*
@@ -463,7 +463,7 @@ ldp_tlv_print(netdissect_options *ndo,
463463
}
464464

465465
/* Make sure we have the VC ID as well */
466-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 11);
466+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 11);
467467
ND_PRINT(": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",
468468
tok2str(mpls_pw_types_values, "Unknown", GET_BE_U_2(tptr)&0x7fff),
469469
GET_BE_U_2(tptr)&0x8000 ? "" : "no ",
@@ -480,7 +480,7 @@ ldp_tlv_print(netdissect_options *ndo,
480480
/* Skip past the fixed information and the VC ID */
481481
tptr+=11;
482482
tlv_tlen-=11;
483-
ND_ICHECKMSG_U("tlv length", tlv_len, <, vc_info_len);
483+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, vc_info_len);
484484

485485
while (vc_info_len > 2) {
486486
vc_info_tlv_type = GET_U_1(tptr);
@@ -529,12 +529,12 @@ ldp_tlv_print(netdissect_options *ndo,
529529
break;
530530

531531
case LDP_TLV_GENERIC_LABEL:
532-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
532+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
533533
ND_PRINT("\n\t Label: %u", GET_BE_U_4(tptr) & 0xfffff);
534534
break;
535535

536536
case LDP_TLV_STATUS:
537-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 10);
537+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 10);
538538
ui = GET_BE_U_4(tptr);
539539
tptr+=4;
540540
ND_PRINT("\n\t Status Code: %s, Flags: [%s and %s forward]",
@@ -551,7 +551,7 @@ ldp_tlv_print(netdissect_options *ndo,
551551
break;
552552

553553
case LDP_TLV_FT_SESSION:
554-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 12);
554+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 12);
555555
ft_flags = GET_BE_U_2(tptr);
556556
ND_PRINT("\n\t Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",
557557
ft_flags&0x8000 ? "" : "No ",
@@ -571,17 +571,17 @@ ldp_tlv_print(netdissect_options *ndo,
571571
break;
572572

573573
case LDP_TLV_TYPED_WC_FEC_CAP:
574-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 1);
574+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);
575575
ND_PRINT("\n\t %s", GET_U_1(tptr)&0x80 ? "Support" : "No Support");
576576
break;
577577

578578
case LDP_TLV_MTU:
579-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 2);
579+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 2);
580580
ND_PRINT("\n\t MTU: %u", GET_BE_U_2(tptr));
581581
break;
582582

583583
case LDP_TLV_DUAL_STACK_CAP:
584-
ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
584+
ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
585585
transport_pref = GET_U_1(tptr);
586586
ND_PRINT("\n\t Transport Connection Preference: %s",
587587
tok2str(ldp_dual_stack_transport_pref_values,

0 commit comments

Comments
 (0)