bgp: Parse BGP extended message support capability

[tcpdump] / parsenfsfh.c

diff --git a/parsenfsfh.c b/parsenfsfh.c
index 5ee7e68e21b377bc87e39f017c9db5f897abd290..cd9436992d7762156439b99578cc85e663cd1e66 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -40,21 +40,19 @@
  * Western Research Laboratory
  */
 
  * Western Research Laboratory
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.29 2006-06-13 22:21:38 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include <stdio.h>
 #include <string.h>
 
 
 #include <stdio.h>
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect-ctype.h"
+
+#include "netdissect.h"
+#include "extract.h"

 #include "nfsfh.h"
 
 /*
 #include "nfsfh.h"
 
 /*


@@ -81,236 +79,215 @@ static const char rcsid[] _U_ =
 #define        FHT_HPUX9       11
 #define        FHT_BSD44       12
 
 #define        FHT_HPUX9       11
 #define        FHT_BSD44       12
 

-#ifdef ultrix
-/* Nasty hack to keep the Ultrix C compiler from emitting bogus warnings */
-#define        XFF(x)  ((u_int32_t)(x))
-#else
-#define        XFF(x)  (x)
-#endif
-
-#define        make_uint32(msb,b,c,lsb)\
-       (XFF(lsb) + (XFF(c)<<8) + (XFF(b)<<16) + (XFF(msb)<<24))
-
-#define        make_uint24(msb,b, lsb)\
-       (XFF(lsb) + (XFF(b)<<8) + (XFF(msb)<<16))
-
-#define        make_uint16(msb,lsb)\
-       (XFF(lsb) + (XFF(msb)<<8))
-
-#ifdef __alpha
-       /* or other 64-bit systems */
-#define        make_uint48(msb,b,c,d,e,lsb)\
-       ((lsb) + ((e)<<8) + ((d)<<16) + ((c)<<24) + ((b)<<32) + ((msb)<<40))
-#else
-       /* on 32-bit systems ignore high-order bits */
-#define        make_uint48(msb,b,c,d,e,lsb)\
-       ((lsb) + ((e)<<8) + ((d)<<16) + ((c)<<24))
-#endif
-
-static int is_UCX(const unsigned char *);
+static int is_UCX(netdissect_options *, const unsigned char *, u_int);

 
 void
 
 void

