X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/82a2a77889313964302ce7b6be3b8e8cb1ba7e1f..c39d40a767a1ae36171e5bcbf6f157ff3e80fb6c:/print-krb.c

diff --git a/print-krb.c b/print-krb.c
index 4a5b1afa..b4c0fadf 100644
--- a/print-krb.c
+++ b/print-krb.c
@@ -24,10 +24,10 @@
 /* \summary: Kerberos printer */
 
 #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"
@@ -40,7 +40,7 @@
  * Kerberos Authentication and Authorization System
  * by S. P. Miller, B. C. Neuman, J. I. Schiller, and J. H. Saltzer
  *
- * http://web.mit.edu/Saltzer/www/publications/athenaplan/e.2.1.pdf
+ * https://web.mit.edu/Saltzer/www/publications/athenaplan/e.2.1.pdf
  *
  * 7. Appendix I Design Specifications
  *
@@ -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((ndo, "M-"));
-		}
-		if (!ND_ISPRINT(c)) {
-			c ^= 0x40;	/* DEL to ?, others to alpha */
-			ND_PRINT((ndo, "^"));
-		}
-		ND_PRINT((ndo, "%c", c));
+		fn_print_char(ndo, c);
 	}
 	if (flag)
 		return NULL;
@@ -149,14 +140,14 @@ krb4_print_hdr(netdissect_options *ndo,
 #define PRINT		if ((cp = c_print(ndo, cp, ndo->ndo_snapend)) == NULL) goto trunc
 
 	PRINT;
-	ND_PRINT((ndo, "."));
+	ND_PRINT(".");
 	PRINT;
-	ND_PRINT((ndo, "@"));
+	ND_PRINT("@");
 	PRINT;
 	return (cp);
 
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	nd_print_trunc(ndo);
 	return (NULL);
 
 #undef PRINT
@@ -172,20 +163,15 @@ 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((ndo, "%s", tstr));
-		return;
-	}
-
-	type = EXTRACT_U_1(kp->type) & (0xFF << 1);
+	type = GET_U_1(kp->type) & (0xFF << 1);
 
-	ND_PRINT((ndo, " %s %s: ",
-	    IS_LENDIAN(kp) ? "le" : "be", tok2str(type2str, NULL, type)));
+	ND_PRINT(" %s %s: ",
+	    IS_LENDIAN(kp) ? "le" : "be", tok2str(type2str, NULL, type));
 
 	switch (type) {
 
@@ -193,54 +179,48 @@ krb4_print(netdissect_options *ndo,
 		if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
 			return;
 		cp += 4;	/* ctime */
-		ND_TCHECK_1(cp);
-		ND_PRINT((ndo, " %umin ", EXTRACT_U_1(cp) * 5));
+		ND_PRINT(" %umin ", GET_U_1(cp) * 5);
 		cp++;
 		PRINT;
-		ND_PRINT((ndo, "."));
+		ND_PRINT(".");
 		PRINT;
 		break;
 
 	case AUTH_MSG_APPL_REQUEST:
 		cp += 2;
-		ND_TCHECK_1(cp);
-		ND_PRINT((ndo, "v%u ", EXTRACT_U_1(cp)));
+		ND_PRINT("v%u ", GET_U_1(cp));
 		cp++;
 		PRINT;
-		ND_TCHECK_1(cp);
-		ND_PRINT((ndo, " (%u)", EXTRACT_U_1(cp)));
+		ND_PRINT(" (%u)", GET_U_1(cp));
 		cp++;
-		ND_TCHECK_1(cp);
-		ND_PRINT((ndo, " (%u)", EXTRACT_U_1(cp)));
+		ND_PRINT(" (%u)", GET_U_1(cp));
 		break;
 
 	case AUTH_MSG_KDC_REPLY:
 		if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
 			return;
 		cp += 10;	/* timestamp + n + exp + kvno */
-		ND_TCHECK_LEN(cp, sizeof(short));
 		len = KTOHSP(kp, cp);
-		ND_PRINT((ndo, " (%u)", len));
+		ND_PRINT(" (%u)", len);
 		break;
 
 	case AUTH_MSG_ERR_REPLY:
 		if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
 			return;
 		cp += 4; 	  /* timestamp */
-		ND_TCHECK_LEN(cp, sizeof(short));
-		ND_PRINT((ndo, " %s ", tok2str(kerr2str, NULL, KTOHSP(kp, cp))));
+		ND_PRINT(" %s ", tok2str(kerr2str, NULL, KTOHSP(kp, cp)));
 		cp += 4;
 		PRINT;
 		break;
 
 	default:
-		ND_PRINT((ndo, "(unknown)"));
+		ND_PRINT("(unknown)");
 		break;
 	}
 
 	return;
 trunc:
-	ND_PRINT((ndo, "%s", tstr));
+	nd_print_trunc(ndo);
 }
 
 void
@@ -249,31 +229,31 @@ 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((ndo, "%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((ndo, " v%u", EXTRACT_U_1(kp->pvno)));
+		ND_PRINT(" v%u", GET_U_1(kp->pvno));
 		break;
 
 	case 4:
-		ND_PRINT((ndo, " v%u", EXTRACT_U_1(kp->pvno)));
+		ND_PRINT(" v%u", GET_U_1(kp->pvno));
 		krb4_print(ndo, (const u_char *)kp);
 		break;
 
 	case 106:
 	case 107:
-		ND_PRINT((ndo, " v5"));
+		ND_PRINT(" v5");
 		/* Decode ASN.1 here "someday" */
 		break;
 	}
-	return;
 }