diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-24 22:11:57 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-25 06:12:23 +0000 |
| commit | 6b6c11c3c34b31234c277142d8aa83c151583e5c (patch) | |
| tree | cd7173327227964887282c30c39d398b407b058a /wiretap/netscaler.c | |
| parent | 98e8d527c9788d52b3ee853cd5569f4629418b2e (diff) | |
Have a PACKET_DESCRIBE() for V30's seek-read routine.
That way it'll set the captured length and reported length the same way
it's done in the read routine.
Change-Id: I8b1f2d0d8fa688f44b6f61f16dc2e21b5648fc12
Reviewed-on: https://code.wireshark.org/review/7376
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/netscaler.c')
| -rw-r--r-- | wiretap/netscaler.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index bbf7cd6b59..5ad9364556 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -1385,6 +1385,7 @@ static gboolean nstrace_seek_read_v10(wtap *wth, gint64 seek_off, #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;\ 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;\ @@ -1492,6 +1493,17 @@ static gboolean nstrace_seek_read_v20(wtap *wth, gint64 seek_off, return TRUE; } +#undef PACKET_DESCRIBE + +#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;\ + 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) @@ -1540,16 +1552,13 @@ static gboolean nstrace_seek_read_v30(wtap *wth, gint64 seek_off, 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:\ - TRACE_V##ver##_REC_LEN_OFF((phdr),v##ver##_full,fp,pktracefull_v##ver);\ - (phdr)->pseudo_header.nstr.rec_type = NSPR_HEADER_VERSION##HEADERVER;\ - break; + PACKET_DESCRIBE(phdr,FULL,ver,v##ver##_full,fp,pktracefull_v##ver,HEADERVER); switch ((( nspr_hd_v20_t*)pd)->phd_RecordType) { |