diff options
| author | Guy Harris <guy@alum.mit.edu> | 2017-06-03 12:58:36 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2017-06-03 19:59:19 +0000 |
| commit | 317cebe86126c44d30ddd13740dbc66f14594ff5 (patch) | |
| tree | 3544c38f1bcc2730aee952822cb0bd5ee004ccae /wiretap/wtap.c | |
| parent | e20b38b28c291cf222876410acc8a4f4cbe6a172 (diff) | |
| download | wireshark-317cebe86126c44d30ddd13740dbc66f14594ff5.tar.gz | |
Don't keep the pcap/pcapng link-layer header type as interface data.
Either 1) it can be determined from the libwiretap encapsulation type,
in which case it's redundant information or 2) there *is* no pcap/pcapng
link-layer header type for that encapsulation type, in which case you
need to check for the attempt to determine it failing and handle that
failure appropriately.
Change-Id: Ie9557b513365c1fc8c6df74b9c8239e29aad46bc
Reviewed-on: https://code.wireshark.org/review/21924
Reviewed-by: Guy Harris <guy@alum.mit.edu>
(cherry picked from commit 30c86f8b34233b1cf262c14660d32388bc7362d9)
Reviewed-on: https://code.wireshark.org/review/21925
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 58a22e9298..2ee507f749 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -254,10 +254,9 @@ wtap_get_debug_if_descr(const wtap_block_t if_descr, } g_string_append_printf(info, - "%*cEncapsulation = %s (%d/%u - %s)%s", indent, ' ', + "%*cEncapsulation = %s (%d - %s)%s", indent, ' ', wtap_encap_string(if_descr_mand->wtap_encap), if_descr_mand->wtap_encap, - if_descr_mand->link_type, wtap_encap_short_string(if_descr_mand->wtap_encap), line_end); |