pflog: handle OpenBSD's "rewriten" flag and addresses.

[tcpdump] / print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index 6d39c11356178008e140ad39625e434ae11836ac..b16e989f2912d3c7347c3e84b97d4ae946ffde00 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -16,9 +16,7 @@
 
 /* \summary: Label Distribution Protocol (LDP) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -316,7 +314,7 @@ ldp_tlv_print(netdissect_options *ndo,
     switch(tlv_type) {
 
     case LDP_TLV_COMMON_HELLO:
-        ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
         ND_PRINT("\n\t      Hold Time: %us, Flags: [%s Hello%s]",
                GET_BE_U_2(tptr),
                (GET_BE_U_2(tptr + 2)&0x8000) ? "Targeted" : "Link",
@@ -324,20 +322,20 @@ ldp_tlv_print(netdissect_options *ndo,
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
-        ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
         ND_PRINT("\n\t      IPv4 Transport Address: %s", GET_IPADDR_STRING(tptr));
         break;
     case LDP_TLV_IPV6_TRANSPORT_ADDR:
-        ND_ICHECKMSG_U("tlv length", tlv_len, <, 16);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 16);
         ND_PRINT("\n\t      IPv6 Transport Address: %s", GET_IP6ADDR_STRING(tptr));
         break;
     case LDP_TLV_CONFIG_SEQ_NUMBER:
-        ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
         ND_PRINT("\n\t      Sequence Number: %u", GET_BE_U_4(tptr));
         break;
 
     case LDP_TLV_ADDRESS_LIST:
-        ND_ICHECKMSG_U("tlv length", tlv_len, <,
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <,
                        LDP_TLV_ADDRESS_LIST_AFNUM_LEN);
        af = GET_BE_U_2(tptr);
        tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
@@ -366,12 +364,12 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_HOP_COUNT:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 1);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);
        ND_PRINT("\n\t      Hop Count: %u", GET_U_1(tptr));
        break;
 
     case LDP_TLV_PATH_VECTOR:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
        ND_PRINT("\n\t      Path Vector: %s", GET_IPADDR_STRING(tptr));
        tptr += 4;
        tlv_tlen -= 4;
@@ -383,7 +381,7 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_COMMON_SESSION:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 14);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 14);
        ND_PRINT("\n\t      Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",
               GET_BE_U_2(tptr), GET_BE_U_2(tptr + 2),
               (GET_BE_U_2(tptr + 4)&0x8000) ? "On Demand" : "Unsolicited",
@@ -398,7 +396,7 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_FEC:
-        ND_ICHECKMSG_U("tlv length", tlv_len, <, 1);
+        ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);
         fec_type = GET_U_1(tptr);
        ND_PRINT("\n\t      %s FEC (0x%02x)",
               tok2str(ldp_fec_values, "Unknown", fec_type),
@@ -411,7 +409,7 @@ ldp_tlv_print(netdissect_options *ndo,
        case LDP_FEC_WILDCARD:
            break;
        case LDP_FEC_PREFIX:
-           ND_ICHECKMSG_U("tlv length", tlv_len, <, 2);
+           ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 2);
            af = GET_BE_U_2(tptr);
            tptr+=2;
            tlv_tlen-=2;
@@ -445,7 +443,7 @@ ldp_tlv_print(netdissect_options *ndo,
              * We assume the type was supposed to be one of the MPLS
              * Pseudowire Types.
              */
-            ND_ICHECKMSG_U("tlv length", tlv_len, <, 7);
+            ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 7);
             vc_info_len = GET_U_1(tptr + 2);
 
             /*
@@ -463,7 +461,7 @@ ldp_tlv_print(netdissect_options *ndo,
             }
 
             /* Make sure we have the VC ID as well */
-            ND_ICHECKMSG_U("tlv length", tlv_len, <, 11);
+            ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 11);
            ND_PRINT(": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",
                   tok2str(mpls_pw_types_values, "Unknown", GET_BE_U_2(tptr)&0x7fff),
                   GET_BE_U_2(tptr)&0x8000 ? "" : "no ",
@@ -480,7 +478,7 @@ ldp_tlv_print(netdissect_options *ndo,
             /* Skip past the fixed information and the VC ID */
             tptr+=11;
             tlv_tlen-=11;
-            ND_ICHECKMSG_U("tlv length", tlv_len, <, vc_info_len);
+            ND_ICHECKMSG_U("tlv length", tlv_tlen, <, vc_info_len);
 
             while (vc_info_len > 2) {
                 vc_info_tlv_type = GET_U_1(tptr);
@@ -529,12 +527,12 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_GENERIC_LABEL:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
        ND_PRINT("\n\t      Label: %u", GET_BE_U_4(tptr) & 0xfffff);
        break;
 
     case LDP_TLV_STATUS:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 10);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 10);
        ui = GET_BE_U_4(tptr);
        tptr+=4;
        ND_PRINT("\n\t      Status Code: %s, Flags: [%s and %s forward]",
@@ -551,7 +549,7 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_FT_SESSION:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 12);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 12);
        ft_flags = GET_BE_U_2(tptr);
        ND_PRINT("\n\t      Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",
               ft_flags&0x8000 ? "" : "No ",
@@ -571,17 +569,17 @@ ldp_tlv_print(netdissect_options *ndo,
        break;
 
     case LDP_TLV_TYPED_WC_FEC_CAP:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 1);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 1);
        ND_PRINT("\n\t      %s", GET_U_1(tptr)&0x80 ? "Support" : "No Support");
        break;
 
     case LDP_TLV_MTU:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 2);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 2);
        ND_PRINT("\n\t      MTU: %u", GET_BE_U_2(tptr));
        break;
 
     case LDP_TLV_DUAL_STACK_CAP:
-       ND_ICHECKMSG_U("tlv length", tlv_len, <, 4);
+       ND_ICHECKMSG_U("tlv length", tlv_tlen, <, 4);
        transport_pref = GET_U_1(tptr);
        ND_PRINT("\n\t      Transport Connection Preference: %s",
                 tok2str(ldp_dual_stack_transport_pref_values,
@@ -689,7 +687,7 @@ ldp_pdu_print(netdissect_options *ndo,
     tptr = pptr + sizeof(struct ldp_common_header);
     tlen = pdu_len - (sizeof(struct ldp_common_header)-4);     /* Type & Length fields not included */
 
-    while(tlen>0) {
+    while(tlen != 0) {
         /* did we capture enough for fully decoding the msg header ? */
         ND_TCHECK_LEN(tptr, sizeof(struct ldp_msg_header));