diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-05-24 11:28:30 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-05-24 18:31:25 +0000 |
| commit | 6db77b000fe58173eeed23b91b32c92c681feda2 (patch) | |
| tree | 5113821a7f5e1b43734eccf94783d37962b37712 /wiretap/lanalyzer.c | |
| parent | 33ae4cb024e36192ff7c6fa1d3d6bdcce9b25b7a (diff) | |
Allow wtap_read() and wtap_seek_read() to return records other than packets.
Add a "record type" field to "struct wtap_pkthdr"; currently, it can be
REC_TYPE_PACKET, for a record containing a packet, or
REC_TYPE_FILE_TYPE_SPECIFIC, for records containing file-type-specific
data.
Modify code that reads packets to be able to handle non-packet records,
even if that just means ignoring them.
Rename some routines to indicate that they handle more than just
packets.
We don't yet have any libwiretap code that supplies records other than
REC_TYPE_PACKET or that supporting writing records other than
REC_TYPE_PACKET, or any code to support plugins for handling
REC_TYPE_FILE_TYPE_SPECIFIC records; this is just the first step for bug
8590.
Change-Id: Idb40b78f17c2c3aea72031bcd252abf9bc11c813
Reviewed-on: https://code.wireshark.org/review/1773
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/lanalyzer.c')
| -rw-r--r-- | wiretap/lanalyzer.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/wiretap/lanalyzer.c b/wiretap/lanalyzer.c index 8c2ce348a1..d00691beac 100644 --- a/wiretap/lanalyzer.c +++ b/wiretap/lanalyzer.c @@ -523,6 +523,7 @@ static gboolean lanalyzer_read_trace_record(wtap *wth, FILE_T fh, return FALSE; } + phdr->rec_type = REC_TYPE_PACKET; phdr->presence_flags = WTAP_HAS_TS|WTAP_HAS_CAP_LEN; time_low = pletoh16(&descriptor[8]); @@ -662,6 +663,12 @@ static gboolean lanalyzer_dump(wtap_dumper *wdh, struct timeval td; int thisSize = phdr->caplen + LA_PacketRecordSize + LA_RecordHeaderSize; + /* We can only write packet records. */ + if (phdr->rec_type != REC_TYPE_PACKET) { + *err = WTAP_ERR_REC_TYPE_UNSUPPORTED; + return FALSE; + } + if (wdh->bytes_dumped + thisSize > LA_ProFileLimit) { /* printf(" LA_ProFileLimit reached\n"); */ *err = EFBIG; @@ -674,7 +681,7 @@ static gboolean lanalyzer_dump(wtap_dumper *wdh, if (len > 65535) { *err = WTAP_ERR_PACKET_TOO_LARGE; return FALSE; - } + } if (!s16write(wdh, GUINT16_TO_LE(0x1005), err)) return FALSE; |