git.samba.org / metze / wireshark / wip.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add svn:eol-style.
[metze/wireshark/wip.git] / wiretap / netscaler.c
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c
index 64afb855f794349a4b1d8e23a14116c685ffd132..4e53ab6e93443a88e12faa0c667f69202cc52a29 100644 (file)
--- a/wiretap/netscaler.c
+++ b/wiretap/netscaler.c
@@ -296,22 +296,22 @@ typedef struct nspr_pktracefull_v25
 /* 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 */
+    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 */
-       guint8 fp_Data[4];     /* packet data starts here */
+    guint8 fp_Data[4];         /* packet data starts here */
 } nspr_pktracefull_v26_t;
 #define nspr_pktracefull_v26_s    ((guint32)(sizeof(nspr_pktracefull_v26_t) - 4))
 
@@ -427,24 +427,24 @@ typedef struct nspr_pktracepart_v25
 /* 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 */
+    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 */
-    guint8 pp_Data[4];        /* packet data starts here */
+    guint8 pp_Data[4];         /* packet data starts here */
 } nspr_pktracepart_v26_t;
 #define nspr_pktracepart_v26_s    ((guint32)(sizeof(nspr_pktracepart_v26_t) -4))
 
@@ -472,7 +472,7 @@ typedef struct nspr_pktracepart_v26
 #define TRACE_FULL_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
     (phdr)->len = pletohs(&(fp)->nsprRecordSize);\
     (phdr)->caplen = (phdr)->len;\
-    TRACE_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)        
+    TRACE_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname)
 
 #define TRACE_PART_V10_REC_LEN_OFF(phdr,enumprefix,structprefix,structname) \
     (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\
@@ -511,11 +511,11 @@ typedef struct nspr_pktracepart_v26
     __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)
-    
+
 #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)\
-    
+
     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)
@@ -606,7 +606,7 @@ 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;
@@ -634,19 +634,19 @@ int nstrace_open(wtap *wth, int *err, gchar **err_info)
     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;
 
     default:
         *err = WTAP_ERR_UNSUPPORTED;
-        *err_info = g_strdup_printf("nstrace: file type %d unsupported", wth->file_type);
+        *err_info = g_strdup_printf("nstrace: file type %d unsupported", wth->file_type_subtype);
         g_free(nstrace_buf);
         return 0;
     }
@@ -668,14 +668,14 @@ int nstrace_open(wtap *wth, int *err, gchar **err_info)
         return 0;
     }
 
-    switch (wth->file_type)
+    switch (wth->file_type_subtype)
     {
-    case WTAP_FILE_NETSCALER_1_0:
+    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_NETSCALER_2_0:
+    case WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0:
         wth->subtype_read = nstrace_read_v20;
         wth->subtype_seek_read = nstrace_seek_read_v20;
         break;
@@ -760,7 +760,7 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
                 (pletohs(&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)
@@ -768,7 +768,7 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len)
                 (sigv20p->sig_RecordSize <= len) &&
                 ((gint32)sizeof(NSPR_SIGSTR_V20) <= len) &&
                 (!nspm_signature_isv20(sigv20p->sig_Signature)))
-                return WTAP_FILE_NETSCALER_2_0;
+                return WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0;
 #undef    sigv20p
         }
     }
@@ -835,9 +835,9 @@ nstrace_set_start_time_ver(20)
 */
 static gboolean nstrace_set_start_time(wtap *wth)
 {
-    if (wth->file_type == WTAP_FILE_NETSCALER_1_0)
+    if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
         return nstrace_set_start_time_v10(wth);
-    else if (wth->file_type == WTAP_FILE_NETSCALER_2_0)
+    else if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_2_0)
         return nstrace_set_start_time_v20(wth);
 
     return FALSE;
@@ -1346,7 +1346,7 @@ 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;
@@ -1367,7 +1367,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;
 
@@ -1400,7 +1400,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;
@@ -1427,7 +1427,7 @@ 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)
     {
         guint32 reltime;
         guint64 abstime;
@@ -1470,12 +1470,12 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     if (nstrace->page_offset == 0)
     {
         /* 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 == WTAP_FILE_NETSCALER_2_0)
+        } 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))
@@ -1491,7 +1491,7 @@ 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)
             {
@@ -1511,7 +1511,7 @@ 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;
             return FALSE;
@@ -1526,11 +1526,11 @@ static gboolean nstrace_dump(wtap_dumper *wdh, const struct wtap_pkthdr *phdr,
     case NSPR_HEADER_VERSION204:
     case NSPR_HEADER_VERSION205:
     case NSPR_HEADER_VERSION206:
-        if (wdh->file_type == WTAP_FILE_NETSCALER_1_0)
+        if (wdh->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_NETSCALER_1_0)
         {
             *err = WTAP_ERR_UNSUPPORTED_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)
             {
Unnamed repository; edit this file to name it for gitweb.