-Parse_fh(fh, len, fsidp, inop, osnamep, fsnamep, ourself)
-register const unsigned char *fh;
-int len _U_;
-my_fsid *fsidp;
-u_int32_t *inop;
-const char **osnamep;          /* if non-NULL, return OS name here */
-const char **fsnamep;          /* if non-NULL, return server fs name here (for VMS) */
-int ourself;           /* true if file handle was generated on this host */
+Parse_fh(netdissect_options *ndo, const unsigned char *fh, u_int len,
+        my_fsid *fsidp, uint32_t *inop,
+        const char **osnamep, /* if non-NULL, return OS name here */
+        const char **fsnamep, /* if non-NULL, return server fs name here (for VMS) */
+        int ourself)   /* true if file handle was generated on this host */

 {
 {

-       register const unsigned char *fhp = fh;
-       u_int32_t temp;
+       const unsigned char *fhp = fh;
+       uint32_t temp;

        int fhtype = FHT_UNKNOWN;
        int fhtype = FHT_UNKNOWN;

-       int i;
+       u_int i;

 
 

-       if (ourself) {
-           /* File handle generated on this host, no need for guessing */
+       /*
+        * Require at least 16 bytes of file handle; it's variable-length
+        * in NFSv3.  "len" is in units of 32-bit words, not bytes.
+        */
+       if (len < 16/4)
+               fhtype = FHT_UNKNOWN;
+       else {
+               if (ourself) {
+                   /* File handle generated on this host, no need for guessing */

 #if    defined(IRIX40)
 #if    defined(IRIX40)

-           fhtype = FHT_IRIX4;
+                   fhtype = FHT_IRIX4;

 #endif
 #if    defined(IRIX50)
 #endif
 #if    defined(IRIX50)

-           fhtype = FHT_IRIX5;
+                   fhtype = FHT_IRIX5;

 #endif
 #if    defined(IRIX51)
 #endif
 #if    defined(IRIX51)

-           fhtype = FHT_IRIX5;
+                   fhtype = FHT_IRIX5;

 #endif
 #if    defined(SUNOS4)
 #endif
 #if    defined(SUNOS4)

-           fhtype = FHT_SUNOS4;
+                   fhtype = FHT_SUNOS4;

 #endif
 #if    defined(SUNOS5)
 #endif
 #if    defined(SUNOS5)

-           fhtype = FHT_SUNOS5;
+                   fhtype = FHT_SUNOS5;

 #endif
 #if    defined(ultrix)
 #endif
 #if    defined(ultrix)

-           fhtype = FHT_ULTRIX;
+                   fhtype = FHT_ULTRIX;

 #endif
 #if    defined(__osf__)
 #endif
 #if    defined(__osf__)

-           fhtype = FHT_DECOSF;
+                   fhtype = FHT_DECOSF;

 #endif
 #if    defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) \
      || defined(__OpenBSD__)
 #endif
 #if    defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) \
      || defined(__OpenBSD__)

-           fhtype = FHT_BSD44;
-#endif
-       }
-       /*
-        * This is basically a big decision tree
-        */
-       else if ((fhp[0] == 0) && (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)) {
-               /* bytes[2,3] == (0,0); must be Auspex */
-               /* XXX or could be Ultrix+MASSBUS "hp" disk? */
-               fhtype = FHT_AUSPEX;
-           }
-           else {
-               /*
-                * 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)) {
-                   /* 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)) {
-                       /* looks like a length, not a file system typecode */
-                       fhtype = FHT_IRIX4;
-                   }
-                   else {
-                       /* by elimination */
-                       fhtype = FHT_SUNOS4;
-                   }
-               }
-           }
-       }
-       else {
-           /*
-            * bytes[0,1] != (0,0); rules out Auspex, IRIX4, SUNOS4
-            * could be IRIX5, DECOSF, UCX, Ultrix, SUNOS5
-            * could be AIX, HP-UX
-            */
-           if ((fhp[2] == 0) && (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)) {

                    fhtype = FHT_BSD44;
                    fhtype = FHT_BSD44;

+#endif

                }
                }

-               /*XXX we probably only need to test of these two bytes */
-               else if ((fhp[21] == 0) && (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)
-                       fhtype = FHT_SUNOS5;
-                   /* XXX what about AIX? */
-               }
-           }
-           else {

                /*
                /*

-                * bytes[2,3] != (0,0); rules out Ultrix, could be
-                * DECOSF, SUNOS5, IRIX5, AIX, HP-UX, or UCX
+                * This is basically a big decision tree

                 */
                 */

-               if ((fhp[8] == 12) && (fhp[9] == 0)) {
-                   fhtype = FHT_DECOSF;
-               }
-               else if ((fhp[8] == 0) && (fhp[9] == 10)) {
-                   /* could be SUNOS5/IRIX5, AIX, HP-UX */
-                   if ((fhp[7] == 0) && (fhp[6] == 0) &&
-                       (fhp[5] == 0) && (fhp[4] == 0)) {
-                       /* XXX is this always true of HP-UX? */
-                       fhtype = FHT_HPUX9;
-                   }
-                   else if (fhp[7] == 2) {
-                       /* This would be MNT_NFS on AIX, which is impossible */
-                       fhtype = FHT_SUNOS5;    /* or maybe IRIX5 */
+               else if ((GET_U_1(fhp) == 0) && (GET_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 ((GET_U_1(fhp + 2) == 0) && (GET_U_1(fhp + 3) == 0)) {
+                       /* bytes[2,3] == (0,0); must be Auspex */
+                       /* XXX or could be Ultrix+MASSBUS "hp" disk? */
+                       fhtype = FHT_AUSPEX;

                    }
                    else {
                        /*
                    }
                    else {
                        /*

-                        * XXX Could be SUNOS5/IRIX5 or AIX.  I don't
-                        * XXX see any way to disambiguate these, so
-                        * XXX I'm going with the more likely guess.
-                        * XXX Sorry, Big Blue.
+                        * bytes[2,3] != (0,0); rules out Auspex, could be
+                        * DECOSF, SUNOS4, or IRIX4

                         */
                         */

-                       fhtype = FHT_SUNOS5;    /* or maybe IRIX5 */
+                       if ((GET_U_1(fhp + 4) != 0) && (GET_U_1(fhp + 5) == 0) &&
+                               (GET_U_1(fhp + 8) == 12) && (GET_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 ((GET_U_1(fhp + 4) == 0) && (GET_U_1(fhp + 5) == 8) && (GET_U_1(fhp + 6) == 0) &&
+                               (GET_U_1(fhp + 7) == 0)) {
+                               /* looks like a length, not a file system typecode */
+                               fhtype = FHT_IRIX4;
+                           }
+                           else {
+                               /* by elimination */
+                               fhtype = FHT_SUNOS4;
+                           }
+                       }

                    }
                    }

-               }
+               }

                else {
                else {

-                   if (is_UCX(fhp)) {
-                       fhtype = FHT_VMSUCX;
+                   /*
+                    * bytes[0,1] != (0,0); rules out Auspex, IRIX4, SUNOS4
+                    * could be IRIX5, DECOSF, UCX, Ultrix, SUNOS5
+                    * could be AIX, HP-UX
+                    */
+                   if ((GET_U_1(fhp + 2) == 0) && (GET_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 ((GET_U_1(fhp + 6) == 0) && (GET_U_1(fhp + 7) == 0)) {
+                           fhtype = FHT_BSD44;
+                       }
+                       /*XXX we probably only need to test of these two bytes */
+                       else if ((len >= 24/4) && (GET_U_1(fhp + 21) == 0) && (GET_U_1(fhp + 23) == 0)) {
+                           fhtype = FHT_ULTRIX;
+                       }
+                       else {
+                           /* Could be SUNOS5/IRIX5, maybe AIX */
+                           /* XXX no obvious difference between SUNOS5 and IRIX5 */
+                           if (GET_U_1(fhp + 9) == 10)
+                               fhtype = FHT_SUNOS5;
+                           /* XXX what about AIX? */
+                       }

                    }
                    else {
                    }
                    else {

-                       fhtype = FHT_UNKNOWN;
+                       /*
+                        * bytes[2,3] != (0,0); rules out Ultrix, could be
+                        * DECOSF, SUNOS5, IRIX5, AIX, HP-UX, or UCX
+                        */
+                       if ((GET_U_1(fhp + 8) == 12) && (GET_U_1(fhp + 9) == 0)) {
+                           fhtype = FHT_DECOSF;
+                       }
+                       else if ((GET_U_1(fhp + 8) == 0) && (GET_U_1(fhp + 9) == 10)) {
+                           /* could be SUNOS5/IRIX5, AIX, HP-UX */
+                           if ((GET_U_1(fhp + 7) == 0) && (GET_U_1(fhp + 6) == 0) &&
+                               (GET_U_1(fhp + 5) == 0) && (GET_U_1(fhp + 4) == 0)) {
+                               /* XXX is this always true of HP-UX? */
+                               fhtype = FHT_HPUX9;
+                           }
+                           else if (GET_U_1(fhp + 7) == 2) {
+                               /* This would be MNT_NFS on AIX, which is impossible */
+                               fhtype = FHT_SUNOS5;    /* or maybe IRIX5 */
+                           }
+                           else {
+                               /*
+                                * XXX Could be SUNOS5/IRIX5 or AIX.  I don't
+                                * XXX see any way to disambiguate these, so
+                                * XXX I'm going with the more likely guess.
+                                * XXX Sorry, Big Blue.
+                                */
+                               fhtype = FHT_SUNOS5;    /* or maybe IRIX5 */
+                           }
+                       }
+                       else {
+                           if (is_UCX(ndo, fhp, len)) {
+                               fhtype = FHT_VMSUCX;
+                           }
+                           else {
+                               fhtype = FHT_UNKNOWN;
+                           }
+                       }

                    }
                }
                    }
                }

-           }

        }
 
        /* XXX still needs to handle SUNOS3 */
 
        switch (fhtype) {
        case FHT_AUSPEX:
        }
 
        /* XXX still needs to handle SUNOS3 */
 
        switch (fhtype) {
        case FHT_AUSPEX:

-           fsidp->Fsid_dev.Minor = fhp[7];
-           fsidp->Fsid_dev.Major = fhp[6];
+           fsidp->Fsid_dev.Minor = GET_U_1(fhp + 7);
+           fsidp->Fsid_dev.Major = GET_U_1(fhp + 6);

            fsidp->fsid_code = 0;
 
            fsidp->fsid_code = 0;
 

-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = GET_BE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "Auspex";
            break;
 
        case FHT_BSD44:
 
            if (osnamep)
                *osnamep = "Auspex";
            break;
 
        case FHT_BSD44:

-           fsidp->Fsid_dev.Minor = fhp[0];
-           fsidp->Fsid_dev.Major = fhp[1];
+           fsidp->Fsid_dev.Minor = GET_U_1(fhp);
+           fsidp->Fsid_dev.Major = GET_U_1(fhp + 1);

            fsidp->fsid_code = 0;
 
            fsidp->fsid_code = 0;
 

-           *inop = make_uint32(fhp[15], fhp[14], fhp[13], fhp[12]);
+           *inop = GET_LE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "BSD 4.4";
            break;
 
        case FHT_DECOSF:
 
            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 = GET_LE_U_4(fhp + 4);

                        /* XXX could ignore 3 high-order bytes */
 
                        /* XXX could ignore 3 high-order bytes */
 

-           temp = make_uint32(fhp[3], fhp[2], fhp[1], fhp[0]);
+           temp = GET_LE_U_4(fhp);

            fsidp->Fsid_dev.Minor = temp & 0xFFFFF;
            fsidp->Fsid_dev.Major = (temp>>20) & 0xFFF;
 
            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 = GET_LE_U_4(fhp + 12);

            if (osnamep)
                *osnamep = "OSF";
            break;
 
        case FHT_IRIX4:
            if (osnamep)
                *osnamep = "OSF";
            break;
 
        case FHT_IRIX4:

-           fsidp->Fsid_dev.Minor = fhp[3];
-           fsidp->Fsid_dev.Major = fhp[2];
+           fsidp->Fsid_dev.Minor = GET_U_1(fhp + 3);
+           fsidp->Fsid_dev.Major = GET_U_1(fhp + 2);

            fsidp->fsid_code = 0;
 
            fsidp->fsid_code = 0;
 

-           *inop = make_uint32(fhp[8], fhp[9], fhp[10], fhp[11]);
+           *inop = GET_BE_U_4(fhp + 8);

 
            if (osnamep)
                *osnamep = "IRIX4";
            break;
 
        case FHT_IRIX5:
 
            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]);
+           fsidp->Fsid_dev.Minor = GET_BE_U_2(fhp + 2);
+           fsidp->Fsid_dev.Major = GET_BE_U_2(fhp);
+           fsidp->fsid_code = GET_BE_U_4(fhp + 4);

 
 

-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = GET_BE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "IRIX5";
 
            if (osnamep)
                *osnamep = "IRIX5";


@@ -328,24 +305,24 @@ int ourself;              /* true if file handle was generated on this host */
 #endif
 
        case FHT_SUNOS4:
 #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 = GET_U_1(fhp + 3);
+           fsidp->Fsid_dev.Major = GET_U_1(fhp + 2);
+           fsidp->fsid_code = GET_BE_U_4(fhp + 4);

 
 

-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = GET_BE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "SUNOS4";
            break;
 
        case FHT_SUNOS5:
 
            if (osnamep)
                *osnamep = "SUNOS4";
            break;
 
        case FHT_SUNOS5:

-           temp = make_uint16(fhp[0], fhp[1]);
+           temp = GET_BE_U_2(fhp);

            fsidp->Fsid_dev.Major = (temp>>2) &  0x3FFF;
            fsidp->Fsid_dev.Major = (temp>>2) &  0x3FFF;

-           temp = make_uint24(fhp[1], fhp[2], fhp[3]);
+           temp = GET_BE_U_3(fhp + 1);

            fsidp->Fsid_dev.Minor = temp & 0x3FFFF;
            fsidp->Fsid_dev.Minor = temp & 0x3FFFF;

-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
+           fsidp->fsid_code = GET_BE_U_4(fhp + 4);

 
 

-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = GET_BE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "SUNOS5";
 
            if (osnamep)
                *osnamep = "SUNOS5";


@@ -353,10 +330,10 @@ int ourself;              /* true if file handle was generated on this host */
 
        case FHT_ULTRIX:
            fsidp->fsid_code = 0;
 
        case FHT_ULTRIX:
            fsidp->fsid_code = 0;

-           fsidp->Fsid_dev.Minor = fhp[0];
-           fsidp->Fsid_dev.Major = fhp[1];
+           fsidp->Fsid_dev.Minor = GET_U_1(fhp);
+           fsidp->Fsid_dev.Major = GET_U_1(fhp + 1);

 
 

-           temp = make_uint32(fhp[7], fhp[6], fhp[5], fhp[4]);
+           temp = GET_LE_U_4(fhp + 4);

            *inop = temp;
            if (osnamep)
                *osnamep = "Ultrix";
            *inop = temp;
            if (osnamep)
                *osnamep = "Ultrix";


@@ -368,47 +345,49 @@ int ourself;              /* true if file handle was generated on this host */
                if (sizeof(*fsidp) > 14)
                    memset((char *)fsidp, 0, sizeof(*fsidp));
                /* just use the whole thing */
                if (sizeof(*fsidp) > 14)
                    memset((char *)fsidp, 0, sizeof(*fsidp));
                /* just use the whole thing */

-               memcpy((char *)fsidp, (char *)fh, 14);
+               memcpy((char *)fsidp, (const char *)fh, 14);

            }
            else {
            }
            else {

-               u_int32_t tempa[4];     /* at least 16 bytes, maybe more */
+               uint32_t tempa[4];      /* at least 16 bytes, maybe more */

 
                memset((char *)tempa, 0, sizeof(tempa));
 
                memset((char *)tempa, 0, sizeof(tempa));

-               memcpy((char *)tempa, (char *)fh, 14); /* ensure alignment */
+               memcpy((char *)tempa, (const char *)fh, 14); /* ensure alignment */

                fsidp->Fsid_dev.Minor = tempa[0] + (tempa[1]<<1);
                fsidp->Fsid_dev.Major = tempa[2] + (tempa[3]<<1);
                fsidp->fsid_code = 0;
            }
 
            /* VMS file ID is: (RVN, FidHi, FidLo) */
                fsidp->Fsid_dev.Minor = tempa[0] + (tempa[1]<<1);
                fsidp->Fsid_dev.Major = tempa[2] + (tempa[3]<<1);
                fsidp->fsid_code = 0;
            }
 
            /* VMS file ID is: (RVN, FidHi, FidLo) */

