@@ -316,28 +316,28 @@ ldp_tlv_print(netdissect_options *ndo,
316
316
switch (tlv_type ) {
317
317
318
318
case LDP_TLV_COMMON_HELLO :
319
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 4 );
319
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 4 );
320
320
ND_PRINT ("\n\t Hold Time: %us, Flags: [%s Hello%s]" ,
321
321
GET_BE_U_2 (tptr ),
322
322
(GET_BE_U_2 (tptr + 2 )& 0x8000 ) ? "Targeted" : "Link" ,
323
323
(GET_BE_U_2 (tptr + 2 )& 0x4000 ) ? ", Request for targeted Hellos" : "" );
324
324
break ;
325
325
326
326
case LDP_TLV_IPV4_TRANSPORT_ADDR :
327
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 4 );
327
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 4 );
328
328
ND_PRINT ("\n\t IPv4 Transport Address: %s" , GET_IPADDR_STRING (tptr ));
329
329
break ;
330
330
case LDP_TLV_IPV6_TRANSPORT_ADDR :
331
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 16 );
331
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 16 );
332
332
ND_PRINT ("\n\t IPv6 Transport Address: %s" , GET_IP6ADDR_STRING (tptr ));
333
333
break ;
334
334
case LDP_TLV_CONFIG_SEQ_NUMBER :
335
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 4 );
335
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 4 );
336
336
ND_PRINT ("\n\t Sequence Number: %u" , GET_BE_U_4 (tptr ));
337
337
break ;
338
338
339
339
case LDP_TLV_ADDRESS_LIST :
340
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < ,
340
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < ,
341
341
LDP_TLV_ADDRESS_LIST_AFNUM_LEN );
342
342
af = GET_BE_U_2 (tptr );
343
343
tptr += LDP_TLV_ADDRESS_LIST_AFNUM_LEN ;
@@ -366,12 +366,12 @@ ldp_tlv_print(netdissect_options *ndo,
366
366
break ;
367
367
368
368
case LDP_TLV_HOP_COUNT :
369
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 1 );
369
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 1 );
370
370
ND_PRINT ("\n\t Hop Count: %u" , GET_U_1 (tptr ));
371
371
break ;
372
372
373
373
case LDP_TLV_PATH_VECTOR :
374
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 4 );
374
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 4 );
375
375
ND_PRINT ("\n\t Path Vector: %s" , GET_IPADDR_STRING (tptr ));
376
376
tptr += 4 ;
377
377
tlv_tlen -= 4 ;
@@ -383,7 +383,7 @@ ldp_tlv_print(netdissect_options *ndo,
383
383
break ;
384
384
385
385
case LDP_TLV_COMMON_SESSION :
386
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 14 );
386
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 14 );
387
387
ND_PRINT ("\n\t Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]" ,
388
388
GET_BE_U_2 (tptr ), GET_BE_U_2 (tptr + 2 ),
389
389
(GET_BE_U_2 (tptr + 4 )& 0x8000 ) ? "On Demand" : "Unsolicited" ,
@@ -398,7 +398,7 @@ ldp_tlv_print(netdissect_options *ndo,
398
398
break ;
399
399
400
400
case LDP_TLV_FEC :
401
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 1 );
401
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 1 );
402
402
fec_type = GET_U_1 (tptr );
403
403
ND_PRINT ("\n\t %s FEC (0x%02x)" ,
404
404
tok2str (ldp_fec_values , "Unknown" , fec_type ),
@@ -411,7 +411,7 @@ ldp_tlv_print(netdissect_options *ndo,
411
411
case LDP_FEC_WILDCARD :
412
412
break ;
413
413
case LDP_FEC_PREFIX :
414
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 2 );
414
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 2 );
415
415
af = GET_BE_U_2 (tptr );
416
416
tptr += 2 ;
417
417
tlv_tlen -= 2 ;
@@ -445,7 +445,7 @@ ldp_tlv_print(netdissect_options *ndo,
445
445
* We assume the type was supposed to be one of the MPLS
446
446
* Pseudowire Types.
447
447
*/
448
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 7 );
448
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 7 );
449
449
vc_info_len = GET_U_1 (tptr + 2 );
450
450
451
451
/*
@@ -463,7 +463,7 @@ ldp_tlv_print(netdissect_options *ndo,
463
463
}
464
464
465
465
/* 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 );
467
467
ND_PRINT (": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u" ,
468
468
tok2str (mpls_pw_types_values , "Unknown" , GET_BE_U_2 (tptr )& 0x7fff ),
469
469
GET_BE_U_2 (tptr )& 0x8000 ? "" : "no " ,
@@ -480,7 +480,7 @@ ldp_tlv_print(netdissect_options *ndo,
480
480
/* Skip past the fixed information and the VC ID */
481
481
tptr += 11 ;
482
482
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 );
484
484
485
485
while (vc_info_len > 2 ) {
486
486
vc_info_tlv_type = GET_U_1 (tptr );
@@ -529,12 +529,12 @@ ldp_tlv_print(netdissect_options *ndo,
529
529
break ;
530
530
531
531
case LDP_TLV_GENERIC_LABEL :
532
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 4 );
532
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 4 );
533
533
ND_PRINT ("\n\t Label: %u" , GET_BE_U_4 (tptr ) & 0xfffff );
534
534
break ;
535
535
536
536
case LDP_TLV_STATUS :
537
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 10 );
537
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 10 );
538
538
ui = GET_BE_U_4 (tptr );
539
539
tptr += 4 ;
540
540
ND_PRINT ("\n\t Status Code: %s, Flags: [%s and %s forward]" ,
@@ -551,7 +551,7 @@ ldp_tlv_print(netdissect_options *ndo,
551
551
break ;
552
552
553
553
case LDP_TLV_FT_SESSION :
554
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 12 );
554
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 12 );
555
555
ft_flags = GET_BE_U_2 (tptr );
556
556
ND_PRINT ("\n\t Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]" ,
557
557
ft_flags & 0x8000 ? "" : "No " ,
@@ -571,17 +571,17 @@ ldp_tlv_print(netdissect_options *ndo,
571
571
break ;
572
572
573
573
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 );
575
575
ND_PRINT ("\n\t %s" , GET_U_1 (tptr )& 0x80 ? "Support" : "No Support" );
576
576
break ;
577
577
578
578
case LDP_TLV_MTU :
579
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 2 );
579
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 2 );
580
580
ND_PRINT ("\n\t MTU: %u" , GET_BE_U_2 (tptr ));
581
581
break ;
582
582
583
583
case LDP_TLV_DUAL_STACK_CAP :
584
- ND_ICHECKMSG_U ("tlv length" , tlv_len , < , 4 );
584
+ ND_ICHECKMSG_U ("tlv length" , tlv_tlen , < , 4 );
585
585
transport_pref = GET_U_1 (tptr );
586
586
ND_PRINT ("\n\t Transport Connection Preference: %s" ,
587
587
tok2str (ldp_dual_stack_transport_pref_values ,
0 commit comments