Add more nd_print_trunc() calls

[tcpdump] / print-ldp.c

diff --git a/print-ldp.c b/print-ldp.c
index eef5cc2bd1b7859200bcd32d09f96ac0c22bcd72..351c1f81e55b2793b431d466d992ee7f666a5b01 100644 (file)
--- a/print-ldp.c
+++ b/print-ldp.c
@@ -17,10 +17,10 @@
 /* \summary: Label Distribution Protocol (LDP) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Label Distribution Protocol (LDP) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"


@@ -29,6 +29,7 @@
 #include "l2vpn.h"
 #include "af.h"
 
 #include "l2vpn.h"
 #include "af.h"
 

+

 /*
  * ldp common header
  *
 /*
  * ldp common header
  *


@@ -253,21 +254,21 @@ ldp_tlv_print(netdissect_options *ndo,
     ND_TCHECK_SIZE(ldp_tlv_header);
     tlv_len=EXTRACT_BE_U_2(ldp_tlv_header->length);
     if (tlv_len + 4 > msg_tlen) {
     ND_TCHECK_SIZE(ldp_tlv_header);
     tlv_len=EXTRACT_BE_U_2(ldp_tlv_header->length);
     if (tlv_len + 4 > msg_tlen) {

-        ND_PRINT((ndo, "\n\t\t TLV contents go past end of message"));
+        ND_PRINT("\n\t\t TLV contents go past end of message");

         return 0;
     }
     tlv_tlen=tlv_len;
     tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_BE_U_2(ldp_tlv_header->type));
 
     /* FIXME vendor private / experimental check */
         return 0;
     }
     tlv_tlen=tlv_len;
     tlv_type=LDP_MASK_TLV_TYPE(EXTRACT_BE_U_2(ldp_tlv_header->type));
 
     /* FIXME vendor private / experimental check */

-    ND_PRINT((ndo, "\n\t    %s TLV (0x%04x), length: %u, Flags: [%s and %s forward if unknown]",
+    ND_PRINT("\n\t    %s TLV (0x%04x), length: %u, Flags: [%s and %s forward if unknown]",

            tok2str(ldp_tlv_values,
                    "Unknown",
                    tlv_type),
            tlv_type,
            tlv_len,
            LDP_MASK_U_BIT(EXTRACT_BE_U_2(ldp_tlv_header->type)) ? "continue processing" : "ignore",
            tok2str(ldp_tlv_values,
                    "Unknown",
                    tlv_type),
            tlv_type,
            tlv_len,
            LDP_MASK_U_BIT(EXTRACT_BE_U_2(ldp_tlv_header->type)) ? "continue processing" : "ignore",

-           LDP_MASK_F_BIT(EXTRACT_BE_U_2(ldp_tlv_header->type)) ? "do" : "don't"));
+           LDP_MASK_F_BIT(EXTRACT_BE_U_2(ldp_tlv_header->type)) ? "do" : "don't");

 
     tptr+=sizeof(struct ldp_tlv_header);
 
 
     tptr+=sizeof(struct ldp_tlv_header);
 


