diff options
| author | Guy Harris <guy@alum.mit.edu> | 2019-03-23 00:35:23 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2019-03-23 20:30:00 +0000 |
| commit | ed23cfba226b6e21f3e97147f19e617bddc0c5e9 (patch) | |
| tree | e0ffd7fd6e62029fff4da51209f2a9e9b6334b46 /wiretap/wtap.c | |
| parent | 80d96e91d248af40b50969702a0e5aafb7132376 (diff) | |
Clean up IPMB/I2C link-layer header types.
209 is LINKTYPE_IPMB_LINUX; add _LINUX/_linux to the WTAP_ENCAP_ name
and function/structure names, to clarify that it's not I2C in general,
it's I2C with a particular pseudo-header.
199 is now LINKTYPE_IPMB_KONTRON, not LINKTYPE_IPMB, as it doesn't have
raw I2C packets, it has I2C packets with a pseudo-header. Change the
WTAP_ENCAP_ name, and add a dissector for it.
Change-Id: Ie097f4317b03d2b2adfd9b81a4b11caf6268399e
Reviewed-on: https://code.wireshark.org/review/32539
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 36866a23cd..26bea65313 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -660,8 +660,8 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_BLUETOOTH_HCI */ { "bluetooth-hci", "Bluetooth without transport layer" }, - /* WTAP_ENCAP_IPMB */ - { "ipmb", "Intelligent Platform Management Bus" }, + /* WTAP_ENCAP_IPMB_KONTRON */ + { "ipmb-kontron", "Intelligent Platform Management Bus with Kontron pseudo-header" }, /* WTAP_ENCAP_IEEE802_15_4 */ { "wpan", "IEEE 802.15.4 Wireless PAN" }, @@ -687,8 +687,8 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_X2E_SERIAL */ { "x2e-serial", "X2E serial line capture" }, - /* WTAP_ENCAP_I2C */ - { "i2c", "I2C" }, + /* WTAP_ENCAP_I2C_LINUX */ + { "i2c-linux", "I2C with Linux-specific pseudo-header" }, /* WTAP_ENCAP_IEEE802_15_4_NONASK_PHY */ { "wpan-nonask-phy", "IEEE 802.15.4 Wireless PAN non-ASK PHY" }, |