Add more nd_print_trunc() calls

diff --git a/print-802_15_4.c b/print-802_15_4.c
index bf96087131e265d69ceaadd514b98aea8c624906..f9f05d2f3f5d20055042f2b5bc142b2d5dca34e4 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -72,7 +72,7 @@ ieee802_15_4_print(netdissect_options *ndo,
 
        ndo->ndo_protocol = "802.15.4";
        if (caplen < 3) {
-               ND_PRINT("[|802.15.4]");
+               nd_print_trunc(ndo);
                return caplen;
        }
        hdrlen = 3;
@@ -98,7 +98,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                         * the source and destination addresses be present,
                         * but the destination address is missing.
                         */
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -110,7 +110,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                return hdrlen;
        case FC_ADDRESSING_MODE_SHORT:
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                panid = EXTRACT_LE_U_2(p);
@@ -118,7 +118,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                caplen -= 2;
                hdrlen += 2;
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -129,7 +129,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                break;
        case FC_ADDRESSING_MODE_LONG:
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                panid = EXTRACT_LE_U_2(p);
@@ -137,7 +137,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                caplen -= 2;
                hdrlen += 2;
                if (caplen < 8) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -170,7 +170,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                         * PAN ID, fetched above.)
                         */
                        if (caplen < 2) {
-                               ND_PRINT("[|802.15.4]");
+                               nd_print_trunc(ndo);
                                return hdrlen;
                        }
                        panid = EXTRACT_LE_U_2(p);
@@ -179,7 +179,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                        hdrlen += 2;
                }
                if (caplen < 2) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)
@@ -196,7 +196,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                         * PAN ID, fetched above.)
                         */
                        if (caplen < 2) {
-                               ND_PRINT("[|802.15.4]");
+                               nd_print_trunc(ndo);
                                return hdrlen;
                        }
                        panid = EXTRACT_LE_U_2(p);
@@ -205,7 +205,7 @@ ieee802_15_4_print(netdissect_options *ndo,
                        hdrlen += 2;
                }
                if (caplen < 8) {
-                       ND_PRINT("[|802.15.4]");
+                       nd_print_trunc(ndo);
                        return hdrlen;
                }
                if (ndo->ndo_vflag)

diff --git a/tests/802_15_4-data.out b/tests/802_15_4-data.out
index 0e646751c74fde5aa6cb1ef0bf4540b3c63a4b99..bc8ae2db8e8ec045829e268ba2df19912ab86d12 100644 (file)
--- a/tests/802_15_4-data.out
+++ b/tests/802_15_4-data.out
@@ -1 +1 @@
-IEEE 802.15.4 Data packet seq 01 ab4d:10:05:00:81:00:01:00:01 < [|802.15.4]
+IEEE 802.15.4 Data packet seq 01 ab4d:10:05:00:81:00:01:00:01 <  [|802.15.4]

diff --git a/tests/802_15_4-oobr-1.out b/tests/802_15_4-oobr-1.out
index 76fb153c23f60faaa4694b40cc872aa97a4daad5..feb9e9a7339fe3004790ce66eb3416666e9ce8fa 100644 (file)
--- a/tests/802_15_4-oobr-1.out
+++ b/tests/802_15_4-oobr-1.out
@@ -1 +1 @@
-IEEE 802.15.4 Beacon packet seq cd [|802.15.4]
+IEEE 802.15.4 Beacon packet seq cd  [|802.15.4]

diff --git a/tests/802_15_4-oobr-2.out b/tests/802_15_4-oobr-2.out
index bc3b866c385190182681ea40075a5e0da8b54927..77965e71932780c3d7e89d40fde822bdab366a98 100644 (file)
--- a/tests/802_15_4-oobr-2.out
+++ b/tests/802_15_4-oobr-2.out
@@ -1 +1 @@
-IEEE 802.15.4 Data packet seq 01 [|802.15.4]
+IEEE 802.15.4 Data packet seq 01  [|802.15.4]

diff --git a/tests/802_15_4_beacon.out b/tests/802_15_4_beacon.out
index 125f46d5c5fd45590c337558ff123dfc0e7c27f8..e9f708a1435f5adfc0ff32dfb7048a559f91b899 100644 (file)
--- a/tests/802_15_4_beacon.out
+++ b/tests/802_15_4_beacon.out
@@ -1 +1 @@
-IEEE 802.15.4 Beacon packet seq cd ffab:cdff < [|802.15.4]
+IEEE 802.15.4 Beacon packet seq cd ffab:cdff <  [|802.15.4]