replace SPDX identifier GPL-2.0+ with GPL-2.0-or-later.
[metze/wireshark/wip.git] / wiretap / netscaler.c
index 1428fc5e23ddf692705546055d356e9fc4d71d3d..bf10ab6ce8fc18cd9f5903c5d79f1866d3ab543b 100644 (file)
@@ -1,23 +1,9 @@
 /* netscaler.c
- *
- * $Id$
  *
  * Wiretap Library
  * Copyright (c) 2006 by Ravi Kondamuru <Ravi.Kondamuru@citrix.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "config.h"
@@ -25,7 +11,6 @@
 #include <string.h>
 #include "wtap-int.h"
 #include "file_wrappers.h"
-#include "buffer.h"
 #include "netscaler.h"
 
 /* Defines imported from netscaler code: nsperfrc.h */
 #define NSPR_SIGSTR_V10 "NetScaler Performance Data"
 #define NSPR_SIGSTR_V20 "NetScaler V20 Performance Data"
 #define NSPR_SIGSTR     NSPR_SIGSTR_V20
+#define NSPR_SIGSTR_V30 "Netscaler V30 Performance Data"
+#define NSPR_SIGSTR_V35 "Netscaler V35 Performance Data"
 /* Defined but not used */
 #define NSPR_SIGSTR_V21 "NetScaler V21 Performance Data"
 #define NSPR_SIGSTR_V22 "NetScaler V22 Performance Data"
 
+/*
+ * NetScaler trace files are divided into 8K pages, with each page
+ * containing one or more records.  The last page of the file
+ * might be less than 8K bytes.
+ *
+ * Records are not split across page boundaries; if a record doesn't
+ * fit in what remains in a page, the page is padded with null bytes
+ * and the next record is put at the beginning of the next page.
+ * A record type value of 0 means "unused space", so if there are
+ * enough null bytes to constitute a record type value, it will
+ * look as if there's an "unused space" record (which has no fields
+ * other than the type and zero or more additional padding bytes).
+ */
 #define NSPR_PAGESIZE   8192
+#define NSPR_PAGESIZE_TRACE (2*NSPR_PAGESIZE)
 
 /* The different record types
 ** NOTE: The Record Type is two byte fields and unused space is recognized by
@@ -50,6 +51,8 @@
 #define NSPR_UNUSEDSPACE_V20    0x00    /* rest of the page is unused */
 #define NSPR_SIGNATURE_V10      0x0101  /* signature */
 #define NSPR_SIGNATURE_V20      0x01    /* signature */
+#define NSPR_SIGNATURE_V30      NSPR_SIGNATURE_V20
+#define NSPR_SIGNATURE_V35      NSPR_SIGNATURE_V20
 #define NSPR_ABSTIME_V10        0x0107  /* data capture time in secs from 1970*/
 #define NSPR_ABSTIME_V20        0x07    /* data capture time in secs from 1970*/
 #define NSPR_RELTIME_V10        0x0108  /* relative time in ms from last time */
 
 /* The high resolution relative time format.
 ** The MS 2 bits of the high resoltion time is defined as follows:
-** 00 : time value is in second
-** 01 : time value is in mili second
-** 10 : time value is in micro second
-** 11 : time value is in nano second
+** 00 : time value is in seconds
+** 01 : time value is in milliseconds
+** 10 : time value is in microseconds
+** 11 : time value is in nanoseconds
 */
 #define NSPR_HRTIME_MASKTM      0x3FFFFFFF /* mask to get time value */
 #define NSPR_HRTIME_MASKFMT     0xC0000000 /* time value format mask */
@@ -82,13 +85,13 @@ typedef struct nspr_header_v10
     guint8 ph_RecordType[2]; /* Record Type */
     guint8 ph_RecordSize[2]; /* Record Size including header */
 } nspr_header_v10_t;
-#define nspr_header_v10_s    sizeof(nspr_header_v10_t)
+#define nspr_header_v10_s    ((guint32)sizeof(nspr_header_v10_t))
 
 /* This is V20 short header (2 bytes long) to be included where needed */
 #define NSPR_HEADER_V20(prefix) \
     guint8 prefix##_RecordType; /* Record Type */ \
-    guint8 prefix##_RecordSize /* Record Size including header */ \
-                               /* end of declaration */
+    guint8 prefix##_RecordSize  /* Record Size including header */ \
+                                /* end of declaration */
 
 /* This is new long header (3 bytes long) to be included where needed */
 #define NSPR_HEADER3B_V20(prefix) \
@@ -98,13 +101,14 @@ typedef struct nspr_header_v10
                                    /* end of declaration */
 #define NSPR_HEADER3B_V21 NSPR_HEADER3B_V20
 #define NSPR_HEADER3B_V22 NSPR_HEADER3B_V20
+#define NSPR_HEADER3B_V30 NSPR_HEADER3B_V20
 
 typedef struct nspr_hd_v20
 {
     NSPR_HEADER3B_V20(phd); /* long performance header */
 
 } nspr_hd_v20_t;
-#define nspr_hd_v20_s    sizeof(nspr_hd_v20_t)
+#define nspr_hd_v20_s    ((guint32)sizeof(nspr_hd_v20_t))
 
 
 /*
@@ -112,7 +116,7 @@ typedef struct nspr_hd_v20
 ** The short header size can be 0-127 bytes long. If MS Bit of ph_RecordSize
 ** is set then record size has 2 bytes
 */
-#define NSPR_V20RECORDSIZE_2BYTES       0x80
+#define NSPR_V20RECORDSIZE_2BYTES       0x80U
 
 /* Performance Data Header with device number */
 typedef struct nspr_headerdev_v10
@@ -121,19 +125,19 @@ typedef struct nspr_headerdev_v10
     guint8 ph_RecordSize[2]; /* Record Size including header */
     guint8 ph_DevNo[4];      /* Network Device (NIC/CONN) number */
 } nspr_headerdev_v10_t;
-#define nspr_headerdev_v10_s    sizeof(nspr_headerdev_v10_t)
+#define nspr_headerdev_v10_s    ((guint32)sizeof(nspr_headerdev_v10_t))
 
 typedef struct nspr_hd_v10
 {
     nspr_header_v10_t phd; /* performance header */
 } nspr_hd_v10_t;
-#define nspr_hd_v10_s    sizeof(nspr_hd_v10_t)
+#define nspr_hd_v10_s    ((guint32)sizeof(nspr_hd_v10_t))
 
 typedef struct nspr_hdev_v10
 {
     nspr_headerdev_v10_t phd; /* performance header */
 } nspr_hdev_v10_t;
-#define nspr_hdev_v10_s    sizeof(nspr_hdev_v10_t)
+#define nspr_hdev_v10_s    ((guint32)sizeof(nspr_hdev_v10_t))
 
 /* if structure has defined phd as first field, it can use following names */
 #define nsprRecordType    phd.ph_RecordType
@@ -152,7 +156,7 @@ typedef struct nspr_signature_v10
     guint8 sig_Reserved1[2];
     gchar sig_Signature[NSPR_SIGSIZE_V10]; /* Signature value */
 } nspr_signature_v10_t;
-#define nspr_signature_v10_s    sizeof(nspr_signature_v10_t)
+#define nspr_signature_v10_s    ((guint32)sizeof(nspr_signature_v10_t))
 
 /* NSPR_SIGNATURE_V20 structure */
 #define NSPR_SIGSIZE_V20        sizeof(NSPR_SIGSTR_V20) /* signature value size in bytes */
@@ -162,7 +166,26 @@ typedef struct nspr_signature_v20
     guint8 sig_EndianType; /* Endian Type for the data */
     gchar sig_Signature[NSPR_SIGSIZE_V20]; /* Signature value */
 } nspr_signature_v20_t;
-#define nspr_signature_v20_s    sizeof(nspr_signature_v20_t)
+#define nspr_signature_v20_s    ((guint32)sizeof(nspr_signature_v20_t))
+
+/* NSPR_SIGNATURE_V30 structure */
+#define NSPR_SIGSIZE_V30        sizeof(NSPR_SIGSTR_V30) /* signature value size in bytes */
+typedef struct nspr_signature_v30
+{
+    NSPR_HEADER_V20(sig);  /* short performance header */
+    guint8 sig_EndianType; /* Endian Type for the data */
+    gchar sig_Signature[NSPR_SIGSIZE_V30]; /* Signature value */
+} nspr_signature_v30_t;
+#define nspr_signature_v30_s    ((guint32)sizeof(nspr_signature_v30_t))
+
+#define NSPR_SIGSIZE_V35        sizeof(NSPR_SIGSTR_V35) /* signature value size in bytes */
+typedef struct nspr_signature_v35
+{
+    NSPR_HEADER_V20(sig);  /* short performance header */
+    guint8 sig_EndianType; /* Endian Type for the data */
+    gchar sig_Signature[NSPR_SIGSIZE_V35]; /* Signature value */
+} nspr_signature_v35_t;
+#define nspr_signature_v35_s    ((guint32)sizeof(nspr_signature_v35_t))
 
 /* NSPR_ABSTIME_V10 and NSPR_SYSTARTIME_V10 structure */
 typedef struct nspr_abstime_v10
@@ -171,7 +194,7 @@ typedef struct nspr_abstime_v10
     guint8 abs_RelTime[4]; /* relative time is ms from last time */
     guint8 abs_Time[4];    /* absolute time in seconds from 1970 */
 } nspr_abstime_v10_t;
-#define nspr_abstime_v10_s    sizeof(nspr_abstime_v10_t)
+#define nspr_abstime_v10_s    ((guint32)sizeof(nspr_abstime_v10_t))
 
 
 /* NSPR_ABSTIME_V20 and NSPR_SYSTARTIME_V20 structure */
@@ -181,7 +204,7 @@ typedef struct nspr_abstime_v20
     guint8 abs_RelTime[2]; /* relative time is ms from last time */
     guint8 abs_Time[4];    /* absolute time in seconds from 1970 */
 } nspr_abstime_v20_t;
-#define nspr_abstime_v20_s    sizeof(nspr_abstime_v20_t)
+#define nspr_abstime_v20_s    ((guint32)sizeof(nspr_abstime_v20_t))
 
 
 
@@ -190,9 +213,8 @@ typedef struct nspr_pktracefull_v10
 {
     nspr_headerdev_v10_t phd; /* performance header */
     guint8 fp_RelTimeHr[4];   /* High resolution relative time */
-    guint8 fp_Data[1];        /* packet data starts here */
 } nspr_pktracefull_v10_t;
-#define nspr_pktracefull_v10_s    (nspr_hdev_v10_s + 4)
+#define nspr_pktracefull_v10_s    ((guint32)(sizeof(nspr_pktracefull_v10_t)))
 
 /* new full packet trace structure v20 */
 typedef struct nspr_pktracefull_v20
@@ -200,9 +222,8 @@ typedef struct nspr_pktracefull_v20
     NSPR_HEADER3B_V20(fp);  /* long performance header */
     guint8 fp_DevNo;        /* Network Device (NIC) number */
     guint8 fp_RelTimeHr[4]; /* High resolution relative time */
-    guint8 fp_Data[4];      /* packet data starts here */
 } nspr_pktracefull_v20_t;
-#define nspr_pktracefull_v20_s    (sizeof(nspr_pktracefull_v20_t) - 4)
+#define nspr_pktracefull_v20_s    ((guint32)(sizeof(nspr_pktracefull_v20_t)))
 
 /* new full packet trace structure v21 */
 typedef struct nspr_pktracefull_v21
@@ -212,9 +233,8 @@ typedef struct nspr_pktracefull_v21
     guint8 fp_RelTimeHr[4]; /* High resolution relative time */
     guint8 fp_PcbDevNo[4];  /* PCB devno */
     guint8 fp_lPcbDevNo[4]; /* link PCB devno */
-    guint8 fp_Data[4];      /* packet data starts here */
 } nspr_pktracefull_v21_t;
-#define nspr_pktracefull_v21_s    (sizeof(nspr_pktracefull_v21_t) - 4)
+#define nspr_pktracefull_v21_s    ((guint32)(sizeof(nspr_pktracefull_v21_t)))
 
 /* new full packet trace structure v22 */
 typedef struct nspr_pktracefull_v22
@@ -225,9 +245,8 @@ typedef struct nspr_pktracefull_v22
     guint8 fp_PcbDevNo[4];  /* PCB devno */
     guint8 fp_lPcbDevNo[4]; /* link PCB devno */
     guint8 fp_VlanTag[2];   /* vlan tag */
-    guint8 fp_Data[2];      /* packet data starts here */
 } nspr_pktracefull_v22_t;
-#define nspr_pktracefull_v22_s    (sizeof(nspr_pktracefull_v22_t) - 2)
+#define nspr_pktracefull_v22_s    ((guint32)(sizeof(nspr_pktracefull_v22_t)))
 
 typedef struct nspr_pktracefull_v23
 {
@@ -238,9 +257,8 @@ typedef struct nspr_pktracefull_v23
     guint8 fp_lPcbDevNo[4]; /* link PCB devno */
     guint8 fp_VlanTag[2];   /* vlan tag */
     guint8 fp_Coreid[2];    /* coreid of the packet */
-    guint8 fp_Data[2];      /* packet data starts here */
 } nspr_pktracefull_v23_t;
-#define nspr_pktracefull_v23_s    (sizeof(nspr_pktracefull_v23_t) - 2)
+#define nspr_pktracefull_v23_s    ((guint32)(sizeof(nspr_pktracefull_v23_t)))
 
 /* New full packet trace structure v24 for cluster tracing */
 typedef struct nspr_pktracefull_v24
@@ -255,9 +273,8 @@ typedef struct nspr_pktracefull_v24
     guint8 fp_srcNodeId[2];  /* source node # */
     guint8 fp_destNodeId[2]; /* destination node # */
     guint8 fp_clFlags;       /* cluster flags */
-    guint8 fp_Data[2];       /* packet data starts here */
 } nspr_pktracefull_v24_t;
-#define nspr_pktracefull_v24_s    (sizeof(nspr_pktracefull_v24_t) - 4)
+#define nspr_pktracefull_v24_s    ((guint32)(sizeof(nspr_pktracefull_v24_t)))
 
 /* New full packet trace structure v25 for vm info tracing */
 typedef struct nspr_pktracefull_v25
@@ -274,12 +291,29 @@ typedef struct nspr_pktracefull_v25
     guint8 fp_clFlags;        /* cluster flags */
     guint8 fp_src_vmname_len; /* vm src info */
     guint8 fp_dst_vmname_len; /* vm src info */
-    guint8 fp_Data[4];        /* packet data starts here */
 } nspr_pktracefull_v25_t;
-#define nspr_pktracefull_v25_s    (sizeof(nspr_pktracefull_v25_t) - 4)
-#define fp_src_vmname    fp_Data
-#define fp_src_vmname    fp_Data
+#define nspr_pktracefull_v25_s    ((guint32)(sizeof(nspr_pktracefull_v25_t)))
 
