diff options
| author | Anil Kumar <anilkumar911@gmail.com> | 2017-03-08 12:15:22 +0530 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2017-03-10 02:46:22 +0000 |
| commit | 3a63f8dc61b103c4716e49a914868a2ca327f4de (patch) | |
| tree | 8bb23ea058f23a4f2a6955d64ca7e1dca6d98fe1 /wiretap | |
| parent | ee7296db93ee4f35896b33b880282085102366ee (diff) | |
nstrace: fix size of vmnames
When vmnames are included in the header of a netscaler packet trace,
number of bytes equal to the size of vmnames is omitted from the packet,
by the dissector.
Bug: 13459
Change-Id: I0f907e9c2e08c1cbebd47f7e50d8284a6aaade59
Reviewed-on: https://code.wireshark.org/review/20446
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netscaler.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index f538bdc541..dd9ee51bb8 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -856,7 +856,7 @@ nspm_signature_version(wtap *wth, gchar *nstrace_buf, gint32 len) #define nspr_getv10recordsize(hdp) (pletoh16(&(hdp)->nsprRecordSize)) #define nspr_getv20recordtype(hdp) ((hdp)->phd_RecordType) #define nspr_getv20recordsize(hdp) \ - (((hdp)->phd_RecordSizeLow & NSPR_V20RECORDSIZE_2BYTES)? \ + (size_t)(((hdp)->phd_RecordSizeLow & NSPR_V20RECORDSIZE_2BYTES)? \ (((hdp)->phd_RecordSizeHigh * NSPR_V20RECORDSIZE_2BYTES)+ \ ((hdp)->phd_RecordSizeLow & ~NSPR_V20RECORDSIZE_2BYTES)) : \ (hdp)->phd_RecordSizeLow) @@ -1324,7 +1324,7 @@ static gboolean nstrace_read_v20(wtap *wth, int *err, gchar **err_info, gint64 * #define FULLSIZEDEFV30(phdr,fp,ver)\ do {\ (phdr)->presence_flags |= WTAP_HAS_CAP_LEN;\ - (phdr)->len = pletoh16(&fp->fp_PktSizeOrg) + nspr_pktracefull_v##ver##_s;\ + (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) |