Fix spaces

[tcpdump] / print-vjc.c

diff --git a/print-vjc.c b/print-vjc.c
index 0743cfa0d28f46d745642106b14a70c5329fe892..44bdb1fc83f85ab9c16d636279d001a69247ce6f 100644 (file)
--- a/print-vjc.c
+++ b/print-vjc.c
@@ -24,10 +24,10 @@
 /* specification: RFC 1144 */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -88,34 +88,42 @@ vjc_print(netdissect_options *ndo, const u_char *bp, u_short proto _U_)
 {
        int i;
 
+       ndo->ndo_protocol = "vjc";
+       ND_TCHECK_1(bp);
        switch (EXTRACT_U_1(bp) & 0xf0) {
        case TYPE_IP:
                if (ndo->ndo_eflag)
-                       ND_PRINT((ndo, "(vjc type=IP) "));
+                       ND_PRINT("(vjc type=IP) ");
                return PPP_IP;
        case TYPE_UNCOMPRESSED_TCP:
                if (ndo->ndo_eflag)
-                       ND_PRINT((ndo, "(vjc type=raw TCP) "));
+                       ND_PRINT("(vjc type=raw TCP) ");
                return PPP_IP;
        case TYPE_COMPRESSED_TCP:
                if (ndo->ndo_eflag)
-                       ND_PRINT((ndo, "(vjc type=compressed TCP) "));
+                       ND_PRINT("(vjc type=compressed TCP) ");
                for (i = 0; i < 8; i++) {
+                       ND_TCHECK_1(bp + 1);
                        if (EXTRACT_U_1(bp + 1) & (0x80 >> i))
-                               ND_PRINT((ndo, "%c", "?CI?SAWU"[i]));
+                               ND_PRINT("%c", "?CI?SAWU"[i]);
                }
                if (EXTRACT_U_1(bp + 1))
-                       ND_PRINT((ndo, " "));
-               ND_PRINT((ndo, "C=0x%02x ", EXTRACT_U_1(bp + 2)));
-               ND_PRINT((ndo, "sum=0x%04x ", *(const u_short *)(bp + 3)));
+                       ND_PRINT(" ");
+               ND_TCHECK_1(bp + 2);
+               ND_PRINT("C=0x%02x ", EXTRACT_U_1(bp + 2));
+               ND_TCHECK_2(bp + 3);
+               ND_PRINT("sum=0x%04x ", *(const u_short *)(bp + 3));
                return -1;
        case TYPE_ERROR:
                if (ndo->ndo_eflag)
-                       ND_PRINT((ndo, "(vjc type=error) "));
+                       ND_PRINT("(vjc type=error) ");
                return -1;
        default:
                if (ndo->ndo_eflag)
-                       ND_PRINT((ndo, "(vjc type=0x%02x) ", EXTRACT_U_1(bp) & 0xf0));
+                       ND_PRINT("(vjc type=0x%02x) ", EXTRACT_U_1(bp) & 0xf0);
                return -1;
        }
+
+trunc:
+       return -1;
 }