NFS: Use the EXTRACT_U_1() macro in the file handles parser

diff --git a/parsenfsfh.c b/parsenfsfh.c
index de6da8e6e0b000a1e189aa68a23d5e19fbd88f64..0a54a3ff4d2f1217644e71b135ec56ec800f7a2f 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -50,6 +50,7 @@
 #include <string.h>
 
 #include "netdissect.h"
+#include "extract.h"
 #include "nfsfh.h"
 
 /*
@@ -144,10 +145,10 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
                /*
                 * This is basically a big decision tree
                 */
-               else if ((fhp[0] == 0) && (fhp[1] == 0)) {
+               else if ((EXTRACT_U_1(fhp) == 0) && (EXTRACT_U_1(fhp + 1) == 0)) {
                    /* bytes[0,1] == (0,0); rules out Ultrix, IRIX5, SUNOS5 */
                    /* probably rules out HP-UX, AIX unless they allow major=0 */
-                   if ((fhp[2] == 0) && (fhp[3] == 0)) {
+                   if ((EXTRACT_U_1(fhp + 2) == 0) && (EXTRACT_U_1(fhp + 3) == 0)) {
                        /* bytes[2,3] == (0,0); must be Auspex */
                        /* XXX or could be Ultrix+MASSBUS "hp" disk? */
                        fhtype = FHT_AUSPEX;
@@ -157,16 +158,16 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
                         * bytes[2,3] != (0,0); rules out Auspex, could be
                         * DECOSF, SUNOS4, or IRIX4
                         */
-                       if ((fhp[4] != 0) && (fhp[5] == 0) &&
-                               (fhp[8] == 12) && (fhp[9] == 0)) {
+                       if ((EXTRACT_U_1(fhp + 4) != 0) && (EXTRACT_U_1(fhp + 5) == 0) &&
+                               (EXTRACT_U_1(fhp + 8) == 12) && (EXTRACT_U_1(fhp + 9) == 0)) {
                            /* seems to be DECOSF, with minor == 0 */
                            fhtype = FHT_DECOSF;
                        }
                        else {
                            /* could be SUNOS4 or IRIX4 */
                            /* XXX the test of fhp[5] == 8 could be wrong */
-                           if ((fhp[4] == 0) && (fhp[5] == 8) && (fhp[6] == 0) &&
-                               (fhp[7] == 0)) {
+                           if ((EXTRACT_U_1(fhp + 4) == 0) && (EXTRACT_U_1(fhp + 5) == 8) && (EXTRACT_U_1(fhp + 6) == 0) &&
+                               (EXTRACT_U_1(fhp + 7) == 0)) {
                                /* looks like a length, not a file system typecode */
                                fhtype = FHT_IRIX4;
                            }
@@ -183,24 +184,24 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
                     * could be IRIX5, DECOSF, UCX, Ultrix, SUNOS5
                     * could be AIX, HP-UX
                     */
-                   if ((fhp[2] == 0) && (fhp[3] == 0)) {
+                   if ((EXTRACT_U_1(fhp + 2) == 0) && (EXTRACT_U_1(fhp + 3) == 0)) {
                        /*
                         * bytes[2,3] == (0,0); rules out OSF, probably not UCX
                         * (unless the exported device name is just one letter!),
                         * could be Ultrix, IRIX5, AIX, or SUNOS5
                         * might be HP-UX (depends on their values for minor devs)
                         */
-                       if ((fhp[6] == 0) && (fhp[7] == 0)) {
+                       if ((EXTRACT_U_1(fhp + 6) == 0) && (EXTRACT_U_1(fhp + 7) == 0)) {
                            fhtype = FHT_BSD44;
                        }
                        /*XXX we probably only need to test of these two bytes */
-                       else if ((len >= 24/4) && (fhp[21] == 0) && (fhp[23] == 0)) {
+                       else if ((len >= 24/4) && (EXTRACT_U_1(fhp + 21) == 0) && (EXTRACT_U_1(fhp + 23) == 0)) {
                            fhtype = FHT_ULTRIX;
                        }
                        else {
                            /* Could be SUNOS5/IRIX5, maybe AIX */
                            /* XXX no obvious difference between SUNOS5 and IRIX5 */
-                           if (fhp[9] == 10)
+                           if (EXTRACT_U_1(fhp + 9) == 10)
                                fhtype = FHT_SUNOS5;
                            /* XXX what about AIX? */
                        }
@@ -210,17 +211,17 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
                         * bytes[2,3] != (0,0); rules out Ultrix, could be
                         * DECOSF, SUNOS5, IRIX5, AIX, HP-UX, or UCX
                         */
-                       if ((fhp[8] == 12) && (fhp[9] == 0)) {
+                       if ((EXTRACT_U_1(fhp + 8) == 12) && (EXTRACT_U_1(fhp + 9) == 0)) {
                            fhtype = FHT_DECOSF;
                        }
-                       else if ((fhp[8] == 0) && (fhp[9] == 10)) {
+                       else if ((EXTRACT_U_1(fhp + 8) == 0) && (EXTRACT_U_1(fhp + 9) == 10)) {
                            /* could be SUNOS5/IRIX5, AIX, HP-UX */
-                           if ((fhp[7] == 0) && (fhp[6] == 0) &&
-                               (fhp[5] == 0) && (fhp[4] == 0)) {
+                           if ((EXTRACT_U_1(fhp + 7) == 0) && (EXTRACT_U_1(fhp + 6) == 0) &&
+                               (EXTRACT_U_1(fhp + 5) == 0) && (EXTRACT_U_1(fhp + 4) == 0)) {
                                /* XXX is this always true of HP-UX? */
                                fhtype = FHT_HPUX9;
                            }
-                           else if (fhp[7] == 2) {
+                           else if (EXTRACT_U_1(fhp + 7) == 2) {
                                /* This would be MNT_NFS on AIX, which is impossible */
                                fhtype = FHT_SUNOS5;    /* or maybe IRIX5 */
                            }
@@ -250,57 +251,71 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
 
        switch (fhtype) {
        case FHT_AUSPEX:
-           fsidp->Fsid_dev.Minor = fhp[7];
-           fsidp->Fsid_dev.Major = fhp[6];
+           fsidp->Fsid_dev.Minor = EXTRACT_U_1(fhp + 7);
+           fsidp->Fsid_dev.Major = EXTRACT_U_1(fhp + 6);
            fsidp->fsid_code = 0;
 
-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 12), EXTRACT_U_1(fhp + 13),
+                               EXTRACT_U_1(fhp + 14), EXTRACT_U_1(fhp + 15));
 
            if (osnamep)
                *osnamep = "Auspex";
            break;
 
        case FHT_BSD44:
-           fsidp->Fsid_dev.Minor = fhp[0];
-           fsidp->Fsid_dev.Major = fhp[1];
+           fsidp->Fsid_dev.Minor = EXTRACT_U_1(fhp);
+           fsidp->Fsid_dev.Major = EXTRACT_U_1(fhp + 1);
            fsidp->fsid_code = 0;
 
-           *inop = make_uint32(fhp[15], fhp[14], fhp[13], fhp[12]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 15), EXTRACT_U_1(fhp + 14),
+                               EXTRACT_U_1(fhp + 13), EXTRACT_U_1(fhp + 12));
 
            if (osnamep)
                *osnamep = "BSD 4.4";
            break;
 
        case FHT_DECOSF:
-           fsidp->fsid_code = make_uint32(fhp[7], fhp[6], fhp[5], fhp[4]);
+           fsidp->fsid_code = make_uint32(EXTRACT_U_1(fhp + 7),
+                                          EXTRACT_U_1(fhp + 6),
+                                          EXTRACT_U_1(fhp + 5),
+                                          EXTRACT_U_1(fhp + 4));
                        /* XXX could ignore 3 high-order bytes */
 
-           temp = make_uint32(fhp[3], fhp[2], fhp[1], fhp[0]);
+           temp = make_uint32(EXTRACT_U_1(fhp + 3), EXTRACT_U_1(fhp + 2),
+                              EXTRACT_U_1(fhp + 1), EXTRACT_U_1(fhp));
            fsidp->Fsid_dev.Minor = temp & 0xFFFFF;
            fsidp->Fsid_dev.Major = (temp>>20) & 0xFFF;
 
-           *inop = make_uint32(fhp[15], fhp[14], fhp[13], fhp[12]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 15), EXTRACT_U_1(fhp + 14),
+                               EXTRACT_U_1(fhp + 13), EXTRACT_U_1(fhp + 12));
            if (osnamep)
                *osnamep = "OSF";
            break;
 
        case FHT_IRIX4:
-           fsidp->Fsid_dev.Minor = fhp[3];
-           fsidp->Fsid_dev.Major = fhp[2];
+           fsidp->Fsid_dev.Minor = EXTRACT_U_1(fhp + 3);
+           fsidp->Fsid_dev.Major = EXTRACT_U_1(fhp + 2);
            fsidp->fsid_code = 0;
 
-           *inop = make_uint32(fhp[8], fhp[9], fhp[10], fhp[11]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 8), EXTRACT_U_1(fhp + 9),
+                               EXTRACT_U_1(fhp + 10), EXTRACT_U_1(fhp + 11));
 
            if (osnamep)
                *osnamep = "IRIX4";
            break;
 
        case FHT_IRIX5:
-           fsidp->Fsid_dev.Minor = make_uint16(fhp[2], fhp[3]);
-           fsidp->Fsid_dev.Major = make_uint16(fhp[0], fhp[1]);
-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
-
-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           fsidp->Fsid_dev.Minor = make_uint16(EXTRACT_U_1(fhp + 2),
+                                               EXTRACT_U_1(fhp + 3));
+           fsidp->Fsid_dev.Major = make_uint16(EXTRACT_U_1(fhp),
+                                               EXTRACT_U_1(fhp + 1));
+           fsidp->fsid_code = make_uint32(EXTRACT_U_1(fhp + 4),
+                                          EXTRACT_U_1(fhp + 5),
+                                          EXTRACT_U_1(fhp + 6),
+                                          EXTRACT_U_1(fhp + 7));
+
+           *inop = make_uint32(EXTRACT_U_1(fhp + 12), EXTRACT_U_1(fhp + 13),
+                               EXTRACT_U_1(fhp + 14), EXTRACT_U_1(fhp + 15));
 
            if (osnamep)
                *osnamep = "IRIX5";
@@ -318,24 +333,33 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
 #endif
 
        case FHT_SUNOS4:
-           fsidp->Fsid_dev.Minor = fhp[3];
-           fsidp->Fsid_dev.Major = fhp[2];
-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
+           fsidp->Fsid_dev.Minor = EXTRACT_U_1(fhp + 3);
+           fsidp->Fsid_dev.Major = EXTRACT_U_1(fhp + 2);
+           fsidp->fsid_code = make_uint32(EXTRACT_U_1(fhp + 4),
+                                          EXTRACT_U_1(fhp + 5),
+                                          EXTRACT_U_1(fhp + 6),
+                                          EXTRACT_U_1(fhp + 7));
 
-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 12), EXTRACT_U_1(fhp + 13),
+                               EXTRACT_U_1(fhp + 14), EXTRACT_U_1(fhp + 15));
 
            if (osnamep)
                *osnamep = "SUNOS4";
            break;
 
        case FHT_SUNOS5:
-           temp = make_uint16(fhp[0], fhp[1]);
+           temp = make_uint16(EXTRACT_U_1(fhp), EXTRACT_U_1(fhp + 1));
            fsidp->Fsid_dev.Major = (temp>>2) &  0x3FFF;
-           temp = make_uint24(fhp[1], fhp[2], fhp[3]);
+           temp = make_uint24(EXTRACT_U_1(fhp + 1), EXTRACT_U_1(fhp + 2),
+                              EXTRACT_U_1(fhp + 3));
            fsidp->Fsid_dev.Minor = temp & 0x3FFFF;
-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
+           fsidp->fsid_code = make_uint32(EXTRACT_U_1(fhp + 4),
+                                          EXTRACT_U_1(fhp + 5),
+                                          EXTRACT_U_1(fhp + 6),
+                                          EXTRACT_U_1(fhp + 7));
 
-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 12), EXTRACT_U_1(fhp + 13),
+                               EXTRACT_U_1(fhp + 14), EXTRACT_U_1(fhp + 15));
 
            if (osnamep)
                *osnamep = "SUNOS5";
@@ -343,10 +367,11 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
 
        case FHT_ULTRIX:
            fsidp->fsid_code = 0;
-           fsidp->Fsid_dev.Minor = fhp[0];
-           fsidp->Fsid_dev.Major = fhp[1];
+           fsidp->Fsid_dev.Minor = EXTRACT_U_1(fhp);
+           fsidp->Fsid_dev.Major = EXTRACT_U_1(fhp + 1);
 
-           temp = make_uint32(fhp[7], fhp[6], fhp[5], fhp[4]);
+           temp = make_uint32(EXTRACT_U_1(fhp + 7), EXTRACT_U_1(fhp + 6),
+                              EXTRACT_U_1(fhp + 5), EXTRACT_U_1(fhp + 4));
            *inop = temp;
            if (osnamep)
                *osnamep = "Ultrix";
@@ -371,34 +396,46 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
            }
 
            /* VMS file ID is: (RVN, FidHi, FidLo) */
-           *inop = make_uint32(fhp[26], fhp[27], fhp[23], fhp[22]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 26), EXTRACT_U_1(fhp + 27),
+                               EXTRACT_U_1(fhp + 23), EXTRACT_U_1(fhp + 22));
 
            /* Caller must save (and null-terminate?) this value */
            if (fsnamep)
-               *fsnamep = (const char *)&(fhp[1]);
+               *fsnamep = (const char *)(fhp + 1);
 
            if (osnamep)
                *osnamep = "VMS";
            break;
 
        case FHT_AIX32:
-           fsidp->Fsid_dev.Minor = make_uint16(fhp[2], fhp[3]);
-           fsidp->Fsid_dev.Major = make_uint16(fhp[0], fhp[1]);
-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
-
-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           fsidp->Fsid_dev.Minor = make_uint16(EXTRACT_U_1(fhp + 2),
+                                               EXTRACT_U_1(fhp + 3));
+           fsidp->Fsid_dev.Major = make_uint16(EXTRACT_U_1(fhp),
+                                               EXTRACT_U_1(fhp + 1));
+           fsidp->fsid_code = make_uint32(EXTRACT_U_1(fhp + 4),
+                                          EXTRACT_U_1(fhp + 5),
+                                          EXTRACT_U_1(fhp + 6),
+                                          EXTRACT_U_1(fhp + 7));
+
+           *inop = make_uint32(EXTRACT_U_1(fhp + 12), EXTRACT_U_1(fhp + 13),
+                               EXTRACT_U_1(fhp + 14), EXTRACT_U_1(fhp + 15));
 
            if (osnamep)
                *osnamep = "AIX32";
            break;
 
        case FHT_HPUX9:
-           fsidp->Fsid_dev.Major = fhp[0];
-           temp = make_uint24(fhp[1], fhp[2], fhp[3]);
+           fsidp->Fsid_dev.Major = EXTRACT_U_1(fhp);
+           temp = make_uint24(EXTRACT_U_1(fhp + 1), EXTRACT_U_1(fhp + 2),
+                              EXTRACT_U_1(fhp + 3));
            fsidp->Fsid_dev.Minor = temp;
-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
+           fsidp->fsid_code = make_uint32(EXTRACT_U_1(fhp + 4),
+                                          EXTRACT_U_1(fhp + 5),
+                                          EXTRACT_U_1(fhp + 6),
+                                          EXTRACT_U_1(fhp + 7));
 
-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = make_uint32(EXTRACT_U_1(fhp + 12), EXTRACT_U_1(fhp + 13),
+                               EXTRACT_U_1(fhp + 14), EXTRACT_U_1(fhp + 15));
 
            if (osnamep)
                *osnamep = "HPUX9";
@@ -408,12 +445,13 @@ Parse_fh(const unsigned char *fh, u_int len, my_fsid *fsidp,
 #ifdef DEBUG
            /* XXX debugging */
            for (i = 0; i < len*4; i++)
-               (void)fprintf(stderr, "%x.", fhp[i]);
+               (void)fprintf(stderr, "%x.", EXTRACT_U_1(fhp + i));
            (void)fprintf(stderr, "\n");
 #endif
            /* Save the actual handle, so it can be display with -u */
            for (i = 0; i < len*4 && i*2 < sizeof(fsidp->Opaque_Handle) - 1; i++)
-               (void)snprintf(&(fsidp->Opaque_Handle[i*2]), 3, "%.2X", fhp[i]);
+               (void)snprintf(&(fsidp->Opaque_Handle[i*2]), 3, "%.2X",
+                              EXTRACT_U_1(fhp + i));
            fsidp->Opaque_Handle[i*2] = '\0';
 
            /* XXX for now, give "bogus" values to aid debugging */
@@ -454,13 +492,13 @@ is_UCX(const unsigned char *fhp, u_int len)
                return(0);
 
        for (i = 1; i < 14; i++) {
-           if (ND_ISPRINT(fhp[i])) {
+           if (ND_ISPRINT(EXTRACT_U_1(fhp + i))) {
                if (seen_null)
                   return(0);
                else
                   continue;
            }
-           else if (fhp[i] == 0) {
+           else if (EXTRACT_U_1(fhp + i) == 0) {
                seen_null = 1;
                continue;
            }