-           *inop = make_uint32(fhp[26], fhp[27], fhp[23], fhp[22]);
+           *inop = (((uint32_t) GET_U_1(fhp + 26)) << 24) |
+                   (((uint32_t) GET_U_1(fhp + 27)) << 16) |
+                   (GET_LE_U_2(fhp + 22) << 0);

 
            /* Caller must save (and null-terminate?) this value */
            if (fsnamep)
 
            /* Caller must save (and null-terminate?) this value */
            if (fsnamep)

-               *fsnamep = (char *)&(fhp[1]);
+               *fsnamep = (const char *)(fhp + 1);

 
            if (osnamep)
                *osnamep = "VMS";
            break;
 
        case FHT_AIX32:
 
            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]);
+           fsidp->Fsid_dev.Minor = GET_BE_U_2(fhp + 2);
+           fsidp->Fsid_dev.Major = GET_BE_U_2(fhp);
+           fsidp->fsid_code = GET_BE_U_4(fhp + 4);

 
 

-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = GET_BE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "AIX32";
            break;
 
        case FHT_HPUX9:
 
            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 = GET_U_1(fhp);
+           temp = GET_BE_U_3(fhp + 1);

            fsidp->Fsid_dev.Minor = temp;
            fsidp->Fsid_dev.Minor = temp;

