Use more the EXTRACT_U_1() macro (31/n)

[tcpdump] / print-krb.c

diff --git a/print-krb.c b/print-krb.c
index 3685ab6c3ca58820e14d4c7e28441a6646d0c692..6fa25acaffc02b321aff7851801449fab60055ff 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -119,7 +119,8 @@ c_print(netdissect_options *ndo,
 
        flag = 1;
        while (s < ep) {
 
        flag = 1;
        while (s < ep) {

-               c = *s++;
+               c = EXTRACT_U_1(s);
+               s++;

                if (c == '\0') {
                        flag = 0;
                        break;
                if (c == '\0') {
                        flag = 0;
                        break;


@@ -172,7 +173,7 @@ 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) (((kp)->type & 0x01) != 0)
 #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) (((kp)->type & 0x01) != 0)

-#define KTOHSP(kp, cp) (IS_LENDIAN(kp) ? EXTRACT_LE_16BITS(cp) : EXTRACT_BE_16BITS(cp))
+#define KTOHSP(kp, cp) (IS_LENDIAN(kp) ? EXTRACT_LE_U_2(cp) : EXTRACT_BE_U_2(cp))

 
        kp = (const struct krb *)cp;
 
 
        kp = (const struct krb *)cp;
 


@@ -193,7 +194,8 @@ krb4_print(netdissect_options *ndo,
                        return;
                cp += 4;        /* ctime */
                ND_TCHECK(*cp);
                        return;
                cp += 4;        /* ctime */
                ND_TCHECK(*cp);

-               ND_PRINT((ndo, " %dmin ", *cp++ * 5));
+               ND_PRINT((ndo, " %dmin ", EXTRACT_U_1(cp) * 5));
+               cp++;

                PRINT;
                ND_PRINT((ndo, "."));
                PRINT;
                PRINT;
                ND_PRINT((ndo, "."));
                PRINT;


@@ -202,12 +204,14 @@ krb4_print(netdissect_options *ndo,
        case AUTH_MSG_APPL_REQUEST:
                cp += 2;
                ND_TCHECK(*cp);
        case AUTH_MSG_APPL_REQUEST:
                cp += 2;
                ND_TCHECK(*cp);

-               ND_PRINT((ndo, "v%d ", *cp++));
+               ND_PRINT((ndo, "v%d ", EXTRACT_U_1(cp)));
+               cp++;

                PRINT;
                ND_TCHECK(*cp);
                PRINT;
                ND_TCHECK(*cp);

-               ND_PRINT((ndo, " (%d)", *cp++));
+               ND_PRINT((ndo, " (%d)", EXTRACT_U_1(cp)));
+               cp++;

                ND_TCHECK(*cp);
                ND_TCHECK(*cp);

-               ND_PRINT((ndo, " (%d)", *cp));
+               ND_PRINT((ndo, " (%d)", EXTRACT_U_1(cp)));

                break;
 
        case AUTH_MSG_KDC_REPLY:
                break;
 
        case AUTH_MSG_KDC_REPLY: