Add printing support for vsockmon devices.

[tcpdump] / print-krb.c

diff --git a/print-krb.c b/print-krb.c
index 48c448bdd635e9546d3f7bd1db82bf199e7e40d6..5d5253206aafb01d414cc0b1cb93d80c36d6d824 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -49,7 +49,6 @@
  * RFC 1510, RFC 2630, etc.
  */
 
-static const char tstr[] = " [|kerberos]";
 
 static const u_char *c_print(netdissect_options *, const u_char *, const u_char *);
 static const u_char *krb4_print_hdr(netdissect_options *, const u_char *);
@@ -119,21 +118,13 @@ c_print(netdissect_options *ndo,
 
        flag = 1;
        while (s < ep) {
-               c = EXTRACT_U_1(s);
+               c = GET_U_1(s);
                s++;
                if (c == '\0') {
                        flag = 0;
                        break;
                }
-               if (!ND_ISASCII(c)) {
-                       c = ND_TOASCII(c);
-                       ND_PRINT("M-");
-               }
-               if (!ND_ISPRINT(c)) {
-                       c ^= 0x40;      /* DEL to ?, others to alpha */
-                       ND_PRINT("^");
-               }
-               ND_PRINT("%c", c);
+               fn_print_char(ndo, c);
        }
        if (flag)
                return NULL;
@@ -156,7 +147,7 @@ krb4_print_hdr(netdissect_options *ndo,
        return (cp);
 
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
        return (NULL);
 
 #undef PRINT
@@ -172,17 +163,14 @@ krb4_print(netdissect_options *ndo,
 
 #define PRINT          if ((cp = c_print(ndo, cp, ndo->ndo_snapend)) == NULL) goto trunc
 /*  True if struct krb is little endian */
-#define IS_LENDIAN(kp) ((EXTRACT_U_1((kp)->type) & 0x01) != 0)
-#define KTOHSP(kp, cp) (IS_LENDIAN(kp) ? EXTRACT_LE_U_2(cp) : EXTRACT_BE_U_2(cp))
+#define IS_LENDIAN(kp) ((GET_U_1((kp)->type) & 0x01) != 0)
+#define KTOHSP(kp, cp) (IS_LENDIAN(kp) ? GET_LE_U_2(cp) : GET_BE_U_2(cp))
 
        kp = (const struct krb *)cp;
 
-       if (!ND_TTEST_1(kp->type)) {
-               ND_PRINT("%s", tstr);
-               return;
-       }
+       ND_TCHECK_1(kp->type);
 
-       type = EXTRACT_U_1(kp->type) & (0xFF << 1);
+       type = GET_U_1(kp->type) & (0xFF << 1);
 
        ND_PRINT(" %s %s: ",
            IS_LENDIAN(kp) ? "le" : "be", tok2str(type2str, NULL, type));
@@ -194,7 +182,7 @@ krb4_print(netdissect_options *ndo,
                        return;
                cp += 4;        /* ctime */
                ND_TCHECK_1(cp);
-               ND_PRINT(" %umin ", EXTRACT_U_1(cp) * 5);
+               ND_PRINT(" %umin ", GET_U_1(cp) * 5);
                cp++;
                PRINT;
                ND_PRINT(".");
@@ -204,14 +192,14 @@ krb4_print(netdissect_options *ndo,
        case AUTH_MSG_APPL_REQUEST:
                cp += 2;
                ND_TCHECK_1(cp);
-               ND_PRINT("v%u ", EXTRACT_U_1(cp));
+               ND_PRINT("v%u ", GET_U_1(cp));
                cp++;
                PRINT;
                ND_TCHECK_1(cp);
-               ND_PRINT(" (%u)", EXTRACT_U_1(cp));
+               ND_PRINT(" (%u)", GET_U_1(cp));
                cp++;
                ND_TCHECK_1(cp);
-               ND_PRINT(" (%u)", EXTRACT_U_1(cp));
+               ND_PRINT(" (%u)", GET_U_1(cp));
                break;
 
        case AUTH_MSG_KDC_REPLY:
@@ -240,7 +228,7 @@ krb4_print(netdissect_options *ndo,
 
        return;
 trunc:
-       ND_PRINT("%s", tstr);
+       nd_print_trunc(ndo);
 }
 
 void
@@ -249,23 +237,24 @@ krb_print(netdissect_options *ndo,
 {
        const struct krb *kp;
 
+       ndo->ndo_protocol = "krb";
        kp = (const struct krb *)dat;
 
        if (dat >= ndo->ndo_snapend) {
-               ND_PRINT("%s", tstr);
+               nd_print_trunc(ndo);
                return;
        }
 
-       switch (EXTRACT_U_1(kp->pvno)) {
+       switch (GET_U_1(kp->pvno)) {
 
        case 1:
        case 2:
        case 3:
-               ND_PRINT(" v%u", EXTRACT_U_1(kp->pvno));
+               ND_PRINT(" v%u", GET_U_1(kp->pvno));
                break;
 
        case 4:
-               ND_PRINT(" v%u", EXTRACT_U_1(kp->pvno));
+               ND_PRINT(" v%u", GET_U_1(kp->pvno));
                krb4_print(ndo, (const u_char *)kp);
                break;