IPX: Add a length check

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index eb661c28e9374d601204f11b4dc75b4e85bab221..3bc135d7421992bb140ec2542ec7a92870bd7a45 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -123,7 +123,6 @@
 
 /* end of the original atmuni31.h */
 
-static const char tstr[] = "[|atm]";
 
 #define OAM_CRC10_MASK 0x3ff
 #define OAM_PAYLOAD_LEN 48
@@ -253,8 +252,9 @@ atm_if_print(netdissect_options *ndo,
        uint32_t llchdr;
        u_int hdrlen = 0;
 
-       if (caplen < 1 || length < 1) {
-               ND_PRINT("%s", tstr);
+       ndo->ndo_protocol = "atm_if";
+       if (caplen < 1) {
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -270,8 +270,8 @@ atm_if_print(netdissect_options *ndo,
         * Must have at least a DSAP, an SSAP, and the first byte of the
         * control field.
         */
-       if (caplen < 3 || length < 3) {
-               ND_PRINT("%s", tstr);
+       if (caplen < 3) {
+               nd_print_trunc(ndo);
                return (caplen);
        }
 
@@ -302,8 +302,8 @@ atm_if_print(netdissect_options *ndo,
                 * packets?  If so, could it be changed to use a
                 * new DLT_IEEE802_6 value if we added it?
                 */
-               if (caplen < 20 || length < 20) {
-                       ND_PRINT("%s", tstr);
+               if (caplen < 20) {
+                       nd_print_trunc(ndo);
                        return (caplen);
                }
                if (ndo->ndo_eflag)
@@ -375,7 +375,7 @@ sig_print(netdissect_options *ndo,
        return;
 
 trunc:
-       ND_PRINT(" %s", tstr);
+       nd_print_trunc(ndo);
 }
 
 /*
@@ -386,6 +386,7 @@ atm_print(netdissect_options *ndo,
           u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
           u_int caplen)
 {
+       ndo->ndo_protocol = "atm";
        if (ndo->ndo_eflag)
                ND_PRINT("VPI:%u VCI:%u ", vpi, vci);
 
@@ -447,8 +448,8 @@ struct oam_fm_ais_rdi_t {
 };
 
 void
-oam_print (netdissect_options *ndo,
-           const u_char *p, u_int length, u_int hec)
+oam_print(netdissect_options *ndo,
+          const u_char *p, u_int length, u_int hec)
 {
     uint32_t cell_header;
     uint16_t vpi, vci, cksum, cksum_shouldbe, idx;
@@ -459,7 +460,7 @@ oam_print (netdissect_options *ndo,
         const struct oam_fm_ais_rdi_t *oam_fm_ais_rdi;
     } oam_ptr;
 
-
+    ndo->ndo_protocol = "oam";
     ND_TCHECK_1(p + ATM_HDR_LEN_NOHEC + hec);
     cell_header = EXTRACT_BE_U_4(p + hec);
     cell_type = (EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) >> 4) & 0x0f;
@@ -550,6 +551,6 @@ oam_print (netdissect_options *ndo,
     return;
 
 trunc:
-    ND_PRINT("[|oam]");
+    nd_print_trunc(ndo);
     return;
 }