From eb8c996108d6946e6fa0948164e886d5be85763f Mon Sep 17 00:00:00 2001 From: Pantar Ana Date: Fri, 21 Dec 2018 13:37:52 +0100 Subject: ebhscr: fixing WTAP_ENCAP_EBHSCR Change-Id: Ie5ab56f1ee80d14032969cbe7f31e086fb2b4b91 Reviewed-on: https://code.wireshark.org/review/31159 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- wiretap/pcap-common.c | 3 +++ wiretap/wtap.c | 5 ++++- wiretap/wtap.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'wiretap') diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index c5386968c2..48c674723c 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -464,6 +464,9 @@ static const struct { /* DisplayPort AUX channel monitor */ { 275, WTAP_ENCAP_DPAUXMON }, + /* Elektrobit High Speed Capture and Replay */ + { 279, WTAP_ENCAP_EBHSCR }, + /* * To repeat: * diff --git a/wiretap/wtap.c b/wiretap/wtap.c index a19237209f..cd773b39a8 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -954,7 +954,10 @@ static struct encap_type_info encap_table_base[] = { { "RFC 7468 file", "rfc7468" }, /* WTAP_ENCAP_SYSTEMD_JOURNAL */ - { "systemd journal", "sdjournal" } + { "systemd journal", "sdjournal" }, + + /* WTAP_ENCAP_EBHSCR */ + { "EBHSCR", "ebhscr" }, }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index ec7e390fb1..c4670d5173 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -284,6 +284,7 @@ extern "C" { #define WTAP_ENCAP_RUBY_MARSHAL 201 #define WTAP_ENCAP_RFC7468 202 #define WTAP_ENCAP_SYSTEMD_JOURNAL 203 /* Event, not a packet */ +#define WTAP_ENCAP_EBHSCR 204 /* After adding new item here, please also add new item to encap_table_base array */ -- cgit v1.2.3