diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-02-25 23:24:34 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-02-25 23:24:34 +0000 |
| commit | b6ff142f60309faceb422e3d3689c7406aca9361 (patch) | |
| tree | fc06d6f47b4bc726709812f14f7576d1945af5c0 /wiretap/netscaler.c | |
| parent | e994e7841299a7eb15783ef24f0b1de46218a1b1 (diff) | |
Add a presence flag field to the packet information structure filled in
by Wiretap, to indicate whether certain fields in that structure
actually have data in them.
Use the "time stamp present" flag to omit showing time stamp information
for packets (and "packets") that don't have time stamps; don't bother
working very hard to "fake" a time stamp for data files.
Use the "interface ID present" flag to omit the interface ID for packets
that don't have an interface ID.
We don't use the "captured length, separate from packet length, present"
flag to omit the captured length; that flag might be present but equal
to the packet length, and if you want to know if a packet was cut short
by a snapshot length, comparing the values would be the way to do that.
More work is needed to have wiretap/pcapng.c properly report the flags,
e.g. reporting no time stamp being present for a Simple Packet Block.
svn path=/trunk/; revision=41185
Diffstat (limited to 'wiretap/netscaler.c')
| -rw-r--r-- | wiretap/netscaler.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/netscaler.c b/wiretap/netscaler.c index a4a634d1d7..5f07aaca94 100644 --- a/wiretap/netscaler.c +++ b/wiretap/netscaler.c @@ -700,6 +700,8 @@ gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info, gint64 *data_of 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); @@ -724,6 +726,8 @@ gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info, gint64 *data_of case NSPR_PDPKTRACEPARTTXB_V10: case NSPR_PDPKTRACEPARTRX_V10: + 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); @@ -777,6 +781,7 @@ gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info, gint64 *data_of #define TIMEDEFV20(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);\ @@ -784,6 +789,7 @@ gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info, gint64 *data_of #define TIMEDEFV23(fp,type) \ do {\ + wth->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);\ @@ -795,6 +801,7 @@ gboolean nstrace_read_v10(wtap *wth, int *err, gchar **err_info, gint64 *data_of #define PPSIZEDEFV20(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);\ }while(0) |