+/* New full packet trace structure v26 for vm info tracing */
+typedef struct nspr_pktracefull_v26
+{
+    NSPR_HEADER3B_V22(fp);     /* long performance header */
+    guint8 fp_DevNo;           /* Network Device (NIC) number */
+    guint8 fp_AbsTimeHr[8];    /* High resolution absolute time in nanosec */
+    guint8 fp_PcbDevNo[4];     /* PCB devno */
+    guint8 fp_lPcbDevNo[4];    /* link PCB devno */
+    guint8 fp_VlanTag[2];      /* vlan tag */
+    guint8 fp_Coreid[2];       /* coreid of the packet */
+    guint8 fp_srcNodeId[2];    /* source node # */
+    guint8 fp_destNodeId[2];   /* destination node # */
+    guint8 fp_clFlags;         /* cluster flags */
+    guint8 fp_src_vmname_len;  /* vm src info */
+    guint8 fp_dst_vmname_len;  /* vm src info */
+    guint8 fp_reserved;
+    guint8 fp_ns_activity[4];
+    guint8 fp_reserved_32[12]; /* Adding more field to reduce wireshark changes every time */
+} nspr_pktracefull_v26_t;
+#define nspr_pktracefull_v26_s    ((guint32)(sizeof(nspr_pktracefull_v26_t)))
 
 /* partial packet trace structure */
 typedef struct nspr_pktracepart_v10
@@ -288,9 +322,8 @@ typedef struct nspr_pktracepart_v10
     guint8 pp_RelTimeHr[4];   /* High resolution relative time */
     guint8 pp_PktSizeOrg[2];  /* Original packet size */
     guint8 pp_PktOffset[2];   /* starting offset in packet */
-    guint8 pp_Data[1];        /* packet data starts here */
 } nspr_pktracepart_v10_t;
-#define nspr_pktracepart_v10_s    (nspr_pktracefull_v10_s + 4)
+#define nspr_pktracepart_v10_s    ((guint32)(sizeof(nspr_pktracepart_v10_t)))
 
 /* new partial packet trace structure */
 typedef struct nspr_pktracepart_v20
@@ -300,9 +333,8 @@ typedef struct nspr_pktracepart_v20
     guint8 pp_RelTimeHr[4];  /* High resolution relative time */
     guint8 pp_PktSizeOrg[2]; /* Original packet size */
     guint8 pp_PktOffset[2];  /* starting offset in packet */
-    guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v20_t;
-#define nspr_pktracepart_v20_s    (sizeof(nspr_pktracepart_v20_t) -4)
+#define nspr_pktracepart_v20_s    ((guint32)(sizeof(nspr_pktracepart_v20_t)))
 
 /* new partial packet trace structure */
 typedef struct nspr_pktracepart_v21
@@ -314,9 +346,8 @@ typedef struct nspr_pktracepart_v21
     guint8 pp_PktOffset[2];  /* starting offset in packet */
     guint8 pp_PcbDevNo[4];   /* PCB devno */
     guint8 pp_lPcbDevNo[4];  /* link PCB devno */
-    guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v21_t;
-#define nspr_pktracepart_v21_s    (sizeof(nspr_pktracepart_v21_t) -4)
+#define nspr_pktracepart_v21_s    ((guint32)(sizeof(nspr_pktracepart_v21_t)))
 
 /* new partial packet trace structure v22 */
 typedef struct nspr_pktracepart_v22
@@ -329,9 +360,8 @@ typedef struct nspr_pktracepart_v22
     guint8 pp_PcbDevNo[4];   /* PCB devno */
     guint8 pp_lPcbDevNo[4];  /* link PCB devno */
     guint8 pp_VlanTag[2];    /* Vlan Tag */
-    guint8 pp_Data[2];       /* packet data starts here */
 } nspr_pktracepart_v22_t;
-#define nspr_pktracepart_v22_s    (sizeof(nspr_pktracepart_v22_t) -2)
+#define nspr_pktracepart_v22_s    ((guint32)(sizeof(nspr_pktracepart_v22_t)))
 
 typedef struct nspr_pktracepart_v23
 {
@@ -344,9 +374,8 @@ typedef struct nspr_pktracepart_v23
     guint8 pp_lPcbDevNo[4];  /* link PCB devno */
     guint8 pp_VlanTag[2];    /* vlan tag */
     guint8 pp_Coreid[2];     /* Coreid of the packet */
-    guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v23_t;
-#define nspr_pktracepart_v23_s    (sizeof(nspr_pktracepart_v23_t) -4)
+#define nspr_pktracepart_v23_s    ((guint32)(sizeof(nspr_pktracepart_v23_t)))
 
 /* New partial packet trace structure v24 for cluster tracing */
 typedef struct nspr_pktracepart_v24
@@ -363,9 +392,8 @@ typedef struct nspr_pktracepart_v24
     guint8 pp_srcNodeId[2];  /* source node # */
     guint8 pp_destNodeId[2]; /* destination node # */
     guint8 pp_clFlags;       /* cluster flags */
-    guint8 pp_Data[4];       /* packet data starts here */
 } nspr_pktracepart_v24_t;
-#define nspr_pktracepart_v24_s    (sizeof(nspr_pktracepart_v24_t) -4)
+#define nspr_pktracepart_v24_s    ((guint32)(sizeof(nspr_pktracepart_v24_t)))
 
 /* New partial packet trace structure v25 for vm info tracing */
 typedef struct nspr_pktracepart_v25
@@ -384,65 +412,139 @@ typedef struct nspr_pktracepart_v25
     guint8 pp_clFlags;        /* cluster flags */
     guint8 pp_src_vmname_len; /* vm info */
     guint8 pp_dst_vmname_len; /* vm info */
-    guint8 pp_Data[4];        /* packet data starts here */
 } nspr_pktracepart_v25_t;
-#define nspr_pktracepart_v25_s    (sizeof(nspr_pktracepart_v25_t) -4)
-#define pp_src_vmname    pp_Data
-#define pp_dst_vmname    pp_Data
+#define nspr_pktracepart_v25_s    ((guint32)(sizeof(nspr_pktracepart_v25_t)))
 
-#define myoffsetof(type,fieldname) (&(((type*)0)->fieldname))
+/* New full packet trace structure v30 for multipage spanning data */
+typedef struct  nspr_pktracefull_v30
+{
+    NSPR_HEADER3B_V30(fp);  /* long performance header */
+    guint8 fp_DevNo;   /* Network Device (NIC) number */
+    guint8 fp_AbsTimeHr[8];  /*High resolution absolute time in nanosec*/
+    guint8 fp_PcbDevNo[4];    /* PCB devno */
+    guint8 fp_lPcbDevNo[4];   /* link PCB devno */
+    guint8 fp_PktSizeOrg[2];  /* Original packet size */
+    guint8 fp_VlanTag[2]; /* vlan tag */
+    guint8 fp_Coreid[2]; /* coreid of the packet */
+    guint8 fp_srcNodeId[2]; /* cluster nodeid of the packet */
+    guint8 fp_destNodeId[2];
+    guint8 fp_clFlags;
+    guint8 fp_src_vmname_len;
+    guint8 fp_dst_vmname_len;
+    guint8 fp_reserved[3];
+    guint8 fp_ns_activity[4];
+    guint8 fp_reserved_32[12];
+} nspr_pktracefull_v30_t;
+#define nspr_pktracefull_v30_s  ((guint32)(sizeof(nspr_pktracefull_v30_t)))
+
+/* New full packet trace structure v35 for multipage spanning data */
+typedef struct  nspr_pktracefull_v35
+{
+    NSPR_HEADER3B_V30(fp);  /* long performance header */
+    guint8 fp_DevNo;   /* Network Device (NIC) number */
+    guint8 fp_AbsTimeHr[8];  /*High resolution absolute time in nanosec*/
+    guint8 fp_PcbDevNo[4];    /* PCB devno */
+    guint8 fp_lPcbDevNo[4];   /* link PCB devno */
+    guint8 fp_PktSizeOrg[2];  /* Original packet size */
+    guint8 fp_VlanTag[2]; /* vlan tag */
+    guint8 fp_Coreid[2]; /* coreid of the packet */
+    guint8 fp_headerlen[2];
+    guint8 fp_errorcode;
+    guint8 fp_app;
+    guint8 fp_ns_activity[4];
+    guint8 fp_nextrectype;
+} nspr_pktracefull_v35_t;
+#define nspr_pktracefull_v35_s  ((guint32)(sizeof(nspr_pktracefull_v35_t)))
+
+/* New partial packet trace structure v26 for vm info tracing */
+typedef struct nspr_pktracepart_v26
+{
+    NSPR_HEADER3B_V22(pp);     /* long performance header */
+    guint8 pp_DevNo;           /* Network Device (NIC) number */
+    guint8 pp_AbsTimeHr[8];    /*High resolution absolute time in nanosec*/
+    guint8 pp_PktSizeOrg[2];   /* Original packet size */
+    guint8 pp_PktOffset[2];    /* starting offset in packet */
+    guint8 pp_PcbDevNo[4];     /* PCB devno */
+    guint8 pp_lPcbDevNo[4];    /* link PCB devno */
+    guint8 pp_VlanTag[2];      /* vlan tag */
+    guint8 pp_Coreid[2];       /* Coreid of the packet */
+    guint8 pp_srcNodeId[2];    /* source node # */
+    guint8 pp_destNodeId[2];   /* destination node # */
+    guint8 pp_clFlags;         /* cluster flags */
+    guint8 pp_src_vmname_len;  /* vm info */
+    guint8 pp_dst_vmname_len;  /* vm info */
+    guint8 pp_reserved;
+    guint8 pp_ns_activity[4];
+    guint8 pp_reserved_32[12]; /* Adding more field to reduce wireshark changes every time */
+} nspr_pktracepart_v26_t;
+#define nspr_pktracepart_v26_s    ((guint32)(sizeof(nspr_pktracepart_v26_t)))
+
+#define __TNDO(phdr,enumprefix,structname,hdrname)\
+    static const guint8 enumprefix##_##hdrname##_offset = (guint8)sizeof(nspr_##structname##_t);
 
 #define __TNO(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
