diff options
| -rw-r--r-- | wiretap/libpcap.c | 1 | ||||
| -rw-r--r-- | wiretap/wtap.c | 9 | ||||
| -rw-r--r-- | wiretap/wtap.h | 3 |
3 files changed, 12 insertions, 1 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 95d24a8d2e..477b5c290d 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -448,6 +448,7 @@ static const struct { { 196, WTAP_ENCAP_SITA }, /* Endace Record File Encapsulation */ { 197, WTAP_ENCAP_ERF }, + { 199, WTAP_ENCAP_IPMB }, /* Bluetooth HCI UART transport (part H:4) frames, like hcidump */ { 201, WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR }, diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 4544b33272..9ec246cd0c 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -392,6 +392,15 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_SITA */ { "SITA WAN packets", "sita-wan" }, + + /* WTAP_ENCAP_SCCP */ + { "SS7 SCCP", "sccp" }, + + /* WTAP_ENCAP_BLUETOOTH_HCI */ + { "Bluetooth without transport layer", "bluetooth-hci" }, + + /* WTAP_ENCAP_IPMB */ + { "Intelligent Platform Management Bus", "ipmb" } }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 7d25897be6..975edc9889 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -196,7 +196,8 @@ extern "C" { #define WTAP_ENCAP_BLUETOOTH_H4_WITH_PHDR 99 #define WTAP_ENCAP_SITA 100 #define WTAP_ENCAP_SCCP 101 -#define WTAP_ENCAP_BLUETOOTH_HCI 102 /*raw packets without a transport layer header e.g. H4*/ +#define WTAP_ENCAP_BLUETOOTH_HCI 102 /*raw packets without a transport layer header e.g. H4*/ +#define WTAP_ENCAP_IPMB 103 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |