CI: Add warning exemptions for Sun C (suncc-5.14) on Solaris 10

[tcpdump] / print-krb.c

diff --git a/print-krb.c b/print-krb.c
index d8c9165ad6ec0599284133fb90f1e6afcb48bc52..69a0c1155e21819f9af17171e7998755068c19f3 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -23,9 +23,7 @@
 
 /* \summary: Kerberos printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
@@ -40,7 +38,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
  *
@@ -118,7 +116,7 @@ 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;
@@ -163,17 +161,12 @@ 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_trunc(ndo);
-               return;
-       }
-
-       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));
@@ -184,8 +177,7 @@ krb4_print(netdissect_options *ndo,
                if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
                        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(".");
@@ -194,22 +186,18 @@ 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:
                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(" (%u)", len);
                break;
@@ -217,8 +205,7 @@ krb4_print(netdissect_options *ndo,
        case AUTH_MSG_ERR_REPLY:
                if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
                        return;
-               cp += 4;          /* timestamp */
-               ND_TCHECK_LEN(cp, sizeof(short));
+               cp += 4;          /* timestamp */
                ND_PRINT(" %s ", tok2str(kerr2str, NULL, KTOHSP(kp, cp)));
                cp += 4;
                PRINT;
@@ -240,24 +227,21 @@ krb_print(netdissect_options *ndo,
 {
        const struct krb *kp;
 
-       ndo->ndo_protocol = "krb";
-       kp = (const struct krb *)dat;
+       ndo->ndo_protocol = "kerberos";
+       nd_print_protocol(ndo);
 
-       if (dat >= ndo->ndo_snapend) {
-               nd_print_trunc(ndo);
-               return;
-       }
+       kp = (const struct krb *)dat;
 
-       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;
 
@@ -267,5 +251,4 @@ krb_print(netdissect_options *ndo,
                /* Decode ASN.1 here "someday" */
                break;
        }
-       return;
 }