-    guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(myoffsetof(nspr_##structname##_t,structprefix##_##structfieldname));
+    static const guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(offsetof(nspr_##structname##_t,structprefix##_##structfieldname));
 
 #define __TNL(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
-    guint8 enumprefix##_##hdrname##_len = (guint8)sizeof(((nspr_##structname##_t*)0)->structprefix##_##structfieldname);
+    static const guint8 enumprefix##_##hdrname##_len = (guint8)sizeof(((nspr_##structname##_t*)0)->structprefix##_##structfieldname);
 
 #define __TNV1O(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
-    guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(myoffsetof(nspr_##structname##_t,structfieldname));
+    static const guint8 enumprefix##_##hdrname##_offset = (guint8)GPOINTER_TO_INT(offsetof(nspr_##structname##_t,structfieldname));
 
 #define __TNV1L(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
-    guint8 enumprefix##_##hdrname##_len = (guint8)sizeof(((nspr_##structname##_t*)0)->structfieldname);
+    static const guint8 enumprefix##_##hdrname##_len = (guint8)sizeof(((nspr_##structname##_t*)0)->structfieldname);
 
 #define TRACE_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-        __TNV1O(phdr,enumprefix,structprefix,structname,dir,phd.ph_RecordType)\
-        __TNV1L(phdr,enumprefix,structprefix,structname,dir,phd.ph_RecordType)\
-        __TNV1O(phdr,enumprefix,structprefix,structname,nicno,phd.ph_DevNo)\
-        __TNV1L(phdr,enumprefix,structprefix,structname,nicno,phd.ph_DevNo)\
-        __TNO(phdr,enumprefix,structprefix,structname,eth,Data)
+    __TNV1O(phdr,enumprefix,structprefix,structname,dir,phd.ph_RecordType)\
+    __TNV1L(phdr,enumprefix,structprefix,structname,dir,phd.ph_RecordType)\
+    __TNV1O(phdr,enumprefix,structprefix,structname,nicno,phd.ph_DevNo)\
+    __TNV1L(phdr,enumprefix,structprefix,structname,nicno,phd.ph_DevNo)\
+    __TNDO(phdr,enumprefix,structname,eth)
 
 #define TRACE_V20_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-        __TNO(phdr,enumprefix,structprefix,structname,dir,RecordType)\
-        __TNL(phdr,enumprefix,structprefix,structname,dir,RecordType)\
-        __TNO(phdr,enumprefix,structprefix,structname,nicno,DevNo)\
-        __TNL(phdr,enumprefix,structprefix,structname,nicno,DevNo)\
-        __TNO(phdr,enumprefix,structprefix,structname,eth,Data)
+    __TNO(phdr,enumprefix,structprefix,structname,dir,RecordType)\
+    __TNL(phdr,enumprefix,structprefix,structname,dir,RecordType)\
+    __TNO(phdr,enumprefix,structprefix,structname,nicno,DevNo)\
+    __TNL(phdr,enumprefix,structprefix,structname,nicno,DevNo)\
+    __TNDO(phdr,enumprefix,structname,eth)
 
 #define TRACE_V21_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-        TRACE_V20_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
-        __TNO(phdr,enumprefix,structprefix,structname,pcb,PcbDevNo)\
-        __TNO(phdr,enumprefix,structprefix,structname,l_pcb,lPcbDevNo)
+    TRACE_V20_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNO(phdr,enumprefix,structprefix,structname,pcb,PcbDevNo)\
+    __TNO(phdr,enumprefix,structprefix,structname,l_pcb,lPcbDevNo)
 
 #define TRACE_V22_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-        TRACE_V21_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
-        __TNO(phdr,enumprefix,structprefix,structname,vlantag,VlanTag)
+    TRACE_V21_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNO(phdr,enumprefix,structprefix,structname,vlantag,VlanTag)
 
 #define TRACE_V23_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-        TRACE_V22_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
-        __TNO(phdr,enumprefix,structprefix,structname,coreid,Coreid)
+    TRACE_V22_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNO(phdr,enumprefix,structprefix,structname,coreid,Coreid)
 
 #define TRACE_V24_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-        TRACE_V23_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
-        __TNO(phdr,enumprefix,structprefix,structname,srcnodeid,srcNodeId)\
-        __TNO(phdr,enumprefix,structprefix,structname,destnodeid,destNodeId)\
-        __TNO(phdr,enumprefix,structprefix,structname,clflags,clFlags)
+    TRACE_V23_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNO(phdr,enumprefix,structprefix,structname,srcnodeid,srcNodeId)\
+    __TNO(phdr,enumprefix,structprefix,structname,destnodeid,destNodeId)\
+    __TNO(phdr,enumprefix,structprefix,structname,clflags,clFlags)
 
 #define TRACE_V25_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
-            TRACE_V24_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
-            __TNO(phdr,enumprefix,structprefix,structname,src_vmname_len,src_vmname_len)\
-            __TNO(phdr,enumprefix,structprefix,structname,dst_vmname_len,dst_vmname_len)\
-            __TNO(phdr,enumprefix,structprefix,structname,data,Data)
-    
+    TRACE_V24_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNO(phdr,enumprefix,structprefix,structname,src_vmname_len,src_vmname_len)\
+    __TNO(phdr,enumprefix,structprefix,structname,dst_vmname_len,dst_vmname_len)\
+    __TNDO(phdr,enumprefix,structname,data)
+
+#define TRACE_V26_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
+    TRACE_V25_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNO(phdr,enumprefix,structprefix,structname,ns_activity,ns_activity)\
+
+#define TRACE_V30_REC_LEN_OFF(phdr, enumprefix, structprefix, structname) \
+    TRACE_V26_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+
+#define TRACE_V35_REC_LEN_OFF(phdr, enumprefix, structprefix, structname) \
+    TRACE_V23_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)\
+    __TNDO(phdr,enumprefix,structname,data)\
+    __TNO(phdr,enumprefix,structprefix,structname,ns_activity,ns_activity)
+
     TRACE_V10_REC_LEN_OFF(NULL,v10_part,pp,pktracepart_v10)
     TRACE_V10_REC_LEN_OFF(NULL,v10_full,fp,pktracefull_v10)
     TRACE_V20_REC_LEN_OFF(NULL,v20_part,pp,pktracepart_v20)
@@ -457,10 +559,15 @@ typedef struct nspr_pktracepart_v25
     TRACE_V24_REC_LEN_OFF(NULL,v24_full,fp,pktracefull_v24)
     TRACE_V25_REC_LEN_OFF(NULL,v25_part,pp,pktracepart_v25)
     TRACE_V25_REC_LEN_OFF(NULL,v25_full,fp,pktracefull_v25)
+    TRACE_V26_REC_LEN_OFF(NULL,v26_part,pp,pktracepart_v26)
+    TRACE_V26_REC_LEN_OFF(NULL,v26_full,fp,pktracefull_v26)
+    TRACE_V30_REC_LEN_OFF(NULL,v30_full,fp,pktracefull_v30)
+    TRACE_V35_REC_LEN_OFF(NULL,v35_full,fp,pktracefull_v35)
 
 #undef __TNV1O
 #undef __TNV1L
 #undef __TNO
+#undef __TNDO
 #undef __TNL
 
 
@@ -485,8 +592,8 @@ typedef struct nspr_pktracepart_v25
 typedef struct {
     gchar  *pnstrace_buf;
     gint64  xxx_offset;
-    gint32  nstrace_buf_offset;
-    gint32  nstrace_buflen;
+    guint32 nstrace_buf_offset;
+    guint32 nstrace_buflen;
     /* Performance Monitor Time variables */
     guint32 nspm_curtime;         /* current time since 1970 */
     guint64 nspm_curtimemsec;     /* current time in milliseconds */
@@ -496,36 +603,50 @@ typedef struct {
 } nstrace_t;
 
 static guint32 nspm_signature_version(wtap*, gchar*, gint32);
-static gboolean nstrace_read(wtap *wth, int *err, gchar **err_info,
-                             gint64 *data_offset);
 static gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info,
                                  gint64 *data_offset);
 static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info,
                                  gint64 *data_offset);
-static gboolean nstrace_seek_read(wtap *wth, gint64 seek_off,
-                                  struct wtap_pkthdr *phdr,
-                                  guint8 *pd, int length,
-                                  int *err, gchar **err_info);
+static gboolean nstrace_read_v30(wtap *wth, int *err, gchar **err_info,
+                                 gint64 *data_offset);
+static gboolean nstrace_seek_read_v10(wtap *wth, gint64 seek_off,
+                                      struct wtap_pkthdr *phdr,
+                                      Buffer *buf,
+                                      int *err, gchar **err_info);
+static gboolean nstrace_seek_read_v20(wtap *wth, gint64 seek_off,
+                                      struct wtap_pkthdr *phdr,
+                                      Buffer *buf,
+                                      int *err, gchar **err_info);
+static gboolean nstrace_seek_read_v30(wtap *wth, gint64 seek_off,
+                                      struct wtap_pkthdr *phdr,
+                                      Buffer *buf,
+                                      int *err, gchar **err_info);
 static void nstrace_close(wtap *wth);
 
-static gboolean nstrace_set_start_time_v10(wtap *wth);
-static gboolean nstrace_set_start_time_v20(wtap *wth);
-static gboolean nstrace_set_start_time(wtap *wth);
+static gboolean nstrace_set_start_time_v10(wtap *wth, int *err,
+                                           gchar **err_info);
+static gboolean nstrace_set_start_time_v20(wtap *wth, int *err,
+                                           gchar **err_info);
+static gboolean nstrace_set_start_time(wtap *wth, int *err, gchar **err_info);
 static guint64 ns_hrtime2nsec(guint32 tm);
 
 static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
-                             const guint8 *pd, int *err);
+                             const guint8 *pd, int *err, gchar **err_info);
 
 
+/*
+ * Minimum of the page size and the amount of data left in the file;
+ * the last page of a file can be short.
+ */
 #define GET_READ_PAGE_SIZE(remaining_file_size) ((gint32)((remaining_file_size>NSPR_PAGESIZE)?NSPR_PAGESIZE:remaining_file_size))
-
+#define GET_READ_PAGE_SIZEV3(remaining_file_size) ((gint32)((remaining_file_size>NSPR_PAGESIZE_TRACE)?NSPR_PAGESIZE_TRACE:remaining_file_size))
 
 static guint64 ns_hrtime2nsec(guint32 tm)
 {
     guint32    val = tm & NSPR_HRTIME_MASKTM;
     switch(tm & NSPR_HRTIME_MASKFMT)
     {
-    case NSPR_HRTIME_SEC:    return (guint64)val*1000000000;
+    case NSPR_HRTIME_SEC:     return (guint64)val*1000000000;
     case NSPR_HRTIME_MSEC:    return (guint64)val*1000000;
     case NSPR_HRTIME_USEC:    return (guint64)val*1000;
     case NSPR_HRTIME_NSEC:    return val;
@@ -533,60 +654,110 @@ static guint64 ns_hrtime2nsec(guint32 tm)
     return tm;
 }
 
+static gboolean
+nstrace_read_buf(FILE_T fh, void *buf, guint32 buflen, int *err,
+    gchar **err_info)
+{
+    int bytes_read;
+
+    bytes_read = file_read(buf, buflen, fh);
+    if (bytes_read < 0) {
+        *err = file_error(fh, err_info);
+        return FALSE;
+    }
+    if ((guint32)bytes_read != buflen) {
+        /*
+         * XXX - for which files can the last page be short?
+         */
+        *err = 0;
+        return FALSE;
+    }
+    return TRUE;
+}
 
 /*
 ** Netscaler trace format open routines
 */
-int nstrace_open(wtap *wth, int *err, gchar **err_info)
+wtap_open_return_val nstrace_open(wtap *wth, int *err, gchar **err_info)
 {
     gchar *nstrace_buf;
     gint64 file_size;
     gint32 page_size;
     nstrace_t *nstrace;
-    int bytes_read;
 
-    errno = WTAP_ERR_CANT_READ;
 
     if ((file_size = wtap_file_size(wth, err)) == -1)
-        return 0;
+        return WTAP_OPEN_NOT_MINE;
 
     nstrace_buf = (gchar *)g_malloc(NSPR_PAGESIZE);
     page_size = GET_READ_PAGE_SIZE(file_size);
 
-    switch ((wth->file_type = nspm_signature_version(wth, nstrace_buf, page_size)))
+    switch ((wth->file_type_subtype = nspm_signature_version(wth, nstrace_buf, page_size)))
     {
-    case WTAP_FILE_NETSCALER_1_0:
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0:
         wth->file_encap = WTAP_ENCAP_NSTRACE_1_0;
         break;
 
-    case WTAP_FILE_NETSCALER_2_0:
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0:
         wth->file_encap = WTAP_ENCAP_NSTRACE_2_0;
         break;
 
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0:
+        wth->file_encap = WTAP_ENCAP_NSTRACE_3_0;
+        g_free(nstrace_buf);
+        nstrace_buf = (gchar *)g_malloc(NSPR_PAGESIZE_TRACE);
+        page_size = GET_READ_PAGE_SIZEV3(file_size);
+        break;
+
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5:
+        wth->file_encap = WTAP_ENCAP_NSTRACE_3_5;
+        g_free(nstrace_buf);
+        nstrace_buf = (gchar *)g_malloc(NSPR_PAGESIZE_TRACE);
+        page_size = GET_READ_PAGE_SIZEV3(file_size);
+        break;
+
     default:
-        *err = WTAP_ERR_UNSUPPORTED;
-        *err_info = g_strdup_printf("nstrace: file type %d unsupported", wth->file_type);
+        /* No known signature found, assume it's not NetScaler */
         g_free(nstrace_buf);
-        return 0;
+        return WTAP_OPEN_NOT_MINE;
     }
 
     if ((file_seek(wth->fh, 0, SEEK_SET, err)) == -1)
     {
-        *err = file_error(wth->fh, err_info);
         g_free(nstrace_buf);
-        return 0;
+        return WTAP_OPEN_ERROR;
     }
 
-    bytes_read = file_read(nstrace_buf, page_size, wth->fh);
-    if (bytes_read != page_size)
+    if (!wtap_read_bytes(wth->fh, nstrace_buf, page_size, err, err_info))
     {
-        *err = file_error(wth->fh, err_info);
         g_free(nstrace_buf);
-        return 0;
+        if (*err != WTAP_ERR_SHORT_READ)
+            return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_NOT_MINE;
     }
 
-    wth->subtype_read = nstrace_read;
-    wth->subtype_seek_read = nstrace_seek_read;
+    switch (wth->file_type_subtype)
+    {
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0:
+        wth->subtype_read = nstrace_read_v10;
+        wth->subtype_seek_read = nstrace_seek_read_v10;
+        break;
+
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0:
+        wth->subtype_read = nstrace_read_v20;
+        wth->subtype_seek_read = nstrace_seek_read_v20;
+        break;
+
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0:
+        wth->subtype_read = nstrace_read_v30;
+        wth->subtype_seek_read = nstrace_seek_read_v30;
+        break;
+
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5:
+        wth->subtype_read = nstrace_read_v30;
+        wth->subtype_seek_read = nstrace_seek_read_v30;
+        break;
+    }
     wth->subtype_close = nstrace_close;
 
     nstrace = (nstrace_t *)g_malloc(sizeof(nstrace_t));
@@ -603,37 +774,40 @@ int nstrace_open(wtap *wth, int *err, gchar **err_info)
 
 
     /* Set the start time by looking for the abstime record */
-    if ((nstrace_set_start_time(wth)) == FALSE)
+    if ((nstrace_set_start_time(wth, err, err_info)) == FALSE)
     {
-        /* Reset the read pointer to start of the file. */
+        /*
+         * No absolute time record seen, so we just reset the read
+         * pointer to the start of the file, so we start reading
+         * at the first record, rather than skipping records up
+         * to and including an absolute time record.
+         */
+        if (*err != 0)
+        {
+            /* We got an error reading the records. */
+            return WTAP_OPEN_ERROR;
+        }
         if ((file_seek(wth->fh, 0, SEEK_SET, err)) == -1)
         {
-            *err = file_error(wth->fh, err_info);
-            g_free(nstrace->pnstrace_buf);
-            g_free(nstrace);
-            return 0;
+            return WTAP_OPEN_ERROR;
         }
 
         /* Read the first page of data */
-        bytes_read = file_read(nstrace_buf, page_size, wth->fh);
-        if (bytes_read != page_size)
+        if (!wtap_read_bytes(wth->fh, nstrace_buf, page_size, err, err_info))
         {
-            *err = file_error(wth->fh, err_info);
-            g_free(nstrace->pnstrace_buf);
-            g_free(nstrace);
-            return 0;
+            return WTAP_OPEN_ERROR;
         }
 
         /* reset the buffer offset */
         nstrace->nstrace_buf_offset = 0;
     }
 
-    wth->tsprecision = WTAP_FILE_TSPREC_NSEC;
+    wth->file_tsprec = WTAP_TSPREC_NSEC;
     wth->phdr.ts.secs = nstrace->nspm_curtime;
     wth->phdr.ts.nsecs = 0;
 
     *err = 0;
-    return 1;
+    return WTAP_OPEN_MINE;
 }
 
 
@@ -644,12 +818,16 @@ int nstrace_open(wtap *wth, int *err, gchar **err_info)
 
 nspm_signature_func(10)
 nspm_signature_func(20)
+nspm_signature_func(30)
+nspm_signature_func(35)
 
 /*
-** Check signature and return the version number of the signature.
-** If not found, it returns 0. At the time of return from this function
-** we might not be at the first page. So after a call to this function, there
-** has to be a file seek to return to the start of the first page.
+** Check signature and return the file type and subtype for files with
+** that signature.  If it finds no signature that it recognizes, it
+** returns WTAP_FILE_TYPE_SUBTYPE_UNKNOWN. At the time of return from
+** this function we might not be at the first page. So after a call to
+** this function, there has to be a file seek to return to the start
+** of the first page.
 */
 static guint32
 nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
@@ -663,44 +841,51 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
         for ( ; len > (gint32)(MIN(sizeof(NSPR_SIGSTR_V10), sizeof(NSPR_SIGSTR_V20))); dp++, len--)
         {
 #define sigv10p    ((nspr_signature_v10_t*)dp)
-            if ((pletohs(&sigv10p->nsprRecordType) == NSPR_SIGNATURE_V10) &&
-                (pletohs(&sigv10p->nsprRecordSize) <= len) &&
+            if ((pletoh16(&sigv10p->nsprRecordType) == NSPR_SIGNATURE_V10) &&
+                (pletoh16(&sigv10p->nsprRecordSize) <= len) &&
                 ((gint32)sizeof(NSPR_SIGSTR_V10) <= len) &&
                 (!nspm_signature_isv10(sigv10p->sig_Signature)))
-                return WTAP_FILE_NETSCALER_1_0;
+                return WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0;
 #undef    sigv10p
 
 #define sigv20p    ((nspr_signature_v20_t*)dp)
             if ((sigv20p->sig_RecordType == NSPR_SIGNATURE_V20) &&
                 (sigv20p->sig_RecordSize <= len) &&
-                ((gint32)sizeof(NSPR_SIGSTR_V20) <= len) &&
-                (!nspm_signature_isv20(sigv20p->sig_Signature)))
-                return WTAP_FILE_NETSCALER_2_0;
+                ((gint32)sizeof(NSPR_SIGSTR_V20) <= len))
+            {
+                if (!nspm_signature_isv20(sigv20p->sig_Signature)){
+                    return WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0;
+                } else if (!nspm_signature_isv30(sigv20p->sig_Signature)){
+                    return WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0;
+                }else if (!nspm_signature_isv35(sigv20p->sig_Signature)){
+                    return WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5;
+                }
+            }
 #undef    sigv20p
         }
     }
 
-    return 0;    /* no version found */
+    return WTAP_FILE_TYPE_SUBTYPE_UNKNOWN;    /* no version found */
 }
 
-#define nspr_getv10recordtype(hdp) (pletohs(&hdp->nsprRecordType))
-#define nspr_getv10recordsize(hdp) (pletohs(&hdp->nsprRecordSize))
-#define nspr_getv20recordtype(hdp) (hdp->phd_RecordType)
+#define nspr_getv10recordtype(hdp) (pletoh16(&(hdp)->nsprRecordType))
+#define nspr_getv10recordsize(hdp) (pletoh16(&(hdp)->nsprRecordSize))
+#define nspr_getv20recordtype(hdp) ((hdp)->phd_RecordType)
 #define nspr_getv20recordsize(hdp) \
-    (((hdp)->phd_RecordSizeLow & NSPR_V20RECORDSIZE_2BYTES)? \
+    (guint32)(((hdp)->phd_RecordSizeLow & NSPR_V20RECORDSIZE_2BYTES)? \
         (((hdp)->phd_RecordSizeHigh * NSPR_V20RECORDSIZE_2BYTES)+ \
          ((hdp)->phd_RecordSizeLow & ~NSPR_V20RECORDSIZE_2BYTES)) : \
           (hdp)->phd_RecordSizeLow)
 
 
 #define nstrace_set_start_time_ver(ver) \
-    gboolean nstrace_set_start_time_v##ver(wtap *wth) \
+    gboolean nstrace_set_start_time_v##ver(wtap *wth, int *err, gchar **err_info) \
     {\
         nstrace_t *nstrace = (nstrace_t *)wth->priv;\
         gchar* nstrace_buf = nstrace->pnstrace_buf;\
-        gint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;\
-        gint32 nstrace_buflen = nstrace->nstrace_buflen;\
-        int bytes_read;\
+        guint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;\
+        guint32 nstrace_buflen = nstrace->nstrace_buflen;\
+        guint32 record_size;\
         do\
         {\
             while (nstrace_buf_offset < nstrace_buflen)\
@@ -709,7 +894,7 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
                 switch (nspr_getv##ver##recordtype(fp))\
                 {\
                     case NSPR_ABSTIME_V##ver:\
-                        ns_setabstime(nstrace, pletohl(&((nspr_abstime_v##ver##_t *) fp)->abs_Time), pletohs(&((nspr_abstime_v##ver##_t *) fp)->abs_RelTime));\
+                        ns_setabstime(nstrace, pletoh32(&((nspr_abstime_v##ver##_t *) fp)->abs_Time), pletoh16(&((nspr_abstime_v##ver##_t *) fp)->abs_RelTime));\
                         nstrace->nstrace_buf_offset = nstrace_buf_offset + nspr_getv##ver##recordsize(fp);\
                         nstrace->nstrace_buflen = nstrace_buflen;\
                         return TRUE;\
@@ -717,13 +902,19 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
                         nstrace_buf_offset = nstrace_buflen;\
                         break;\
                     default:\
-                        nstrace_buf_offset += nspr_getv##ver##recordsize(fp);\
+                        record_size = nspr_getv##ver##recordsize(fp);\
+                        if (record_size == 0) {\
+                            *err = WTAP_ERR_BAD_FILE;\
+                            *err_info = g_strdup("nstrace: zero size record found");\
+                            return FALSE;\
+                        }\
+                        nstrace_buf_offset += record_size;\
                 }\
             }\
             nstrace_buf_offset = 0;\
             nstrace->xxx_offset += nstrace_buflen;\
             nstrace_buflen = GET_READ_PAGE_SIZE((nstrace->file_size - nstrace->xxx_offset));\
-        }while((nstrace_buflen > 0) && (bytes_read = file_read(nstrace_buf, nstrace_buflen, wth->fh)) && bytes_read == nstrace_buflen); \
+        }while((nstrace_buflen > 0) && (nstrace_read_buf(wth->fh, nstrace_buf, nstrace_buflen, err, err_info)));\
         return FALSE;\
     }
 
@@ -732,7 +923,6 @@ nstrace_set_start_time_ver(20)
 
 #undef nspr_getv10recordtype
 #undef nspr_getv20recordtype
-#undef nspr_getv10recordsize
 
 /*
 ** Set the start time of the trace file. We look for the first ABSTIME record. We use that
@@ -740,16 +930,20 @@ nstrace_set_start_time_ver(20)
 ** the next record after the ABSTIME record. Inorder to report correct time values, all trace
 ** records before the ABSTIME record are ignored.
 */
-static gboolean nstrace_set_start_time(wtap *wth)
+static gboolean nstrace_set_start_time(wtap *wth, int *err, gchar **err_info)
 {
-    if (wth->file_type == WTAP_FILE_NETSCALER_1_0)
-        return nstrace_set_start_time_v10(wth);
-    else if (wth->file_type == WTAP_FILE_NETSCALER_2_0)
-        return nstrace_set_start_time_v20(wth);
-
+    if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
+        return nstrace_set_start_time_v10(wth, err, err_info);
+    else if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
+        return nstrace_set_start_time_v20(wth, err, err_info);
+    else if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0)
+        return nstrace_set_start_time_v20(wth, err, err_info);
     return FALSE;
 }
 
+#define __TNDO(phdr,enumprefix,structname,hdrname)\
+    (phdr)->pseudo_header.nstr.hdrname##_offset = enumprefix##_##hdrname##_offset;
+
 #define __TNO(phdr,enumprefix,structprefix,structname,hdrname,structfieldname) \
     (phdr)->pseudo_header.nstr.hdrname##_offset = enumprefix##_##hdrname##_offset;
 
@@ -766,173 +960,241 @@ static gboolean nstrace_set_start_time(wtap *wth)
 
 /*
 ** Netscaler trace format read routines.
+**
+** The maximum value of the record data size is 65535, which is less than
+** WTAP_MAX_PACKET_SIZE_STANDARD will ever be, so we don't need to check it.
 */
+#define TIMEDEFV10(phdr,fp,type) \
+    do {\
+        (phdr)->presence_flags = WTAP_HAS_TS;\
+        nsg_creltime += ns_hrtime2nsec(pletoh32(&type->type##_RelTimeHr));\
+        (phdr)->ts.secs = nstrace->nspm_curtime + (guint32) (nsg_creltime / 1000000000);\
+        (phdr)->ts.nsecs = (guint32) (nsg_creltime % 1000000000);\
+    }while(0)
+
+#define PARTSIZEDEFV10(phdr,pp,ver) \
+    do {\
+        (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\
+        (phdr)->len = pletoh16(&pp->pp_PktSizeOrg) + nspr_pktracepart_v##ver##_s;\
+        (phdr)->caplen = pletoh16(&pp->nsprRecordSize);\
+    }while(0)
+
+#define FULLSIZEDEFV10(phdr,fp,ver) \
+    do {\
+        (phdr)->len = pletoh16(&(fp)->nsprRecordSize);\
+        (phdr)->caplen = (phdr)->len;\
+    }while(0)
+
+#define PACKET_DESCRIBE(phdr,FULLPART,fullpart,ver,type,HEADERVER) \
+    do {\
+        nspr_pktrace##fullpart##_v##ver##_t *type = (nspr_pktrace##fullpart##_v##ver##_t *) &nstrace_buf[nstrace_buf_offset];\
+        /* Make sure the record header is entirely contained in the page */\
+        if ((nstrace_buflen - nstrace_buf_offset) < sizeof *type) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record header crosses page boundary");\
+            return FALSE;\
+        }\
+        /* Check sanity of record size */\
+        if (pletoh16(&type->nsprRecordSize) < sizeof *type) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record size is less than record header size");\
+            return FALSE;\
+        }\
+        (phdr)->rec_type = REC_TYPE_PACKET;\
+        TIMEDEFV##ver((phdr),fp,type);\
+        FULLPART##SIZEDEFV##ver((phdr),type,ver);\
+        TRACE_V##ver##_REC_LEN_OFF((phdr),v##ver##_##fullpart,type,pktrace##fullpart##_v##ver);\
+        /* Make sure the record is entirely contained in the page */\
+        if ((nstrace_buflen - nstrace_buf_offset) < (phdr)->caplen) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record crosses page boundary");\
+            return FALSE;\
+        }\
+        ws_buffer_assure_space(wth->frame_buffer, (phdr)->caplen);\
+        memcpy(ws_buffer_start_ptr(wth->frame_buffer), type, (phdr)->caplen);\
+        *data_offset = nstrace->xxx_offset + nstrace_buf_offset;\
+        nstrace->nstrace_buf_offset = nstrace_buf_offset + (phdr)->caplen;\
+        nstrace->nstrace_buflen = nstrace_buflen;\
+        nstrace->nsg_creltime = nsg_creltime;\
+        return TRUE;\
+    }while(0)
+
 static gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
 {
     nstrace_t *nstrace = (nstrace_t *)wth->priv;
     guint64 nsg_creltime = nstrace->nsg_creltime;
     gchar *nstrace_buf = nstrace->pnstrace_buf;
-    gint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;
-    gint32 nstrace_buflen = nstrace->nstrace_buflen;
-    nspr_pktracefull_v10_t *fp;
-    nspr_pktracepart_v10_t *pp;
-    int bytes_read;
+    guint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;
+    guint32 nstrace_buflen = nstrace->nstrace_buflen;
 
     *err = 0;
     *err_info = NULL;
     do
     {
         while ((nstrace_buf_offset < nstrace_buflen) &&
-            ((nstrace_buflen - nstrace_buf_offset) >= ((gint32)sizeof(fp->nsprRecordType))))
+            ((nstrace_buflen - nstrace_buf_offset) >= ((gint32)sizeof((( nspr_header_v10_t*)&nstrace_buf[nstrace_buf_offset])->ph_RecordType))))
         {
 
-            fp = (nspr_pktracefull_v10_t *) &nstrace_buf[nstrace_buf_offset];
-            pp = (nspr_pktracepart_v10_t *) fp;
-
-            switch (pletohs(&fp->nsprRecordType))
-            {
-            case NSPR_PDPKTRACEFULLTX_V10:
-            case NSPR_PDPKTRACEFULLTXB_V10:
-            case NSPR_PDPKTRACEFULLRX_V10:
-
-                wth->phdr.presence_flags = WTAP_HAS_TS;
-
-                nsg_creltime += ns_hrtime2nsec(pletohl(&fp->fp_RelTimeHr));
-                wth->phdr.ts.secs = nstrace->nspm_curtime + (guint32) (nsg_creltime / 1000000000);
-                wth->phdr.ts.nsecs = (guint32) (nsg_creltime % 1000000000);
-
-                wth->phdr.len = pletohs(&fp->nsprRecordSize);
-                wth->phdr.caplen = wth->phdr.len;
-
-
-                TRACE_V10_REC_LEN_OFF(&wth->phdr,v10_full,fp,pktracefull_v10);
-
-                buffer_assure_space(wth->frame_buffer, wth->phdr.caplen);
-                memcpy(buffer_start_ptr(wth->frame_buffer), fp, wth->phdr.caplen);
-                *data_offset = nstrace->xxx_offset + nstrace_buf_offset;
-
-                nstrace->nstrace_buf_offset = nstrace_buf_offset + wth->phdr.len;
-                nstrace->nstrace_buflen = nstrace_buflen;
-                nstrace->nsg_creltime = nsg_creltime;
-
-                return TRUE;
+#define GENERATE_CASE_FULL(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,full,ver,fp,HEADERVER);
 
-            case NSPR_PDPKTRACEPARTTX_V10:
-            case NSPR_PDPKTRACEPARTTXB_V10:
-            case NSPR_PDPKTRACEPARTRX_V10:
+#define GENERATE_CASE_PART(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEPARTTX_V##ver:\
+        case NSPR_PDPKTRACEPARTTXB_V##ver:\
+        case NSPR_PDPKTRACEPARTRX_V##ver:\
+            PACKET_DESCRIBE(phdr,PART,part,ver,pp,HEADERVER);
 
-                wth->phdr.presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN;
-
-                nsg_creltime += ns_hrtime2nsec(pletohl(&pp->pp_RelTimeHr));
-                wth->phdr.ts.secs = nstrace->nspm_curtime + (guint32) (nsg_creltime / 1000000000);
-                wth->phdr.ts.nsecs = (guint32) (nsg_creltime % 1000000000);
-
-                wth->phdr.len =  pletohs(&pp->pp_PktSizeOrg) + nspr_pktracepart_v10_s;
-                wth->phdr.caplen =  pletohs(&pp->nsprRecordSize);
-
-                TRACE_V10_REC_LEN_OFF(&wth->phdr,v10_part,pp,pktracepart_v10);
-
-                buffer_assure_space(wth->frame_buffer, wth->phdr.caplen);
-                memcpy(buffer_start_ptr(wth->frame_buffer), pp, wth->phdr.caplen);
-                *data_offset = nstrace->xxx_offset + nstrace_buf_offset;
-
-                nstrace->nstrace_buf_offset = nstrace_buf_offset + wth->phdr.caplen;
-                nstrace->nsg_creltime = nsg_creltime;
-                nstrace->nstrace_buflen = nstrace_buflen;
-
-                return TRUE;
-
-            case NSPR_ABSTIME_V10:
-
-                ns_setabstime(nstrace, pletohl(((nspr_abstime_v10_t *) fp)->abs_Time), pletohl(&((nspr_abstime_v10_t *) fp)->abs_RelTime));
-                nstrace_buf_offset += pletohs(&fp->nsprRecordSize);
-                break;
-
-            case NSPR_RELTIME_V10:
+            switch (pletoh16(&(( nspr_header_v10_t*)&nstrace_buf[nstrace_buf_offset])->ph_RecordType))
+            {
+                GENERATE_CASE_FULL(&wth->phdr,10,100)
+                GENERATE_CASE_PART(&wth->phdr,10,100)
 
-                ns_setrelativetime(nstrace, pletohl(((nspr_abstime_v10_t *) fp)->abs_RelTime));
-                nstrace_buf_offset += pletohs(&fp->nsprRecordSize);
-                break;
+#undef GENERATE_CASE_FULL
+#undef GENERATE_CASE_PART
 
-            case NSPR_UNUSEDSPACE_V10:
+                case NSPR_ABSTIME_V10:
+                {
+                    nspr_pktracefull_v10_t *fp = (nspr_pktracefull_v10_t *) &nstrace_buf[nstrace_buf_offset];
+                    if (pletoh16(&fp->nsprRecordSize) == 0) {
+                        *err = WTAP_ERR_BAD_FILE;
+                        *err_info = g_strdup("nstrace: zero size record found");
+                        return FALSE;
+                    }
+                    ns_setabstime(nstrace, pletoh32(((nspr_abstime_v10_t *) fp)->abs_Time), pletoh32(&((nspr_abstime_v10_t *) fp)->abs_RelTime));
+                    nstrace_buf_offset += pletoh16(&fp->nsprRecordSize);
+                    break;
+                }
 
-                nstrace_buf_offset = nstrace_buflen;
-                break;
+                case NSPR_RELTIME_V10:
+                {
+                    nspr_pktracefull_v10_t *fp = (nspr_pktracefull_v10_t *) &nstrace_buf[nstrace_buf_offset];
+                    if (pletoh16(&fp->nsprRecordSize) == 0) {
+                        *err = WTAP_ERR_BAD_FILE;
+                        *err_info = g_strdup("nstrace: zero size record found");
+                        return FALSE;
+                    }
+                    ns_setrelativetime(nstrace, pletoh32(((nspr_abstime_v10_t *) fp)->abs_RelTime));
+                    nstrace_buf_offset += pletoh16(&fp->nsprRecordSize);
+                    break;
+                }
 
-            default:
+                case NSPR_UNUSEDSPACE_V10:
+                    nstrace_buf_offset = nstrace_buflen;
+                    break;
 
-                nstrace_buf_offset += pletohs(&fp->nsprRecordSize);
-                break;
+                default:
+                {
+                    nspr_pktracefull_v10_t *fp = (nspr_pktracefull_v10_t *) &nstrace_buf[nstrace_buf_offset];
+                    if (pletoh16(&fp->nsprRecordSize) == 0) {
+                        *err = WTAP_ERR_BAD_FILE;
+                        *err_info = g_strdup("nstrace: zero size record found");
+                        return FALSE;
+                    }
+                    nstrace_buf_offset += pletoh16(&fp->nsprRecordSize);
+                    break;
+                }
             }
         }
 
         nstrace_buf_offset = 0;
         nstrace->xxx_offset += nstrace_buflen;
         nstrace_buflen = GET_READ_PAGE_SIZE((nstrace->file_size - nstrace->xxx_offset));
-    }while((nstrace_buflen > 0) && (bytes_read = file_read(nstrace_buf, nstrace_buflen, wth->fh)) && (bytes_read == nstrace_buflen));
+    }while((nstrace_buflen > 0) && (nstrace_read_buf(wth->fh, nstrace_buf, nstrace_buflen, err, err_info)));
 
     return FALSE;
 }
 
-#define TIMEDEFV20(fp,type) \
+#undef PACKET_DESCRIBE
+
+#define TIMEDEFV20(phdr,fp,type) \
     do {\
-        wth->phdr.presence_flags |= WTAP_HAS_TS;\
-        nsg_creltime += ns_hrtime2nsec(pletohl(fp->type##_RelTimeHr));\
-        wth->phdr.ts.secs = nstrace->nspm_curtime + (guint32) (nsg_creltime / 1000000000);\
-        wth->phdr.ts.nsecs = (guint32) (nsg_creltime % 1000000000);\
+        (phdr)->presence_flags = WTAP_HAS_TS;\
+        nsg_creltime += ns_hrtime2nsec(pletoh32(fp->type##_RelTimeHr));\
+        (phdr)->ts.secs = nstrace->nspm_curtime + (guint32) (nsg_creltime / 1000000000);\
+        (phdr)->ts.nsecs = (guint32) (nsg_creltime % 1000000000);\
     }while(0)
 
-#define TIMEDEFV23(fp,type) \
+#define TIMEDEFV23(phdr,fp,type) \
     do {\
-        wth->phdr.presence_flags |= WTAP_HAS_TS;\
+        (phdr)->presence_flags = WTAP_HAS_TS;\
         /* access _AbsTimeHr as a 64bit value */\
-        nsg_creltime = pletohll(fp->type##_AbsTimeHr);\
-        wth->phdr.ts.secs = (guint32) (nsg_creltime / 1000000000);\
-        wth->phdr.ts.nsecs = (guint32) (nsg_creltime % 1000000000);\
+        nsg_creltime = pletoh64(fp->type##_AbsTimeHr);\
+        (phdr)->ts.secs = (guint32) (nsg_creltime / 1000000000);\
+        (phdr)->ts.nsecs = (guint32) (nsg_creltime % 1000000000);\
     }while(0)
 
-#define TIMEDEFV21(fp,type) TIMEDEFV20(fp,type)
-#define TIMEDEFV22(fp,type) TIMEDEFV20(fp,type)
-#define TIMEDEFV24(fp,type) TIMEDEFV23(fp,type)
-#define TIMEDEFV25(fp,type) TIMEDEFV24(fp,type)
-#define PPSIZEDEFV20(pp,ver) \
+#define TIMEDEFV21(phdr,fp,type) TIMEDEFV20(phdr,fp,type)
+#define TIMEDEFV22(phdr,fp,type) TIMEDEFV20(phdr,fp,type)
+#define TIMEDEFV24(phdr,fp,type) TIMEDEFV23(phdr,fp,type)
+#define TIMEDEFV25(phdr,fp,type) TIMEDEFV24(phdr,fp,type)
+#define TIMEDEFV26(phdr,fp,type) TIMEDEFV24(phdr,fp,type)
+
+/*
+** The maximum value of the record data size is 65535, which is less than
+** WTAP_MAX_PACKET_SIZE_STANDARD will ever be, so we don't need to check it.
+*/
+#define PARTSIZEDEFV20(phdr,pp,ver) \
     do {\
-        wth->phdr.presence_flags |= WTAP_HAS_CAP_LEN;\
-        wth->phdr.len = pletohs(&pp->pp_PktSizeOrg) + nspr_pktracepart_v##ver##_s;\
-        wth->phdr.caplen = nspr_getv20recordsize((nspr_hd_v20_t *)pp);\
+        (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\
+        (phdr)->len = pletoh16(&pp->pp_PktSizeOrg) + nspr_pktracepart_v##ver##_s;\
+        (phdr)->caplen = nspr_getv20recordsize((nspr_hd_v20_t *)pp);\
     }while(0)
 
-#define PPSIZEDEFV21(pp,ver) PPSIZEDEFV20(pp,ver)
-#define PPSIZEDEFV22(pp,ver) PPSIZEDEFV20(pp,ver)
-#define PPSIZEDEFV23(pp,ver) PPSIZEDEFV20(pp,ver)
-#define PPSIZEDEFV24(pp,ver) PPSIZEDEFV20(pp,ver)
-#define PPSIZEDEFV25(pp,ver) PPSIZEDEFV20(pp,ver)
+#define PARTSIZEDEFV21(phdr,pp,ver) PARTSIZEDEFV20(phdr,pp,ver)
+#define PARTSIZEDEFV22(phdr,pp,ver) PARTSIZEDEFV20(phdr,pp,ver)
+#define PARTSIZEDEFV23(phdr,pp,ver) PARTSIZEDEFV20(phdr,pp,ver)
+#define PARTSIZEDEFV24(phdr,pp,ver) PARTSIZEDEFV20(phdr,pp,ver)
+#define PARTSIZEDEFV25(phdr,pp,ver) PARTSIZEDEFV20(phdr,pp,ver)
+#define PARTSIZEDEFV26(phdr,pp,ver) PARTSIZEDEFV20(phdr,pp,ver)
 
-#define FPSIZEDEFV20(fp,ver)\
+#define FULLSIZEDEFV20(phdr,fp,ver)\
     do {\
-        wth->phdr.len = nspr_getv20recordsize((nspr_hd_v20_t *)fp);\
-        wth->phdr.caplen = wth->phdr.len;\
+        (phdr)->len = nspr_getv20recordsize((nspr_hd_v20_t *)fp);\
+        (phdr)->caplen = (phdr)->len;\
     }while(0)
 
-#define FPSIZEDEFV21(pp,ver) FPSIZEDEFV20(fp,ver)
-#define FPSIZEDEFV22(pp,ver) FPSIZEDEFV20(fp,ver)
-#define FPSIZEDEFV23(pp,ver) FPSIZEDEFV20(fp,ver)
-#define FPSIZEDEFV24(pp,ver) FPSIZEDEFV20(fp,ver)
-#define FPSIZEDEFV25(pp,ver) FPSIZEDEFV20(fp,ver)
+#define FULLSIZEDEFV21(phdr,fp,ver) FULLSIZEDEFV20(phdr,fp,ver)
+#define FULLSIZEDEFV22(phdr,fp,ver) FULLSIZEDEFV20(phdr,fp,ver)
+#define FULLSIZEDEFV23(phdr,fp,ver) FULLSIZEDEFV20(phdr,fp,ver)
+#define FULLSIZEDEFV24(phdr,fp,ver) FULLSIZEDEFV20(phdr,fp,ver)
+#define FULLSIZEDEFV25(phdr,fp,ver) FULLSIZEDEFV20(phdr,fp,ver)
+#define FULLSIZEDEFV26(phdr,fp,ver) FULLSIZEDEFV20(phdr,fp,ver)
 
-#define PACKET_DESCRIBE(phdr,FPTIMEDEF,SIZEDEF,ver,enumprefix,type,structname,TYPE)\
+#define PACKET_DESCRIBE(phdr,FULLPART,ver,enumprefix,type,structname,HEADERVER)\
     do {\
         nspr_##structname##_t *fp= (nspr_##structname##_t*)&nstrace_buf[nstrace_buf_offset];\
-        TIMEDEFV##ver(fp,type);\
-        SIZEDEF##ver(fp,ver);\
+        /* Make sure the record header is entirely contained in the page */\
+        if ((nstrace_buflen - nstrace_buf_offset) < sizeof *fp) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record header crosses page boundary");\
+            return FALSE;\
+        }\
+        /* Check sanity of record size */\
+        if (nspr_getv20recordsize((nspr_hd_v20_t *)fp) < sizeof *fp) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record size is less than record header size");\
+            return FALSE;\
+        }\
+        (phdr)->rec_type = REC_TYPE_PACKET;\
+        TIMEDEFV##ver((phdr),fp,type);\
+        FULLPART##SIZEDEFV##ver((phdr),fp,ver);\
         TRACE_V##ver##_REC_LEN_OFF((phdr),enumprefix,type,structname);\
-        buffer_assure_space(wth->frame_buffer, (phdr)->caplen);\
-        memcpy(buffer_start_ptr(wth->frame_buffer), fp, (phdr)->caplen);\
+        (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##HEADERVER;\
+        /* Make sure the record is entirely contained in the page */\
+        if ((nstrace_buflen - nstrace_buf_offset) < (phdr)->caplen) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record crosses page boundary");\
+            return FALSE;\
+        }\
+        ws_buffer_assure_space(wth->frame_buffer, (phdr)->caplen);\
+        memcpy(ws_buffer_start_ptr(wth->frame_buffer), fp, (phdr)->caplen);\
         *data_offset = nstrace->xxx_offset + nstrace_buf_offset;\
         nstrace->nstrace_buf_offset = nstrace_buf_offset + nspr_getv20recordsize((nspr_hd_v20_t *)fp);\
         nstrace->nstrace_buflen = nstrace_buflen;\
         nstrace->nsg_creltime = nsg_creltime;\
-        (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##TYPE;\
         return TRUE;\
     }while(0)
 
@@ -941,76 +1203,87 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 *
     nstrace_t *nstrace = (nstrace_t *)wth->priv;
     guint64 nsg_creltime = nstrace->nsg_creltime;
     gchar *nstrace_buf = nstrace->pnstrace_buf;
-    gint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;
-    gint32 nstrace_buflen = nstrace->nstrace_buflen;
-    nspr_pktracefull_v20_t *fp20;
-    nspr_pktracefull_v21_t *fp21;
-    int bytes_read;
+    guint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;
+    guint32 nstrace_buflen = nstrace->nstrace_buflen;
 
     *err = 0;
     *err_info = NULL;
     do
     {
         while ((nstrace_buf_offset < nstrace_buflen) &&
-            ((nstrace_buflen - nstrace_buf_offset) >= ((gint32)sizeof(fp21->fp_RecordType))))
+            ((nstrace_buflen - nstrace_buf_offset) >= ((gint32)sizeof((( nspr_hd_v20_t*)&nstrace_buf[nstrace_buf_offset])->phd_RecordType))))
         {
-            fp21 = (nspr_pktracefull_v21_t *) &nstrace_buf[nstrace_buf_offset];
-
-            switch (fp21->fp_RecordType)
+            switch ((( nspr_hd_v20_t*)&nstrace_buf[nstrace_buf_offset])->phd_RecordType)
             {
 
-#define GENERATE_CASE(phdr,type,acttype) \
-        case NSPR_PDPKTRACEFULLTX_V##type:\
-        case NSPR_PDPKTRACEFULLTXB_V##type:\
-        case NSPR_PDPKTRACEFULLRX_V##type:\
-            PACKET_DESCRIBE(phdr,TIMEDEF,FPSIZEDEFV,type,v##type##_full,fp,pktracefull_v##type,acttype);
-#define GENERATE_CASE_V25(phdr,type,acttype) \
-        case NSPR_PDPKTRACEFULLTX_V##type:\
-        case NSPR_PDPKTRACEFULLTXB_V##type:\
-        case NSPR_PDPKTRACEFULLRX_V##type:\
-        case NSPR_PDPKTRACEFULLNEWRX_V##type:\
-            PACKET_DESCRIBE(phdr,TIMEDEF,FPSIZEDEFV,type,v##type##_full,fp,pktracefull_v##type,acttype);
-                GENERATE_CASE_V25(&wth->phdr,25,205);
-                GENERATE_CASE_V25(&wth->phdr,24,204);
-                GENERATE_CASE(&wth->phdr,23,203);
-                GENERATE_CASE(&wth->phdr,22,202);
-                GENERATE_CASE(&wth->phdr,21,201);
-                GENERATE_CASE(&wth->phdr,20,200);
-#undef GENERATE_CASE
-#undef GENERATE_CASE_V25
-
-#define GENERATE_CASE(phdr,type,acttype) \
-        case NSPR_PDPKTRACEPARTTX_V##type:\
-        case NSPR_PDPKTRACEPARTTXB_V##type:\
-        case NSPR_PDPKTRACEPARTRX_V##type:\
-            PACKET_DESCRIBE(phdr,TIMEDEF,PPSIZEDEFV,type,v##type##_part,pp,pktracepart_v##type,acttype);
-#define GENERATE_CASE_V25(phdr,type,acttype) \
-        case NSPR_PDPKTRACEPARTTX_V##type:\
-        case NSPR_PDPKTRACEPARTTXB_V##type:\
-        case NSPR_PDPKTRACEPARTRX_V##type:\
-        case NSPR_PDPKTRACEPARTNEWRX_V##type:\
-            PACKET_DESCRIBE(phdr,TIMEDEF,PPSIZEDEFV,type,v##type##_part,pp,pktracepart_v##type,acttype);
-                GENERATE_CASE_V25(&wth->phdr,25,205);
-                GENERATE_CASE_V25(&wth->phdr,24,204);
-                GENERATE_CASE(&wth->phdr,23,203);
-                GENERATE_CASE(&wth->phdr,22,202);
-                GENERATE_CASE(&wth->phdr,21,201);
-                GENERATE_CASE(&wth->phdr,20,200);
-#undef GENERATE_CASE
-#undef GENERATE_CASE_V25
+#define GENERATE_CASE_FULL(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
+
+#define GENERATE_CASE_FULL_V25(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+        case NSPR_PDPKTRACEFULLNEWRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
+
+#define GENERATE_CASE_PART(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEPARTTX_V##ver:\
+        case NSPR_PDPKTRACEPARTTXB_V##ver:\
+        case NSPR_PDPKTRACEPARTRX_V##ver:\
+            PACKET_DESCRIBE(phdr,PART,ver,v##ver##_part,pp,pktracepart_v##ver,HEADERVER);
+
+#define GENERATE_CASE_PART_V25(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEPARTTX_V##ver:\
+        case NSPR_PDPKTRACEPARTTXB_V##ver:\
+        case NSPR_PDPKTRACEPARTRX_V##ver:\
+        case NSPR_PDPKTRACEPARTNEWRX_V##ver:\
+            PACKET_DESCRIBE(phdr,PART,ver,v##ver##_part,pp,pktracepart_v##ver,HEADERVER);
+
+                GENERATE_CASE_FULL(&wth->phdr,20,200);
+                GENERATE_CASE_PART(&wth->phdr,20,200);
+                GENERATE_CASE_FULL(&wth->phdr,21,201);
+                GENERATE_CASE_PART(&wth->phdr,21,201);
+                GENERATE_CASE_FULL(&wth->phdr,22,202);
+                GENERATE_CASE_PART(&wth->phdr,22,202);
+                GENERATE_CASE_FULL(&wth->phdr,23,203);
+                GENERATE_CASE_PART(&wth->phdr,23,203);
+                GENERATE_CASE_FULL_V25(&wth->phdr,24,204);
+                GENERATE_CASE_PART_V25(&wth->phdr,24,204);
+                GENERATE_CASE_FULL_V25(&wth->phdr,25,205);
+                GENERATE_CASE_PART_V25(&wth->phdr,25,205);
+                GENERATE_CASE_FULL_V25(&wth->phdr,26,206);
+                GENERATE_CASE_PART_V25(&wth->phdr,26,206);
+
+#undef GENERATE_CASE_FULL
+#undef GENERATE_CASE_FULL_V25
+#undef GENERATE_CASE_PART
+#undef GENERATE_CASE_PART_V25
 
                 case NSPR_ABSTIME_V20:
                 {
-                    fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset];
+                    nspr_pktracefull_v20_t *fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset];
+                    if (nspr_getv20recordsize((nspr_hd_v20_t *)fp20) == 0) {
+                        *err = WTAP_ERR_BAD_FILE;
+                        *err_info = g_strdup("nstrace: zero size record found");
+                        return FALSE;
+                    }
                     nstrace_buf_offset += nspr_getv20recordsize((nspr_hd_v20_t *)fp20);
-                    ns_setabstime(nstrace, pletohl(&((nspr_abstime_v20_t *) fp20)->abs_Time), pletohs(&((nspr_abstime_v20_t *) fp20)->abs_RelTime));
+                    ns_setabstime(nstrace, pletoh32(&((nspr_abstime_v20_t *) fp20)->abs_Time), pletoh16(&((nspr_abstime_v20_t *) fp20)->abs_RelTime));
                     break;
                 }
 
                 case NSPR_RELTIME_V20:
                 {
-                    fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset];
-                    ns_setrelativetime(nstrace, pletohs(&((nspr_abstime_v20_t *) fp20)->abs_RelTime));
+                    nspr_pktracefull_v20_t *fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset];
+                    if (nspr_getv20recordsize((nspr_hd_v20_t *)fp20) == 0) {
+                        *err = WTAP_ERR_BAD_FILE;
+                        *err_info = g_strdup("nstrace: zero size record found");
+                        return FALSE;
+                    }
+                    ns_setrelativetime(nstrace, pletoh16(&((nspr_abstime_v20_t *) fp20)->abs_RelTime));
                     nstrace_buf_offset += nspr_getv20recordsize((nspr_hd_v20_t *)fp20);
                     break;
                   }
@@ -1026,7 +1299,12 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 *
 
                 default:
                 {
-                    fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset];
+                    nspr_pktracefull_v20_t *fp20 = (nspr_pktracefull_v20_t *) &nstrace_buf[nstrace_buf_offset];
+                    if (nspr_getv20recordsize((nspr_hd_v20_t *)fp20) == 0) {
+                        *err = WTAP_ERR_BAD_FILE;
+                        *err_info = g_strdup("nstrace: zero size record found");
+                        return FALSE;
+                    }
                     nstrace_buf_offset += nspr_getv20recordsize((nspr_hd_v20_t *)fp20);
                     break;
                 }
@@ -1036,27 +1314,237 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 *
         nstrace_buf_offset = 0;
         nstrace->xxx_offset += nstrace_buflen;
         nstrace_buflen = GET_READ_PAGE_SIZE((nstrace->file_size - nstrace->xxx_offset));
-    }while((nstrace_buflen > 0) && (bytes_read = file_read(nstrace_buf, nstrace_buflen, wth->fh)) && (bytes_read == nstrace_buflen));
+    }while((nstrace_buflen > 0) && (nstrace_read_buf(wth->fh, nstrace_buf, nstrace_buflen, err, err_info)));
 
     return FALSE;
 }
 
-static gboolean nstrace_read(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
+#undef PACKET_DESCRIBE
+
+#define SETETHOFFSET_35(phdr)\
+  (phdr)->pseudo_header.nstr.eth_offset = pletoh16(&fp->fp_headerlen);\
+
+#define SETETHOFFSET_30(phdr) ;\
+
+#define TIMEDEFV30(phdr,fp,type) \
+    do {\
+        (phdr)->presence_flags = WTAP_HAS_TS;\
+        /* access _AbsTimeHr as a 64bit value */\
+        nsg_creltime = pletoh64(fp->type##_AbsTimeHr);\
+        (phdr)->ts.secs = (guint32) (nsg_creltime / 1000000000);\
+        (phdr)->ts.nsecs = (guint32) (nsg_creltime % 1000000000);\
+    }while(0)
+
+#define TIMEDEFV35 TIMEDEFV30
+
+/*
+** The maximum value of the record data size is 65535, which is less than
+** WTAP_MAX_PACKET_SIZE_STANDARD will ever be, so we don't need to check it.
+*/
+#define FULLSIZEDEFV30(phdr,fp,ver)\
+    do {\
+        (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\
+        (phdr)->len = pletoh16(&fp->fp_PktSizeOrg) + nspr_pktracefull_v##ver##_s + fp->fp_src_vmname_len + fp->fp_dst_vmname_len;\
+        (phdr)->caplen = nspr_getv20recordsize((nspr_hd_v20_t *)fp);\
+    }while(0)
+
+#define FULLSIZEDEFV35(phdr,fp,ver)\
+    do {\
+        (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\
+        (phdr)->len = pletoh16(&fp->fp_PktSizeOrg) + pletoh16(&fp->fp_headerlen);\
+        (phdr)->caplen = nspr_getv20recordsize((nspr_hd_v20_t *)fp);\
+    }while(0)
+
+#define PACKET_DESCRIBE(phdr,FULLPART,ver,enumprefix,type,structname,HEADERVER)\
+    do {\
+        nspr_##structname##_t *fp = (nspr_##structname##_t *) &nstrace_buf[nstrace_buf_offset];\
+        /* Make sure the record header is entirely contained in the page */\
+        if ((nstrace->nstrace_buflen - nstrace_buf_offset) < sizeof *fp) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record header crosses page boundary");\
+            g_free(nstrace_tmpbuff);\
+            return FALSE;\
+        }\
+        (phdr)->rec_type = REC_TYPE_PACKET;\
+        TIMEDEFV##ver((phdr),fp,type);\
+        FULLPART##SIZEDEFV##ver((phdr),fp,ver);\
+        TRACE_V##ver##_REC_LEN_OFF((phdr),enumprefix,type,structname);\
+        SETETHOFFSET_##ver(phdr)\
+        (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##HEADERVER;\
+        /* Check sanity of record size */\
+        if ((phdr)->caplen < sizeof *fp) {\
+            *err = WTAP_ERR_BAD_FILE;\
+            *err_info = g_strdup("nstrace: record size is less than record header size");\
+            g_free(nstrace_tmpbuff);\
+            return FALSE;\
+        }\
+        ws_buffer_assure_space(wth->frame_buffer, (phdr)->caplen);\
+        *data_offset = nstrace->xxx_offset + nstrace_buf_offset;\
+        /* Copy record header */\
+        while (nstrace_tmpbuff_off < nspr_##structname##_s) {\
+            nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\
+        }\
+        nst_dataSize = nspr_getv20recordsize(hdp);\
+        rec_size = nst_dataSize - nstrace_tmpbuff_off;\
+        nsg_nextPageOffset = ((nstrace_buf_offset + rec_size) >= (guint)nstrace->nstrace_buflen) ?\
+        ((nstrace_buf_offset + rec_size) - (NSPR_PAGESIZE_TRACE - 1)) : 0;\
+        /* Copy record data */\
+        while (nsg_nextPageOffset) {\
+            /* Copy everything from this page */\
+            while (nstrace_buf_offset < nstrace->nstrace_buflen) {\
+                nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\
+            }\
+            nstrace->xxx_offset += nstrace_buflen;\
+            nstrace_buflen = NSPR_PAGESIZE_TRACE;\
+            /* Read the next page */\
+            bytes_read = file_read(nstrace_buf, NSPR_PAGESIZE_TRACE, wth->fh);\
+            if ( !file_eof(wth->fh) && bytes_read != NSPR_PAGESIZE_TRACE) {\
+                g_free(nstrace_tmpbuff);\
+                return FALSE;\
+            } else {\
+                nstrace_buf_offset = 0;\
+            }\
+            nstrace_buflen = bytes_read;\
+            rec_size = nst_dataSize - nstrace_tmpbuff_off;\
+            nsg_nextPageOffset = ((nstrace_buf_offset + rec_size) >= (guint)nstrace->nstrace_buflen) ?\
+            ((nstrace_buf_offset + rec_size) - (NSPR_PAGESIZE_TRACE- 1)): 0;\
+        } \
+        /* Copy the rest of the record */\
+        while (nstrace_tmpbuff_off < nst_dataSize) {\
+            nstrace_tmpbuff[nstrace_tmpbuff_off++] = nstrace_buf[nstrace_buf_offset++];\
+        }\
+        memcpy(ws_buffer_start_ptr(wth->frame_buffer), nstrace_tmpbuff, (phdr)->caplen);\
+        nstrace->nstrace_buf_offset = nstrace_buf_offset;\
+        nstrace->nstrace_buflen = nstrace_buflen;\
+        nstrace->nsg_creltime = nsg_creltime;\
+        g_free(nstrace_tmpbuff);\
+        return TRUE;\
+    } while(0)
+
+static gboolean nstrace_read_v30(wtap *wth, int *err, gchar **err_info, gint64 *data_offset)
 {
+    nstrace_t *nstrace = (nstrace_t *)wth->priv;
+    guint64 nsg_creltime;
+    gchar *nstrace_buf = nstrace->pnstrace_buf;
+    guint32 nstrace_buf_offset = nstrace->nstrace_buf_offset;
+    guint32 nstrace_buflen = nstrace->nstrace_buflen;
+    guint8* nstrace_tmpbuff;
+    guint32 nstrace_tmpbuff_off=0,nst_dataSize=0,rec_size=0,nsg_nextPageOffset=0;
+    nspr_hd_v20_t *hdp;
+    int bytes_read = 0;
+    *err = 0;
+    *err_info = NULL;
+    if(nstrace_buflen == 0){
+      return FALSE; /* Reached End Of File */
+    }
+
+    nstrace_tmpbuff = (guint8*)g_malloc(65536);
 
-    if (wth->file_type == WTAP_FILE_NETSCALER_1_0)
-        return nstrace_read_v10(wth, err, err_info, data_offset);
-    else if (wth->file_type == WTAP_FILE_NETSCALER_2_0)
-        return nstrace_read_v20(wth, err, err_info, data_offset);
+    do
+    {
+        if (!nstrace_buf[nstrace_buf_offset] && nstrace_buf_offset <= NSPR_PAGESIZE_TRACE){
+            nstrace_buf_offset = NSPR_PAGESIZE_TRACE;
+        }
+        if (file_eof(wth->fh) && bytes_read > 0 && bytes_read < NSPR_PAGESIZE_TRACE){
+            memset(&nstrace_buf[bytes_read], 0, NSPR_PAGESIZE_TRACE-bytes_read);
+        }
+        while ((nstrace_buf_offset < NSPR_PAGESIZE_TRACE) &&
+            nstrace_buf[nstrace_buf_offset])
+        {
+            hdp = (nspr_hd_v20_t *) &nstrace_buf[nstrace_buf_offset];
+            if (nspr_getv20recordsize(hdp) == 0) {
+                *err = WTAP_ERR_BAD_FILE;
+                *err_info = g_strdup("nstrace: zero size record found");
+                g_free(nstrace_tmpbuff);
+                return FALSE;
+            }
+            switch (hdp->phd_RecordType)
+            {
+
+#define GENERATE_CASE_FULL_V30(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+        case NSPR_PDPKTRACEFULLNEWRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
+
+                GENERATE_CASE_FULL_V30(&wth->phdr,30,300);
+
+#undef GENERATE_CASE_FULL_V30
+
+#define GENERATE_CASE_FULL_V35(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+        case NSPR_PDPKTRACEFULLNEWRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
+                GENERATE_CASE_FULL_V35(&wth->phdr,35,350);
+
+#undef GENERATE_CASE_FULL_V35
+
+                case NSPR_ABSTIME_V20:
+                {
+                    nstrace_buf_offset += nspr_getv20recordsize(hdp);
+                    ns_setabstime(nstrace, pletoh32(&((nspr_abstime_v20_t *) &nstrace_buf[nstrace_buf_offset])->abs_Time), pletoh16(&((nspr_abstime_v20_t *) &nstrace_buf[nstrace_buf_offset])->abs_RelTime));
+                    break;
+                }
+
+                case NSPR_RELTIME_V20:
+                {
+                    ns_setrelativetime(nstrace, pletoh16(&((nspr_abstime_v20_t *) &nstrace_buf[nstrace_buf_offset])->abs_RelTime));
+                    nstrace_buf_offset += nspr_getv20recordsize(hdp);
+                    break;
+                }
+
+                default:
+                {
+                    nstrace_buf_offset += nspr_getv20recordsize(hdp);
+                    break;
+                }
+            }
+        }
+        nstrace_buf_offset = 0;
+        nstrace->xxx_offset += nstrace_buflen;
+        nstrace_buflen = NSPR_PAGESIZE_TRACE;
+    } while((nstrace_buflen > 0) && (bytes_read = file_read(nstrace_buf, nstrace_buflen, wth->fh)) > 0 && (file_eof(wth->fh) || (guint32)bytes_read == nstrace_buflen));
 
+    if (bytes_read < 0)
+        *err = file_error(wth->fh, err_info);
+    else
+        *err = 0;
+    g_free(nstrace_tmpbuff);
     return FALSE;
 }
 
-static gboolean nstrace_seek_read(wtap *wth, gint64 seek_off,
-    struct wtap_pkthdr *phdr, guint8 *pd, int length,
-    int *err, gchar **err_info)
+#undef PACKET_DESCRIBE
+
+/*
+ * XXX - for these, we can't set the time stamp in the seek-read
+ * routine, because the time stamps are relative.
+ */
+#undef TIMEDEFV10
+#define TIMEDEFV10(phdr,fp,type) \
+    do {\
+        (phdr)->presence_flags = 0;\
+    }while(0)
+
+#define PACKET_DESCRIBE(phdr,FULLPART,fullpart,ver,type,HEADERVER) \
+    do {\
+        nspr_pktrace##fullpart##_v##ver##_t *type = (nspr_pktrace##fullpart##_v##ver##_t *) pd;\
+        (phdr)->rec_type = REC_TYPE_PACKET;\
+        TIMEDEFV##ver((phdr),fp,type);\
+        FULLPART##SIZEDEFV##ver((phdr),type,ver);\
+        TRACE_V##ver##_REC_LEN_OFF(phdr,v##ver##_##fullpart,type,pktrace##fullpart##_v##ver);\
+        (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##HEADERVER;\
+    }while(0)
+
+static gboolean nstrace_seek_read_v10(wtap *wth, gint64 seek_off,
+    struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
 {
-    int bytes_read;
+    nspr_hd_v10_t hdr;
+    guint record_length;
+    guint8 *pd;
+    unsigned int bytes_to_read;
 
     *err = 0;
 
@@ -1064,80 +1552,282 @@ static gboolean nstrace_seek_read(wtap *wth, gint64 seek_off,
         return FALSE;
 
     /*
-    ** Read the packet data.
+    ** Read the record header.
     */
-    bytes_read = file_read(pd, length, wth->random_fh);
-    if (bytes_read != length) {
-        *err = file_error(wth->random_fh, err_info);
-        if (*err == 0)
-            *err = WTAP_ERR_SHORT_READ;
+    if (!wtap_read_bytes(wth->random_fh, (void *)&hdr, sizeof hdr,
+                         err, err_info))
         return FALSE;
-    }
 
-    if (wth->file_type == WTAP_FILE_NETSCALER_1_0)
-    {
+    /*
+    ** Get the record length.
+    */
+    record_length = nspr_getv10recordsize(&hdr);
 
-#define GENERATE_CASE_FULL(phdr,type,acttype) \
+    /*
+    ** Copy the header to the buffer and read the rest of the record..
+    */
+    ws_buffer_assure_space(buf, record_length);
+    pd = ws_buffer_start_ptr(buf);
+    memcpy(pd, (void *)&hdr, sizeof hdr);
+    if (record_length > sizeof hdr) {
+        bytes_to_read = (unsigned int)(record_length - sizeof hdr);
+        if (!wtap_read_bytes(wth->random_fh, pd + sizeof hdr, bytes_to_read,
+                             err, err_info))
+            return FALSE;
+    }
+
+    /*
+    ** Fill in what part of the struct wtap_pkthdr we can.
+    */
+#define GENERATE_CASE_FULL(phdr,type,HEADERVER) \
         case NSPR_PDPKTRACEFULLTX_V##type:\
         case NSPR_PDPKTRACEFULLTXB_V##type:\
         case NSPR_PDPKTRACEFULLRX_V##type:\
-            TRACE_V##type##_REC_LEN_OFF(phdr,v##type##_full,fp,pktracefull_v##type);\
-            (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##acttype;\
-            break;\
+            PACKET_DESCRIBE(phdr,FULL,full,type,fp,HEADERVER);\
+            break;
 
-#define GENERATE_CASE_PART(phdr,type,acttype) \
+#define GENERATE_CASE_PART(phdr,type,HEADERVER) \
         case NSPR_PDPKTRACEPARTTX_V##type:\
         case NSPR_PDPKTRACEPARTTXB_V##type:\
         case NSPR_PDPKTRACEPARTRX_V##type:\
-            TRACE_V##type##_REC_LEN_OFF(phdr,v##type##_part,pp,pktracepart_v##type);\
-            (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##acttype;\
-            break;\
+            PACKET_DESCRIBE(phdr,PART,part,type,pp,HEADERVER);\
+            break;
 
-        switch (pletohs(&(( nspr_header_v10_t*)pd)->ph_RecordType))
-        {
-            GENERATE_CASE_FULL(phdr,10,100)
-            GENERATE_CASE_PART(phdr,10,100)
-        }
-    } else if (wth->file_type == WTAP_FILE_NETSCALER_2_0)
+    switch (pletoh16(&(( nspr_header_v10_t*)pd)->ph_RecordType))
     {
-#define GENERATE_CASE_FULL_V25(phdr,type,acttype) \
-        case NSPR_PDPKTRACEFULLTX_V##type:\
-        case NSPR_PDPKTRACEFULLTXB_V##type:\
-        case NSPR_PDPKTRACEFULLRX_V##type:\
-        case NSPR_PDPKTRACEFULLNEWRX_V##type:\
-            TRACE_V##type##_REC_LEN_OFF(phdr,v##type##_full,fp,pktracefull_v##type);\
-            (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##acttype;\
-            break;\
+        GENERATE_CASE_FULL(phdr,10,100)
+        GENERATE_CASE_PART(phdr,10,100)
+    }
 
-#define GENERATE_CASE_PART_V25(phdr,type,acttype) \
-        case NSPR_PDPKTRACEPARTTX_V##type:\
-        case NSPR_PDPKTRACEPARTTXB_V##type:\
-        case NSPR_PDPKTRACEPARTRX_V##type:\
-        case NSPR_PDPKTRACEPARTNEWRX_V##type:\
-            TRACE_V##type##_REC_LEN_OFF(phdr,v##type##_part,pp,pktracepart_v##type);\
-            (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##acttype;\
-            break;\
+#undef GENERATE_CASE_FULL
+#undef GENERATE_CASE_PART
+
+    return TRUE;
+}
+
+#undef PACKET_DESCRIBE
+
+/*
+ * XXX - for these, we can't set the time stamp in the seek-read
+ * routine, because the time stamps are relative.
+ */
+#undef TIMEDEFV20
+#define TIMEDEFV20(phdr,fp,type) \
+    do {\
+        (phdr)->presence_flags = 0;\
+    }while(0)
+
+#undef TIMEDEFV21
+#undef TIMEDEFV22
+#define TIMEDEFV21(phdr,fp,type) TIMEDEFV20(phdr,fp,type)
+#define TIMEDEFV22(phdr,fp,type) TIMEDEFV20(phdr,fp,type)
+
+#define PACKET_DESCRIBE(phdr,FULLPART,ver,enumprefix,type,structname,HEADERVER)\
+    do {\
+        nspr_##structname##_t *fp= (nspr_##structname##_t*)pd;\
+        (phdr)->rec_type = REC_TYPE_PACKET;\
+        TIMEDEFV##ver((phdr),fp,type);\
+        FULLPART##SIZEDEFV##ver((phdr),fp,ver);\
+        TRACE_V##ver##_REC_LEN_OFF((phdr),enumprefix,type,structname);\
+        (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##HEADERVER;\
+        return TRUE;\
+    }while(0)
+
+static gboolean nstrace_seek_read_v20(wtap *wth, gint64 seek_off,
+    struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
+{
+    nspr_hd_v20_t hdr;
+    guint record_length;
+    guint hdrlen;
+    guint8 *pd;
+    unsigned int bytes_to_read;
+    guint64 nsg_creltime;
+
+    *err = 0;
+
+    if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
+        return FALSE;
+
+    /*
+    ** Read the first 2 bytes of the record header.
+    */
+    if (!wtap_read_bytes(wth->random_fh, (void *)&hdr, 2, err, err_info))
+        return FALSE;
+    hdrlen = 2;
+
+    /*
+    ** Is there a third byte?  If so, read it.
+    */
+    if (hdr.phd_RecordSizeLow & NSPR_V20RECORDSIZE_2BYTES) {
+        if (!wtap_read_bytes(wth->random_fh, (void *)&hdr.phd_RecordSizeHigh, 1,
+                             err, err_info))
+            return FALSE;
+        hdrlen = 3;
+    }
+
+    /*
+    ** Get the record length.
+    */
+    record_length = nspr_getv20recordsize(&hdr);
+
+    /*
+    ** Copy the header to the buffer and read the rest of the record..
+    */
+    ws_buffer_assure_space(buf, record_length);
+    pd = ws_buffer_start_ptr(buf);
+    memcpy(pd, (void *)&hdr, hdrlen);
+    if (record_length > hdrlen) {
+        bytes_to_read = (unsigned int)(record_length - hdrlen);
+        if (!wtap_read_bytes(wth->random_fh, pd + hdrlen, bytes_to_read,
+                             err, err_info))
+            return FALSE;
+    }
+
+#define GENERATE_CASE_FULL(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
+
+#define GENERATE_CASE_FULL_V25(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEFULLTX_V##ver:\
+        case NSPR_PDPKTRACEFULLTXB_V##ver:\
+        case NSPR_PDPKTRACEFULLRX_V##ver:\
+        case NSPR_PDPKTRACEFULLNEWRX_V##ver:\
+            PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
+
+#define GENERATE_CASE_PART(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEPARTTX_V##ver:\
+        case NSPR_PDPKTRACEPARTTXB_V##ver:\
+        case NSPR_PDPKTRACEPARTRX_V##ver:\
+            PACKET_DESCRIBE(phdr,PART,ver,v##ver##_part,pp,pktracepart_v##ver,HEADERVER);
+
+#define GENERATE_CASE_PART_V25(phdr,ver,HEADERVER) \
+        case NSPR_PDPKTRACEPARTTX_V##ver:\
+        case NSPR_PDPKTRACEPARTTXB_V##ver:\
+        case NSPR_PDPKTRACEPARTRX_V##ver:\
+        case NSPR_PDPKTRACEPARTNEWRX_V##ver:\
+            PACKET_DESCRIBE(phdr,PART,ver,v##ver##_part,pp,pktracepart_v##ver,HEADERVER);
+
+    switch ((( nspr_hd_v20_t*)pd)->phd_RecordType)
+    {
+        GENERATE_CASE_FULL(phdr,20,200)
+        GENERATE_CASE_PART(phdr,20,200)
+        GENERATE_CASE_FULL(phdr,21,201)
+        GENERATE_CASE_PART(phdr,21,201)
+        GENERATE_CASE_FULL(phdr,22,202)
+        GENERATE_CASE_PART(phdr,22,202)
+        GENERATE_CASE_FULL(phdr,23,203)
+        GENERATE_CASE_PART(phdr,23,203)
+        GENERATE_CASE_FULL_V25(phdr,24,204)
+        GENERATE_CASE_PART_V25(phdr,24,204)
+        GENERATE_CASE_FULL_V25(phdr,25,205)
+        GENERATE_CASE_PART_V25(phdr,25,205)
+        GENERATE_CASE_FULL_V25(phdr,26,206)
+        GENERATE_CASE_PART_V25(phdr,26,206)
+    }
+
+#undef GENERATE_CASE_FULL
+#undef GENERATE_CASE_FULL_V25
+#undef GENERATE_CASE_PART
+#undef GENERATE_CASE_PART_V25
+
+    return TRUE;
+}
+
+#undef PACKET_DESCRIBE
+#undef SETETHOFFSET_35
+#undef SETETHOFFSET_30
+
+#define SETETHOFFSET_35(phdr)\
+   {\
+    (phdr)->pseudo_header.nstr.eth_offset = pletoh16(&fp->fp_headerlen);\
+   }
+
+#define SETETHOFFSET_30(phdr) ;\
+
+#define PACKET_DESCRIBE(phdr,FULLPART,ver,enumprefix,type,structname,HEADERVER)\
+    do {\
+        nspr_##structname##_t *fp= (nspr_##structname##_t*)pd;\
+        (phdr)->rec_type = REC_TYPE_PACKET;\
+        TIMEDEFV##ver((phdr),fp,type);\
+        SETETHOFFSET_##ver(phdr);\
+        FULLPART##SIZEDEFV##ver((phdr),fp,ver);\
+        TRACE_V##ver##_REC_LEN_OFF((phdr),enumprefix,type,structname);\
+        (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##HEADERVER;\
+        return TRUE;\
+    }while(0)
+
+static gboolean nstrace_seek_read_v30(wtap *wth, gint64 seek_off,
+    struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
+{
+    nspr_hd_v20_t hdr;
+    guint record_length;
+    guint hdrlen;
+    guint8 *pd;
+    unsigned int bytes_to_read;
+    guint64 nsg_creltime;
+
+    *err = 0;
+
+    if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
+        return FALSE;
+    /*
+    ** Read the first 2 bytes of the record header.
+    */
+    if (!wtap_read_bytes(wth->random_fh, (void *)&hdr, 2, err, err_info))
+        return FALSE;
+    hdrlen = 2;
+
+    /*
+    ** Is there a third byte?  If so, read it.
+    */
+    if (hdr.phd_RecordSizeLow & NSPR_V20RECORDSIZE_2BYTES) {
+        if (!wtap_read_bytes(wth->random_fh, (void *)&hdr.phd_RecordSizeHigh, 1,
+                             err, err_info))
+            return FALSE;
+        hdrlen = 3;
+    }
+
+    /*
+    ** Get the record length.
+    ** The maximum value of the record data size is 65535, which is less
+    ** than WTAP_MAX_PACKET_SIZE_STANDARD will ever be, so we don't need to check it.
+    */
+    record_length = nspr_getv20recordsize(&hdr);
+
+    /*
+    ** Copy the header to the buffer and read the rest of the record..
+    */
+    ws_buffer_assure_space(buf, record_length);
+    pd = ws_buffer_start_ptr(buf);
+    memcpy(pd, (void *)&hdr, hdrlen);
+    if (record_length > hdrlen) {
+        bytes_to_read = (unsigned int)(record_length - hdrlen);
+        if (!wtap_read_bytes(wth->random_fh, pd + hdrlen, bytes_to_read,
+                             err, err_info))
+            return FALSE;
+    }
+
+    (phdr)->caplen = (phdr)->len = record_length;
+
+#define GENERATE_CASE_V30(phdr,ver,HEADERVER) \
+    case NSPR_PDPKTRACEFULLTX_V##ver:\
+    case NSPR_PDPKTRACEFULLTXB_V##ver:\
+    case NSPR_PDPKTRACEFULLRX_V##ver:\
+    case NSPR_PDPKTRACEFULLNEWRX_V##ver:\
+        PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER);
 
         switch ((( nspr_hd_v20_t*)pd)->phd_RecordType)
         {
-            GENERATE_CASE_FULL(phdr,20,200)
-            GENERATE_CASE_PART(phdr,20,200)
-            GENERATE_CASE_FULL(phdr,21,201)
-            GENERATE_CASE_PART(phdr,21,201)
-            GENERATE_CASE_FULL(phdr,22,202)
-            GENERATE_CASE_PART(phdr,22,202)
-            GENERATE_CASE_FULL(phdr,23,203)
-            GENERATE_CASE_PART(phdr,23,203)
-            GENERATE_CASE_FULL_V25(phdr,24,204)
-            GENERATE_CASE_PART_V25(phdr,24,204)
-            GENERATE_CASE_FULL_V25(phdr,25,205)
-            GENERATE_CASE_PART_V25(phdr,25,205)
+            GENERATE_CASE_V30(phdr,30, 300);
+            GENERATE_CASE_V30(phdr,35, 350);
         }
-    }
 
     return TRUE;
 }
 
+
 /*
 ** Netscaler trace format close routines.
 */
@@ -1153,6 +1843,7 @@ typedef struct {
     guint16 page_offset;
     guint16 page_len;
     guint32 absrec_time;
+    gboolean newfile;
 } nstrace_dump_t;
 
 /* Returns 0 if we could write the specified encapsulation type,
@@ -1162,7 +1853,7 @@ int nstrace_10_dump_can_write_encap(int encap)
     if (encap == WTAP_ENCAP_NSTRACE_1_0)
         return 0;
 
-    return WTAP_ERR_UNSUPPORTED_ENCAP;
+    return WTAP_ERR_UNWRITABLE_ENCAP;
 }
 
 
@@ -1173,9 +1864,28 @@ int nstrace_20_dump_can_write_encap(int encap)
     if (encap == WTAP_ENCAP_NSTRACE_2_0)
         return 0;
 
-    return WTAP_ERR_UNSUPPORTED_ENCAP;
+    return WTAP_ERR_UNWRITABLE_ENCAP;
 }
 
+/* Returns 0 if we could write the specified encapsulation type,
+** an error indication otherwise. */
+int nstrace_30_dump_can_write_encap(int encap)
+{
+    if (encap == WTAP_ENCAP_NSTRACE_3_0)
+        return 0;
+
+    return WTAP_ERR_UNWRITABLE_ENCAP;
+}
+
+/* Returns 0 if we could write the specified encapsulation type,
+** an error indication otherwise. */
+int nstrace_35_dump_can_write_encap(int encap)
+{
+    if (encap == WTAP_ENCAP_NSTRACE_3_5)
+        return 0;
+
+    return WTAP_ERR_UNWRITABLE_ENCAP;
+}
 
 /* Returns TRUE on success, FALSE on failure; sets "*err" to an error code on
 ** failure */
@@ -1188,8 +1898,14 @@ gboolean nstrace_dump_open(wtap_dumper *wdh, int *err _U_)
     nstrace = (nstrace_dump_t *)g_malloc(sizeof(nstrace_dump_t));
     wdh->priv = (void *)nstrace;
     nstrace->page_offset = 0;
-    nstrace->page_len = NSPR_PAGESIZE;
+    if ((wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0) ||
+      (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5))
+      nstrace->page_len = NSPR_PAGESIZE_TRACE;
+    else
+      nstrace->page_len = NSPR_PAGESIZE;
+
     nstrace->absrec_time = 0;
+    nstrace->newfile = TRUE;
 
     return TRUE;
 }
@@ -1199,15 +1915,15 @@ static gboolean nstrace_add_signature(wtap_dumper *wdh, int *err)
 {
     nstrace_dump_t *nstrace = (nstrace_dump_t *)wdh->priv;
 
-    if (wdh->file_type == WTAP_FILE_NETSCALER_1_0)
+    if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
     {
         guint16 val16b;
         nspr_signature_v10_t sig10;
 
         /* populate the record */
-        val16b = htoles(NSPR_SIGNATURE_V10);
+        val16b = GUINT16_TO_LE(NSPR_SIGNATURE_V10);
         memcpy(sig10.phd.ph_RecordType, &val16b, sizeof sig10.phd.ph_RecordType);
-        val16b = htoles(nspr_signature_v10_s);
+        val16b = GUINT16_TO_LE(nspr_signature_v10_s);
         memcpy(sig10.phd.ph_RecordSize, &val16b, sizeof sig10.phd.ph_RecordSize);
         memset(sig10.sig_Signature, 0, NSPR_SIGSIZE_V10);
         g_strlcpy(sig10.sig_Signature, NSPR_SIGSTR_V10, NSPR_SIGSIZE_V10);
@@ -1220,7 +1936,7 @@ static gboolean nstrace_add_signature(wtap_dumper *wdh, int *err)
         /* Move forward the page offset */
         nstrace->page_offset += (guint16) nspr_signature_v10_s;
 
-    } else if (wdh->file_type == WTAP_FILE_NETSCALER_2_0)
+    } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
     {
         nspr_signature_v20_t sig20;
 
@@ -1236,6 +1952,36 @@ static gboolean nstrace_add_signature(wtap_dumper *wdh, int *err)
         /* Move forward the page offset */
         nstrace->page_offset += (guint16) sig20.sig_RecordSize;
 
+    } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0)
+    {
+        nspr_signature_v30_t sig30;
+
+        sig30.sig_RecordType = NSPR_SIGNATURE_V30;
+        sig30.sig_RecordSize = nspr_signature_v30_s;
+        memcpy(sig30.sig_Signature, NSPR_SIGSTR_V30, sizeof(NSPR_SIGSTR_V30));
+
+        /* Write the record into the file */
+        if (!wtap_dump_file_write(wdh, &sig30, sig30.sig_RecordSize,
+            err))
+            return FALSE;
+
+        /* Move forward the page offset */
+        nstrace->page_offset += (guint16) sig30.sig_RecordSize;
+    } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5)
+    {
+        nspr_signature_v35_t sig35;
+
+        sig35.sig_RecordType = NSPR_SIGNATURE_V35;
+        sig35.sig_RecordSize = nspr_signature_v35_s;
+        memcpy(sig35.sig_Signature, NSPR_SIGSTR_V35, sizeof(NSPR_SIGSTR_V35));
+
+        /* Write the record into the file */
+        if (!wtap_dump_file_write(wdh, &sig35, sig35.sig_RecordSize,
+            err))
+            return FALSE;
+
+        /* Move forward the page offset */
+        nstrace->page_offset += (guint16) sig35.sig_RecordSize;
     } else
     {
         g_assert_not_reached();
@@ -1253,7 +1999,7 @@ nstrace_add_abstime(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     nstrace_dump_t *nstrace = (nstrace_dump_t *)wdh->priv;
     guint64 nsg_creltime;
 
-    if (wdh->file_type == WTAP_FILE_NETSCALER_1_0)
+    if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
     {
         guint16 val16;
         guint32 reltime;
@@ -1261,16 +2007,16 @@ nstrace_add_abstime(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
         nspr_abstime_v10_t abs10;
 
         /* populate the record */
-        val16 = htoles(NSPR_ABSTIME_V10);
+        val16 = GUINT16_TO_LE(NSPR_ABSTIME_V10);
         memcpy(abs10.phd.ph_RecordType, &val16, sizeof abs10.phd.ph_RecordType);
-        val16 = htoles(nspr_abstime_v10_s);
+        val16 = GUINT16_TO_LE(nspr_abstime_v10_s);
         memcpy(abs10.phd.ph_RecordSize, &val16, sizeof abs10.phd.ph_RecordSize);
 
         memcpy(&reltime, ((const nspr_pktracefull_v10_t *)pd)->fp_RelTimeHr, sizeof reltime);
         nsg_creltime = ns_hrtime2nsec(reltime);
 
         memset(abs10.abs_RelTime, 0, sizeof abs10.abs_RelTime);
-        abstime = htolel((guint32)phdr->ts.secs - (guint32)(nsg_creltime/1000000000));
+        abstime = GUINT32_TO_LE((guint32)phdr->ts.secs - (guint32)(nsg_creltime/1000000000));
         memcpy(abs10.abs_Time, &abstime, sizeof abs10.abs_Time);
 
         /* Write the record into the file */
@@ -1280,8 +2026,9 @@ nstrace_add_abstime(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
         /* Move forward the page offset */
         nstrace->page_offset += nspr_abstime_v10_s;
 
-    } else if (wdh->file_type == WTAP_FILE_NETSCALER_2_0)
-    {
+    } else if ((wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0) ||
+        (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0) ||
+        (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5))    {
         guint32 reltime;
         guint64 abstime;
         nspr_abstime_v20_t abs20;
@@ -1293,7 +2040,7 @@ nstrace_add_abstime(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
         nsg_creltime = ns_hrtime2nsec(reltime);
 
         memset(abs20.abs_RelTime, 0, sizeof abs20.abs_RelTime);
-        abstime = htolel((guint32)phdr->ts.secs - (guint32)(nsg_creltime/1000000000));
+        abstime = GUINT32_TO_LE((guint32)phdr->ts.secs - (guint32)(nsg_creltime/1000000000));
         memcpy(abs20.abs_RelTime, &abstime, sizeof abs20.abs_RelTime);
 
         /* Write the record into the file */
@@ -1316,19 +2063,32 @@ nstrace_add_abstime(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 /* Write a record for a packet to a dump file.
    Returns TRUE on success, FALSE on failure. */
 static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
-    const guint8 *pd, int *err)
+    const guint8 *pd, int *err, gchar **err_info _U_)
 {
     nstrace_dump_t *nstrace = (nstrace_dump_t *)wdh->priv;
 
-    if (nstrace->page_offset == 0)
+    /* We can only write packet records. */
+    if (phdr->rec_type != REC_TYPE_PACKET) {
+        *err = WTAP_ERR_UNWRITABLE_REC_TYPE;
+        return FALSE;
+    }
+
+    if (nstrace->newfile == TRUE)
     {
+        nstrace->newfile = FALSE;
         /* Add the signature record and abs time record */
-        if (wdh->file_type == WTAP_FILE_NETSCALER_1_0)
+        if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
+        {
+            if (!nstrace_add_signature(wdh, err) ||
+                !nstrace_add_abstime(wdh, phdr, pd, err))
+                return FALSE;
+        } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
         {
             if (!nstrace_add_signature(wdh, err) ||
                 !nstrace_add_abstime(wdh, phdr, pd, err))
                 return FALSE;
-        } else if (wdh->file_type == WTAP_FILE_NETSCALER_2_0)
+        } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0 ||
+                   wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5 )
         {
             if (!nstrace_add_signature(wdh, err) ||
                 !nstrace_add_abstime(wdh, phdr, pd, err))
@@ -1344,16 +2104,13 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     {
     case NSPR_HEADER_VERSION100:
 
-        if (wdh->file_type == WTAP_FILE_NETSCALER_1_0)
+        if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
         {
             if (nstrace->page_offset + phdr->caplen >= nstrace->page_len)
             {
                 /* Start on the next page */
-                if (fseek(wdh->fh, (nstrace->page_len - nstrace->page_offset), SEEK_CUR) == -1)
-                {
-                    *err = errno;
+                if (wtap_dump_file_seek(wdh, (nstrace->page_len - nstrace->page_offset), SEEK_CUR, err) == -1)
                     return FALSE;
-                }
 
                 nstrace->page_offset = 0;
 
@@ -1367,9 +2124,9 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
                 return FALSE;
 
             nstrace->page_offset += (guint16) phdr->caplen;
-        } else if (wdh->file_type == WTAP_FILE_NETSCALER_2_0)
+        } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
         {
-            *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+            *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
             return FALSE;
         }
 
@@ -1381,20 +2138,18 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     case NSPR_HEADER_VERSION203:
     case NSPR_HEADER_VERSION204:
     case NSPR_HEADER_VERSION205:
-        if (wdh->file_type == WTAP_FILE_NETSCALER_1_0)
+    case NSPR_HEADER_VERSION206:
+        if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
         {
-            *err = WTAP_ERR_UNSUPPORTED_FILE_TYPE;
+            *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
             return FALSE;
-        } else if (wdh->file_type == WTAP_FILE_NETSCALER_2_0)
+        } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
         {
             if (nstrace->page_offset + phdr->caplen >= nstrace->page_len)
             {
                 /* Start on the next page */
-                if (fseek(wdh->fh, (nstrace->page_len - nstrace->page_offset), SEEK_CUR) == -1)
-                {
-                    *err = errno;
+                if (wtap_dump_file_seek(wdh, (nstrace->page_len - nstrace->page_offset), SEEK_CUR, err) == -1)
                     return FALSE;
-                }
 
                 nstrace->page_offset = 0;
 
@@ -1412,6 +2167,43 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
 
         break;
 
+    case NSPR_HEADER_VERSION300:
+    case NSPR_HEADER_VERSION350:
+        if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
+        {
+            *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
+            return FALSE;
+        } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
+        {
+            *err = WTAP_ERR_UNWRITABLE_FILE_TYPE;
+            return FALSE;
+        } else if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_0 || wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_3_5)
+        {
+            if (nstrace->page_offset + phdr->caplen >= nstrace->page_len)
+            {
+                /* Start on the next page */
+                if (wtap_dump_file_seek(wdh, (nstrace->page_len - nstrace->page_offset), SEEK_CUR, err) == -1)
+                    return FALSE;
+
+                nstrace->page_offset = 0;
+
+                /* Possibly add signature and abstime records and increment offset */
+                if (!nstrace_add_signature(wdh, err))
+                    return FALSE;
+            }
+
+            /* Write the actual record as is */
+            if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err))
+                return FALSE;
+
+            nstrace->page_offset += (guint16) phdr->caplen;
+        } else
+        {
+            g_assert_not_reached();
+            return FALSE;
+        }
+        break;
+
     default:
         g_assert_not_reached();
         return FALSE;
@@ -1420,3 +2212,15 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     return TRUE;
 }
 
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */