diff options
| author | Bill Meier <wmeier@newsguy.com> | 2011-02-25 20:33:43 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2011-02-25 20:33:43 +0000 |
| commit | 0d7508cf8e46b86358586274b396f15acc99f41a (patch) | |
| tree | 64e535fc4bd29e7248cac2c9ac3ba24e86089b52 /wiretap/netxray.c | |
| parent | bec1c077889c7ce88c8ea97779c221ccf78b7894 (diff) | |
| download | wireshark-0d7508cf8e46b86358586274b396f15acc99f41a.tar.gz | |
From Robert Bullen: ... code is not incrementing wtap_dumper.bytes_dumped.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5666
Fro me: use 4 -space indentation (not tab) to match surrounding code lines.
svn path=/trunk/; revision=36074
Diffstat (limited to 'wiretap/netxray.c')
| -rw-r--r-- | wiretap/netxray.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 6a61a2cbc6..ac81218417 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1531,6 +1531,7 @@ gboolean netxray_dump_open_1_1(wtap_dumper *wdh, gboolean cant_seek, int *err) *err = errno; return FALSE; } + wdh->bytes_dumped += CAPTUREFILE_HEADER_SIZE; netxray = (netxray_dump_t *)g_malloc(sizeof(netxray_dump_t)); wdh->priv = (void *)netxray; @@ -1582,10 +1583,12 @@ static gboolean netxray_dump_1_1(wtap_dumper *wdh, if (!wtap_dump_file_write(wdh, &rec_hdr, sizeof(rec_hdr), err)) return FALSE; + wdh->bytes_dumped += sizeof(rec_hdr); /* write the packet data */ if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err)) return FALSE; + wdh->bytes_dumped += phdr->caplen; netxray->nframes++; @@ -1696,6 +1699,7 @@ gboolean netxray_dump_open_2_0(wtap_dumper *wdh, gboolean cant_seek, int *err) *err = errno; return FALSE; } + wdh->bytes_dumped += CAPTUREFILE_HEADER_SIZE; netxray = (netxray_dump_t *)g_malloc(sizeof(netxray_dump_t)); wdh->priv = (void *)netxray; @@ -1765,10 +1769,12 @@ static gboolean netxray_dump_2_0(wtap_dumper *wdh, if (!wtap_dump_file_write(wdh, &rec_hdr, sizeof(rec_hdr), err)) return FALSE; + wdh->bytes_dumped += sizeof(rec_hdr); /* write the packet data */ if (!wtap_dump_file_write(wdh, pd, phdr->caplen, err)) return FALSE; + wdh->bytes_dumped += phdr->caplen; netxray->nframes++; |