-           fsidp->fsid_code = make_uint32(fhp[4], fhp[5], fhp[6], fhp[7]);
+           fsidp->fsid_code = GET_BE_U_4(fhp + 4);

 
 

-           *inop = make_uint32(fhp[12], fhp[13], fhp[14], fhp[15]);
+           *inop = GET_BE_U_4(fhp + 12);

 
            if (osnamep)
                *osnamep = "HPUX9";
 
            if (osnamep)
                *osnamep = "HPUX9";


@@ -417,13 +396,15 @@ int ourself;              /* true if file handle was generated on this host */
        case FHT_UNKNOWN:
 #ifdef DEBUG
            /* XXX debugging */
        case FHT_UNKNOWN:
 #ifdef DEBUG
            /* XXX debugging */

-           for (i = 0; i < 32; i++)
-               (void)fprintf(stderr, "%x.", fhp[i]);
+           for (i = 0; i < len*4; i++)
+               (void)fprintf(stderr, "%x.", GET_U_1(fhp + i));

            (void)fprintf(stderr, "\n");
 #endif
            /* Save the actual handle, so it can be display with -u */
            (void)fprintf(stderr, "\n");
 #endif
            /* Save the actual handle, so it can be display with -u */

-           for (i = 0; i < 32; i++)
-               (void)snprintf(&(fsidp->Opaque_Handle[i*2]), 3, "%.2X", fhp[i]);
+           for (i = 0; i < len*4 && i*2 < sizeof(fsidp->Opaque_Handle) - 1; i++)
+               (void)snprintf(&(fsidp->Opaque_Handle[i*2]), 3, "%.2X",
+                              GET_U_1(fhp + i));
+           fsidp->Opaque_Handle[i*2] = '\0';

 
            /* XXX for now, give "bogus" values to aid debugging */
            fsidp->fsid_code = 0;
 
            /* XXX for now, give "bogus" values to aid debugging */
            fsidp->fsid_code = 0;


@@ -450,20 +431,26 @@ int ourself;              /* true if file handle was generated on this host */
  *     (3) followed by string of nulls
  */
 static int
  *     (3) followed by string of nulls
  */
 static int

-is_UCX(fhp)
-const unsigned char *fhp;
+is_UCX(netdissect_options *ndo, const unsigned char *fhp, u_int len)

 {
 {

-       register int i;
+       u_int i;

        int seen_null = 0;
 
        int seen_null = 0;
 

+       /*
+        * Require at least 28 bytes of file handle; it's variable-length
+        * in NFSv3.  "len" is in units of 32-bit words, not bytes.
+        */
+       if (len < 28/4)
+               return(0);
+

        for (i = 1; i < 14; i++) {
        for (i = 1; i < 14; i++) {

-           if (isprint(fhp[i])) {
+           if (ND_ASCII_ISPRINT(GET_U_1(fhp + i))) {

                if (seen_null)
                   return(0);
                else
                   continue;
            }
                if (seen_null)
                   return(0);
                else
                   continue;
            }

-           else if (fhp[i] == 0) {
+           else if (GET_U_1(fhp + i) == 0) {

                seen_null = 1;
                continue;
            }
                seen_null = 1;
                continue;
            }