@@ -275,23 +276,23 @@ ldp_tlv_print(netdissect_options *ndo,
 
     case LDP_TLV_COMMON_HELLO:
         TLV_TCHECK(4);
 
     case LDP_TLV_COMMON_HELLO:
         TLV_TCHECK(4);

-        ND_PRINT((ndo, "\n\t      Hold Time: %us, Flags: [%s Hello%s]",
+        ND_PRINT("\n\t      Hold Time: %us, Flags: [%s Hello%s]",

                EXTRACT_BE_U_2(tptr),
                (EXTRACT_BE_U_2(tptr + 2)&0x8000) ? "Targeted" : "Link",
                EXTRACT_BE_U_2(tptr),
                (EXTRACT_BE_U_2(tptr + 2)&0x8000) ? "Targeted" : "Link",

-               (EXTRACT_BE_U_2(tptr + 2)&0x4000) ? ", Request for targeted Hellos" : ""));
+               (EXTRACT_BE_U_2(tptr + 2)&0x4000) ? ", Request for targeted Hellos" : "");

         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
         TLV_TCHECK(4);
         break;
 
     case LDP_TLV_IPV4_TRANSPORT_ADDR:
         TLV_TCHECK(4);

-        ND_PRINT((ndo, "\n\t      IPv4 Transport Address: %s", ipaddr_string(ndo, tptr)));
+        ND_PRINT("\n\t      IPv4 Transport Address: %s", ipaddr_string(ndo, tptr));

         break;
     case LDP_TLV_IPV6_TRANSPORT_ADDR:
         TLV_TCHECK(16);
         break;
     case LDP_TLV_IPV6_TRANSPORT_ADDR:
         TLV_TCHECK(16);

-        ND_PRINT((ndo, "\n\t      IPv6 Transport Address: %s", ip6addr_string(ndo, tptr)));
+        ND_PRINT("\n\t      IPv6 Transport Address: %s", ip6addr_string(ndo, tptr));

         break;
     case LDP_TLV_CONFIG_SEQ_NUMBER:
         TLV_TCHECK(4);
         break;
     case LDP_TLV_CONFIG_SEQ_NUMBER:
         TLV_TCHECK(4);

-        ND_PRINT((ndo, "\n\t      Sequence Number: %u", EXTRACT_BE_U_4(tptr)));
+        ND_PRINT("\n\t      Sequence Number: %u", EXTRACT_BE_U_4(tptr));

         break;
 
     case LDP_TLV_ADDRESS_LIST:
         break;
 
     case LDP_TLV_ADDRESS_LIST:


@@ -299,23 +300,23 @@ ldp_tlv_print(netdissect_options *ndo,
        af = EXTRACT_BE_U_2(tptr);
        tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
         tlv_tlen -= LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
        af = EXTRACT_BE_U_2(tptr);
        tptr+=LDP_TLV_ADDRESS_LIST_AFNUM_LEN;
         tlv_tlen -= LDP_TLV_ADDRESS_LIST_AFNUM_LEN;

-       ND_PRINT((ndo, "\n\t      Address Family: %s, addresses",
-               tok2str(af_values, "Unknown (%u)", af)));
+       ND_PRINT("\n\t      Address Family: %s, addresses",
+               tok2str(af_values, "Unknown (%u)", af));

         switch (af) {
         case AFNUM_INET:
         switch (af) {
         case AFNUM_INET:

-           while(tlv_tlen >= sizeof(struct in_addr)) {
-               ND_TCHECK_LEN(tptr, sizeof(struct in_addr));
-               ND_PRINT((ndo, " %s", ipaddr_string(ndo, tptr)));
-               tlv_tlen-=sizeof(struct in_addr);
-               tptr+=sizeof(struct in_addr);
+           while(tlv_tlen >= sizeof(nd_ipv4)) {
+               ND_TCHECK_LEN(tptr, sizeof(nd_ipv4));
+               ND_PRINT(" %s", ipaddr_string(ndo, tptr));
+               tlv_tlen-=sizeof(nd_ipv4);
+               tptr+=sizeof(nd_ipv4);

            }
             break;
         case AFNUM_INET6:
            }
             break;
         case AFNUM_INET6:

-           while(tlv_tlen >= sizeof(struct in6_addr)) {
-               ND_TCHECK_LEN(tptr, sizeof(struct in6_addr));
-               ND_PRINT((ndo, " %s", ip6addr_string(ndo, tptr)));
-               tlv_tlen-=sizeof(struct in6_addr);
-               tptr+=sizeof(struct in6_addr);
+           while(tlv_tlen >= sizeof(nd_ipv6)) {
+               ND_TCHECK_LEN(tptr, sizeof(nd_ipv6));
+               ND_PRINT(" %s", ip6addr_string(ndo, tptr));
+               tlv_tlen-=sizeof(nd_ipv6);
+               tptr+=sizeof(nd_ipv6);

            }
             break;
         default:
            }
             break;
         default:


@@ -326,19 +327,19 @@ ldp_tlv_print(netdissect_options *ndo,
 
     case LDP_TLV_COMMON_SESSION:
        TLV_TCHECK(8);
 
     case LDP_TLV_COMMON_SESSION:
        TLV_TCHECK(8);

-       ND_PRINT((ndo, "\n\t      Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",
+       ND_PRINT("\n\t      Version: %u, Keepalive: %us, Flags: [Downstream %s, Loop Detection %s]",

               EXTRACT_BE_U_2(tptr), EXTRACT_BE_U_2(tptr + 2),
               (EXTRACT_BE_U_2(tptr + 6)&0x8000) ? "On Demand" : "Unsolicited",
               (EXTRACT_BE_U_2(tptr + 6)&0x4000) ? "Enabled" : "Disabled"
               EXTRACT_BE_U_2(tptr), EXTRACT_BE_U_2(tptr + 2),
               (EXTRACT_BE_U_2(tptr + 6)&0x8000) ? "On Demand" : "Unsolicited",
               (EXTRACT_BE_U_2(tptr + 6)&0x4000) ? "Enabled" : "Disabled"

-              ));
+              );

        break;
 
     case LDP_TLV_FEC:
         TLV_TCHECK(1);
         fec_type = EXTRACT_U_1(tptr);
        break;
 
     case LDP_TLV_FEC:
         TLV_TCHECK(1);
         fec_type = EXTRACT_U_1(tptr);

-       ND_PRINT((ndo, "\n\t      %s FEC (0x%02x)",
+       ND_PRINT("\n\t      %s FEC (0x%02x)",

               tok2str(ldp_fec_values, "Unknown", fec_type),
               tok2str(ldp_fec_values, "Unknown", fec_type),

-              fec_type));
+              fec_type);

 
        tptr+=1;
        tlv_tlen-=1;
 
        tptr+=1;
        tlv_tlen-=1;


@@ -356,25 +357,25 @@ ldp_tlv_print(netdissect_options *ndo,
                if (i == -2)
                    goto trunc;
                if (i == -3)
                if (i == -2)
                    goto trunc;
                if (i == -3)

-                   ND_PRINT((ndo, ": IPv4 prefix (goes past end of TLV)"));
+                   ND_PRINT(": IPv4 prefix (goes past end of TLV)");

                else if (i == -1)
                else if (i == -1)

-                   ND_PRINT((ndo, ": IPv4 prefix (invalid length)"));
+                   ND_PRINT(": IPv4 prefix (invalid length)");

                else
                else

-                   ND_PRINT((ndo, ": IPv4 prefix %s", buf));
+                   ND_PRINT(": IPv4 prefix %s", buf);

            }
            else if (af == AFNUM_INET6) {
                i=decode_prefix6(ndo, tptr, tlv_tlen, buf, sizeof(buf));
                if (i == -2)
                    goto trunc;
                if (i == -3)
            }
            else if (af == AFNUM_INET6) {
                i=decode_prefix6(ndo, tptr, tlv_tlen, buf, sizeof(buf));
                if (i == -2)
                    goto trunc;
                if (i == -3)

-                   ND_PRINT((ndo, ": IPv4 prefix (goes past end of TLV)"));
+                   ND_PRINT(": IPv4 prefix (goes past end of TLV)");

                else if (i == -1)
                else if (i == -1)

-                   ND_PRINT((ndo, ": IPv6 prefix (invalid length)"));
+                   ND_PRINT(": IPv6 prefix (invalid length)");

                else
                else

-                   ND_PRINT((ndo, ": IPv6 prefix %s", buf));
+                   ND_PRINT(": IPv6 prefix %s", buf);

            }
            else
            }
            else

-               ND_PRINT((ndo, ": Address family %u prefix", af));
+               ND_PRINT(": Address family %u prefix", af);

            break;
        case LDP_FEC_HOSTADDRESS:
            break;
            break;
        case LDP_FEC_HOSTADDRESS:
            break;


@@ -392,25 +393,25 @@ ldp_tlv_print(netdissect_options *ndo,
             * there's no VC ID.
             */
             if (vc_info_len == 0) {
             * there's no VC ID.
             */
             if (vc_info_len == 0) {

-                ND_PRINT((ndo, ": %s, %scontrol word, group-ID %u, VC-info-length: %u",
+                ND_PRINT(": %s, %scontrol word, group-ID %u, VC-info-length: %u",

                        tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_U_2(tptr)&0x7fff),
                        EXTRACT_BE_U_2(tptr)&0x8000 ? "" : "no ",
                        EXTRACT_BE_U_4(tptr + 3),
                        tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_U_2(tptr)&0x7fff),
                        EXTRACT_BE_U_2(tptr)&0x8000 ? "" : "no ",
                        EXTRACT_BE_U_4(tptr + 3),

-                       vc_info_len));
+                       vc_info_len);

                 break;
             }
 
             /* Make sure we have the VC ID as well */
             TLV_TCHECK(11);
                 break;
             }
 
             /* Make sure we have the VC ID as well */
             TLV_TCHECK(11);

-           ND_PRINT((ndo, ": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",
+           ND_PRINT(": %s, %scontrol word, group-ID %u, VC-ID %u, VC-info-length: %u",

                   tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_U_2(tptr)&0x7fff),
                   EXTRACT_BE_U_2(tptr)&0x8000 ? "" : "no ",
                   EXTRACT_BE_U_4(tptr + 3),
                   EXTRACT_BE_U_4(tptr + 7),
                   tok2str(mpls_pw_types_values, "Unknown", EXTRACT_BE_U_2(tptr)&0x7fff),
                   EXTRACT_BE_U_2(tptr)&0x8000 ? "" : "no ",
                   EXTRACT_BE_U_4(tptr + 3),
                   EXTRACT_BE_U_4(tptr + 7),

-                  vc_info_len));
+                  vc_info_len);

             if (vc_info_len < 4) {
                 /* minimum 4, for the VC ID */
             if (vc_info_len < 4) {
                 /* minimum 4, for the VC ID */

-                ND_PRINT((ndo, " (invalid, < 4"));
+                ND_PRINT(" (invalid, < 4");

                 return(tlv_len+4); /* Type & Length fields not included */
            }
             vc_info_len -= 4; /* subtract out the VC ID, giving the length of the interface parameters */
                 return(tlv_len+4); /* Type & Length fields not included */
            }
             vc_info_len -= 4; /* subtract out the VC ID, giving the length of the interface parameters */


@@ -428,29 +429,29 @@ ldp_tlv_print(netdissect_options *ndo,
                 if (vc_info_len < vc_info_tlv_len)
                     break;
 
                 if (vc_info_len < vc_info_tlv_len)
                     break;
 

-                ND_PRINT((ndo, "\n\t\tInterface Parameter: %s (0x%02x), len %u",
+                ND_PRINT("\n\t\tInterface Parameter: %s (0x%02x), len %u",

                        tok2str(ldp_fec_martini_ifparm_values,"Unknown",vc_info_tlv_type),
                        vc_info_tlv_type,
                        tok2str(ldp_fec_martini_ifparm_values,"Unknown",vc_info_tlv_type),
                        vc_info_tlv_type,

-                       vc_info_tlv_len));
+                       vc_info_tlv_len);

 
                 switch(vc_info_tlv_type) {
                 case LDP_FEC_MARTINI_IFPARM_MTU:
 
                 switch(vc_info_tlv_type) {
                 case LDP_FEC_MARTINI_IFPARM_MTU:

-                    ND_PRINT((ndo, ": %u", EXTRACT_BE_U_2(tptr + 2)));
+                    ND_PRINT(": %u", EXTRACT_BE_U_2(tptr + 2));

                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_DESC:
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_DESC:

-                    ND_PRINT((ndo, ": "));
+                    ND_PRINT(": ");

                     for (idx = 2; idx < vc_info_tlv_len; idx++)
                     for (idx = 2; idx < vc_info_tlv_len; idx++)

-                        safeputchar(ndo, EXTRACT_U_1(tptr + idx));
+                        fn_print_char(ndo, EXTRACT_U_1(tptr + idx));

                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_VCCV:
                     break;
 
                 case LDP_FEC_MARTINI_IFPARM_VCCV:

-                    ND_PRINT((ndo, "\n\t\t  Control Channels (0x%02x) = [%s]",
+                    ND_PRINT("\n\t\t  Control Channels (0x%02x) = [%s]",

                            EXTRACT_U_1((tptr + 2)),
                            EXTRACT_U_1((tptr + 2)),

-                           bittok2str(ldp_fec_martini_ifparm_vccv_cc_values, "none", EXTRACT_U_1((tptr + 2)))));
-                    ND_PRINT((ndo, "\n\t\t  CV Types (0x%02x) = [%s]",
+                           bittok2str(ldp_fec_martini_ifparm_vccv_cc_values, "none", EXTRACT_U_1((tptr + 2))));
+                    ND_PRINT("\n\t\t  CV Types (0x%02x) = [%s]",

                            EXTRACT_U_1((tptr + 3)),
                            EXTRACT_U_1((tptr + 3)),

-                           bittok2str(ldp_fec_martini_ifparm_vccv_cv_values, "none", EXTRACT_U_1((tptr + 3)))));
+                           bittok2str(ldp_fec_martini_ifparm_vccv_cv_values, "none", EXTRACT_U_1((tptr + 3))));

                     break;
 
                 default:
                     break;
 
                 default:


@@ -468,45 +469,45 @@ ldp_tlv_print(netdissect_options *ndo,
 
     case LDP_TLV_GENERIC_LABEL:
        TLV_TCHECK(4);
 
     case LDP_TLV_GENERIC_LABEL:
        TLV_TCHECK(4);

-       ND_PRINT((ndo, "\n\t      Label: %u", EXTRACT_BE_U_4(tptr) & 0xfffff));
+       ND_PRINT("\n\t      Label: %u", EXTRACT_BE_U_4(tptr) & 0xfffff);

        break;
 
     case LDP_TLV_STATUS:
        TLV_TCHECK(8);
        ui = EXTRACT_BE_U_4(tptr);
        tptr+=4;
        break;
 
     case LDP_TLV_STATUS:
        TLV_TCHECK(8);
        ui = EXTRACT_BE_U_4(tptr);
        tptr+=4;

-       ND_PRINT((ndo, "\n\t      Status: 0x%02x, Flags: [%s and %s forward]",
+       ND_PRINT("\n\t      Status: 0x%02x, Flags: [%s and %s forward]",

               ui&0x3fffffff,
               ui&0x80000000 ? "Fatal error" : "Advisory Notification",
               ui&0x3fffffff,
               ui&0x80000000 ? "Fatal error" : "Advisory Notification",

-              ui&0x40000000 ? "do" : "don't"));
+              ui&0x40000000 ? "do" : "don't");

        ui = EXTRACT_BE_U_4(tptr);
        tptr+=4;
        if (ui)
        ui = EXTRACT_BE_U_4(tptr);
        tptr+=4;
        if (ui)

-           ND_PRINT((ndo, ", causing Message ID: 0x%08x", ui));
+           ND_PRINT(", causing Message ID: 0x%08x", ui);

        break;
 
     case LDP_TLV_FT_SESSION:
        TLV_TCHECK(8);
        ft_flags = EXTRACT_BE_U_2(tptr);
        break;
 
     case LDP_TLV_FT_SESSION:
        TLV_TCHECK(8);
        ft_flags = EXTRACT_BE_U_2(tptr);

-       ND_PRINT((ndo, "\n\t      Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",
+       ND_PRINT("\n\t      Flags: [%sReconnect, %sSave State, %sAll-Label Protection, %s Checkpoint, %sRe-Learn State]",

               ft_flags&0x8000 ? "" : "No ",
               ft_flags&0x8 ? "" : "Don't ",
               ft_flags&0x4 ? "" : "No ",
               ft_flags&0x2 ? "Sequence Numbered Label" : "All Labels",
               ft_flags&0x8000 ? "" : "No ",
               ft_flags&0x8 ? "" : "Don't ",
               ft_flags&0x4 ? "" : "No ",
               ft_flags&0x2 ? "Sequence Numbered Label" : "All Labels",

-              ft_flags&0x1 ? "" : "Don't "));
+              ft_flags&0x1 ? "" : "Don't ");

        tptr+=4;
        ui = EXTRACT_BE_U_4(tptr);
        if (ui)
        tptr+=4;
        ui = EXTRACT_BE_U_4(tptr);
        if (ui)

-           ND_PRINT((ndo, ", Reconnect Timeout: %ums", ui));
+           ND_PRINT(", Reconnect Timeout: %ums", ui);

        tptr+=4;
        ui = EXTRACT_BE_U_4(tptr);
        if (ui)
        tptr+=4;
        ui = EXTRACT_BE_U_4(tptr);
        if (ui)

-           ND_PRINT((ndo, ", Recovery Time: %ums", ui));
+           ND_PRINT(", Recovery Time: %ums", ui);

        break;
 
     case LDP_TLV_MTU:
        TLV_TCHECK(2);
        break;
 
     case LDP_TLV_MTU:
        TLV_TCHECK(2);

-       ND_PRINT((ndo, "\n\t      MTU: %u", EXTRACT_BE_U_2(tptr)));
+       ND_PRINT("\n\t      MTU: %u", EXTRACT_BE_U_2(tptr));

        break;
 
 
        break;
 
 


@@ -534,11 +535,11 @@ ldp_tlv_print(netdissect_options *ndo,
     return(tlv_len+4); /* Type & Length fields not included */
 
 trunc:
     return(tlv_len+4); /* Type & Length fields not included */
 
 trunc:

-    ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
+    nd_print_trunc(ndo);

     return 0;
 
 badtlv:
     return 0;
 
 badtlv:

-    ND_PRINT((ndo, "\n\t\t TLV contents go past end of TLV"));
+    ND_PRINT("\n\t\t TLV contents go past end of TLV");

     return(tlv_len+4); /* Type & Length fields not included */
 }
 
     return(tlv_len+4); /* Type & Length fields not included */
 }
 


@@ -547,6 +548,8 @@ ldp_print(netdissect_options *ndo,
           const u_char *pptr, u_int len)
 {
     int processed;
           const u_char *pptr, u_int len)
 {
     int processed;

+
+    ndo->ndo_protocol = "ldp";

     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
         processed = ldp_pdu_print(ndo, pptr);
         if (processed == 0)
     while (len > (sizeof(struct ldp_common_header) + sizeof(struct ldp_msg_header))) {
         processed = ldp_pdu_print(ndo, pptr);
         if (processed == 0)


@@ -574,28 +577,28 @@ ldp_pdu_print(netdissect_options *ndo,
      * Sanity checking of the header.
      */
     if (EXTRACT_BE_U_2(ldp_com_header->version) != LDP_VERSION) {
      * Sanity checking of the header.
      */
     if (EXTRACT_BE_U_2(ldp_com_header->version) != LDP_VERSION) {

-       ND_PRINT((ndo, "%sLDP version %u packet not supported",
+       ND_PRINT("%sLDP version %u packet not supported",

                (ndo->ndo_vflag < 1) ? "" : "\n\t",
                (ndo->ndo_vflag < 1) ? "" : "\n\t",

-               EXTRACT_BE_U_2(ldp_com_header->version)));
+               EXTRACT_BE_U_2(ldp_com_header->version));

        return 0;
     }
 
     pdu_len = EXTRACT_BE_U_2(ldp_com_header->pdu_length);
     if (pdu_len < sizeof(struct ldp_common_header)-4) {
         /* length too short */
        return 0;
     }
 
     pdu_len = EXTRACT_BE_U_2(ldp_com_header->pdu_length);
     if (pdu_len < sizeof(struct ldp_common_header)-4) {
         /* length too short */

-        ND_PRINT((ndo, "%sLDP, pdu-length: %u (too short, < %u)",
+        ND_PRINT("%sLDP, pdu-length: %u (too short, < %u)",

                (ndo->ndo_vflag < 1) ? "" : "\n\t",
                pdu_len,
                (ndo->ndo_vflag < 1) ? "" : "\n\t",
                pdu_len,

-               (u_int)(sizeof(struct ldp_common_header)-4)));
+               (u_int)(sizeof(struct ldp_common_header)-4));

         return 0;
     }
 
     /* print the LSR-ID, label-space & length */
         return 0;
     }
 
     /* print the LSR-ID, label-space & length */

-    ND_PRINT((ndo, "%sLDP, Label-Space-ID: %s:%u, pdu-length: %u",
+    ND_PRINT("%sLDP, Label-Space-ID: %s:%u, pdu-length: %u",

            (ndo->ndo_vflag < 1) ? "" : "\n\t",
            (ndo->ndo_vflag < 1) ? "" : "\n\t",

-           ipaddr_string(ndo, &ldp_com_header->lsr_id),
+           ipaddr_string(ndo, ldp_com_header->lsr_id),

            EXTRACT_BE_U_2(ldp_com_header->label_space),
            EXTRACT_BE_U_2(ldp_com_header->label_space),

-           pdu_len));
+           pdu_len);

 
     /* bail out if non-verbose */
     if (ndo->ndo_vflag < 1)
 
     /* bail out if non-verbose */
     if (ndo->ndo_vflag < 1)


@@ -616,25 +619,25 @@ ldp_pdu_print(netdissect_options *ndo,
         if (msg_len < sizeof(struct ldp_msg_header)-4) {
             /* length too short */
             /* FIXME vendor private / experimental check */
         if (msg_len < sizeof(struct ldp_msg_header)-4) {
             /* length too short */
             /* FIXME vendor private / experimental check */

-            ND_PRINT((ndo, "\n\t  %s Message (0x%04x), length: %u (too short, < %u)",
+            ND_PRINT("\n\t  %s Message (0x%04x), length: %u (too short, < %u)",

                    tok2str(ldp_msg_values,
                            "Unknown",
                            msg_type),
                    msg_type,
                    msg_len,
                    tok2str(ldp_msg_values,
                            "Unknown",
                            msg_type),
                    msg_type,
                    msg_len,

-                   (u_int)(sizeof(struct ldp_msg_header)-4)));
+                   (u_int)(sizeof(struct ldp_msg_header)-4));

             return 0;
         }
 
         /* FIXME vendor private / experimental check */
             return 0;
         }
 
         /* FIXME vendor private / experimental check */

-        ND_PRINT((ndo, "\n\t  %s Message (0x%04x), length: %u, Message ID: 0x%08x, Flags: [%s if unknown]",
+        ND_PRINT("\n\t  %s Message (0x%04x), length: %u, Message ID: 0x%08x, Flags: [%s if unknown]",

                tok2str(ldp_msg_values,
                        "Unknown",
                        msg_type),
                msg_type,
                msg_len,
                EXTRACT_BE_U_4(ldp_msg_header->id),
                tok2str(ldp_msg_values,
                        "Unknown",
                        msg_type),
                msg_type,
                msg_len,
                EXTRACT_BE_U_4(ldp_msg_header->id),

-               LDP_MASK_U_BIT(EXTRACT_BE_U_2(ldp_msg_header->type)) ? "continue processing" : "ignore"));
+               LDP_MASK_U_BIT(EXTRACT_BE_U_2(ldp_msg_header->type)) ? "continue processing" : "ignore");

 
         msg_tptr=tptr+sizeof(struct ldp_msg_header);
         msg_tlen=msg_len-(sizeof(struct ldp_msg_header)-4); /* Type & Length fields not included */
 
         msg_tptr=tptr+sizeof(struct ldp_msg_header);
         msg_tlen=msg_len-(sizeof(struct ldp_msg_header)-4); /* Type & Length fields not included */


@@ -686,13 +689,6 @@ ldp_pdu_print(netdissect_options *ndo,
     }
     return pdu_len+4;
 trunc:
     }
     return pdu_len+4;
 trunc:

-    ND_PRINT((ndo, "\n\t\t packet exceeded snapshot"));
+    nd_print_trunc(ndo);

     return 0;
 }
     return 0;
 }

-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */