diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-19 10:24:47 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-19 18:25:15 +0000 |
| commit | f9a848ac308aa2da3542cea3119430c389d55e68 (patch) | |
| tree | 9ecdf2b3aa1d24298b682329a490c10fd313549c /wiretap/erf.c | |
| parent | dcfbf927055bb3e9a27fdcb78d8bd819c871a98e (diff) | |
| download | wireshark-f9a848ac308aa2da3542cea3119430c389d55e68.tar.gz | |
Add missing ERF types, mention another missing type, mention reserved space.
Add the TYPE_COLOR_HASH_POS and TYPE_COLOR_HASH_ETH types, note that
type 26 has no #define, mention that types 28 through 31 are reserved
for future record types.
Change-Id: Ic828254599599c6bd7399d4682f9a3d4bff1f0f7
Reviewed-on: https://code.wireshark.org/review/12728
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/erf.c')
| -rw-r--r-- | wiretap/erf.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wiretap/erf.c b/wiretap/erf.c index f38b8a4e16..088845bd6b 100644 --- a/wiretap/erf.c +++ b/wiretap/erf.c @@ -219,6 +219,7 @@ extern wtap_open_return_val erf_open(wtap *wth, int *err, gchar **err_info) case ERF_TYPE_ETH: case ERF_TYPE_COLOR_ETH: case ERF_TYPE_DSM_COLOR_ETH: + case ERF_TYPE_COLOR_HASH_ETH: if (!wtap_read_bytes(wth->fh,ð_hdr,sizeof(eth_hdr),err,err_info)) { if (*err == WTAP_ERR_SHORT_READ) { /* Subheader missing, not an ERF file */ @@ -437,6 +438,7 @@ static gboolean erf_read_header(FILE_T fh, case ERF_TYPE_HDLC_POS: case ERF_TYPE_COLOR_HDLC_POS: case ERF_TYPE_DSM_COLOR_HDLC_POS: + case ERF_TYPE_COLOR_HASH_POS: case ERF_TYPE_ATM: case ERF_TYPE_AAL5: break; @@ -444,6 +446,7 @@ static gboolean erf_read_header(FILE_T fh, case ERF_TYPE_ETH: case ERF_TYPE_COLOR_ETH: case ERF_TYPE_DSM_COLOR_ETH: + case ERF_TYPE_COLOR_HASH_ETH: if (!wtap_read_bytes(fh, ð_hdr, sizeof(eth_hdr), err, err_info)) return FALSE; if (bytes_read != NULL) @@ -546,6 +549,7 @@ static gboolean erf_write_phdr(wtap_dumper *wdh, int encap, const union wtap_pse case ERF_TYPE_ETH: case ERF_TYPE_COLOR_ETH: case ERF_TYPE_DSM_COLOR_ETH: + case ERF_TYPE_COLOR_HASH_ETH: phtons(&erf_subhdr[0], pseudo_header->erf.subhdr.eth_hdr); subhdr_size += (int)sizeof(struct erf_eth_hdr); break; |