update change log: add support for LACP, MARKER as per 802.3ad

[tcpdump] / parsenfsfh.c

diff --git a/parsenfsfh.c b/parsenfsfh.c
index b5c14e1af2d7b6027d0c0b4e90749147c41f4d8a..8894ad131025b9b389468515f529fa13b316c137 100644 (file)
--- a/parsenfsfh.c
+++ b/parsenfsfh.c
@@ -41,18 +41,16 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.20 2001-06-15 07:42:19 itojun Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/parsenfsfh.c,v 1.28 2004-03-25 03:30:55 mcr Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <sys/types.h>
-#include <sys/time.h>
+#include <tcpdump-stdinc.h>

 
 

-#include <ctype.h>

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


@@ -108,19 +106,19 @@ static const char rcsid[] =
        ((lsb) + ((e)<<8) + ((d)<<16) + ((c)<<24))
 #endif
 
        ((lsb) + ((e)<<8) + ((d)<<16) + ((c)<<24))
 #endif
 

-static int is_UCX(unsigned char *);
+static int is_UCX(const unsigned char *);

 
 void
 Parse_fh(fh, len, fsidp, inop, osnamep, fsnamep, ourself)
 
 void
 Parse_fh(fh, len, fsidp, inop, osnamep, fsnamep, ourself)

-register caddr_t *fh;
-int len;
+register const unsigned char *fh;
+int len _U_;

 my_fsid *fsidp;
 ino_t *inop;
 my_fsid *fsidp;
 ino_t *inop;

-char **osnamep;                /* if non-NULL, return OS name here */
-char **fsnamep;                /* if non-NULL, return server fs name here (for VMS) */
+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 */
 {
 int ourself;           /* true if file handle was generated on this host */
 {

-       register unsigned char *fhp = (unsigned char *)fh;
+       register const unsigned char *fhp = fh;

        u_int32_t temp;
        int fhtype = FHT_UNKNOWN;
        int i;
        u_int32_t temp;
        int fhtype = FHT_UNKNOWN;
        int i;


@@ -402,17 +400,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 */

-           int i;

            for (i = 0; i < 32; i++)
                (void)fprintf(stderr, "%x.", fhp[i]);
            (void)fprintf(stderr, "\n");
 #endif
            for (i = 0; i < 32; i++)
                (void)fprintf(stderr, "%x.", fhp[i]);
            (void)fprintf(stderr, "\n");
 #endif

-           /* XXX for now, give "bogus" values to aid debugging */
-

            /* 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]);
 
            /* 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]);
 

+           /* XXX for now, give "bogus" values to aid debugging */

            fsidp->fsid_code = 0;
            fsidp->Fsid_dev.Minor = 257;
            fsidp->Fsid_dev.Major = 257;
            fsidp->fsid_code = 0;
            fsidp->Fsid_dev.Minor = 257;
            fsidp->Fsid_dev.Major = 257;


@@ -438,7 +434,7 @@ int ourself;                /* true if file handle was generated on this host */
  */
 static int
 is_UCX(fhp)
  */
 static int
 is_UCX(fhp)

-unsigned char *fhp;
+const unsigned char *fhp;

 {
        register int i;
        int seen_null = 0;
 {
        register int i;
        int seen_null = 0;