diff options
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 7 | ||||
| -rw-r--r-- | wiretap/wtap.c | 7 | ||||
| -rw-r--r-- | wiretap/wtap.h | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 2ae777e380..02be511875 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -306,10 +306,9 @@ static const struct { { 169, WTAP_ENCAP_GPRS_LLC }, - /* - * 170 and 171 are reserved for ITU-T G.7041/Y.1303 Generic - * Framing Procedure. - */ + /* ITU-T G.7041/Y.1303 Generic Framing Procedure. */ + { 170, WTAP_ENCAP_GFP_T }, + { 171, WTAP_ENCAP_GFP_F }, /* Registered by Gcom, Inc. */ { 172, WTAP_ENCAP_GCOM_TIE1 }, diff --git a/wiretap/wtap.c b/wiretap/wtap.c index c4c35e8a74..789adfbbfd 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -953,6 +953,13 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_ISO14443 */ { "ISO 14443 contactless smartcard standards", "iso14443" }, + + /* WTAP_ENCAP_GFP_T */ + { "ITU-T G.7041/Y.1303 Generic Framing Procedure Transparent mode", "gfp-t" }, + + /* WTAP_ENCAP_GFP_F */ + { "ITU-T G.7041/Y.1303 Generic Framing Procedure Frame-mapped mode", "gfp-f" } + }; WS_DLL_LOCAL diff --git a/wiretap/wtap.h b/wiretap/wtap.h index df122fd3ad..0335607b2a 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -264,6 +264,8 @@ extern "C" { #define WTAP_ENCAP_JSON 175 #define WTAP_ENCAP_NSTRACE_3_5 176 #define WTAP_ENCAP_ISO14443 177 +#define WTAP_ENCAP_GFP_T 178 +#define WTAP_ENCAP_GFP_F 179 /* After adding new item here, please also add new item to encap_table_base array */ #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |