diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-06-29 15:23:21 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2012-06-29 15:23:21 +0000 |
| commit | 33bfa85452c57f9af9e1ba7abd045042f3b8fbb4 (patch) | |
| tree | 953e9120218eefacf34bed32ac1a0ab2d15f2440 /wiretap | |
| parent | 40776e2fed2be58eac1f682fdc86ddec59f85148 (diff) | |
Initial support for D-Bus dissection (bug #5502)
svn path=/trunk/; revision=43542
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/pcap-common.c | 2 | ||||
| -rw-r--r-- | wiretap/wtap.c | 3 | ||||
| -rw-r--r-- | wiretap/wtap.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 3a5695c89b..7c76cf264a 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -373,6 +373,8 @@ static const struct { { 229, WTAP_ENCAP_RAW_IP6 }, /* IEEE 802.15.4 Wireless PAN no fcs */ { 230, WTAP_ENCAP_IEEE802_15_4_NOFCS }, + /* D-BUS */ + { 231, WTAP_ENCAP_DBUS }, /* DVB-CI (Common Interface) */ { 235, WTAP_ENCAP_DVBCI }, /* MUX27010 */ diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 6af7502506..4c65fd24bc 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -586,6 +586,9 @@ static struct encap_type_info encap_table_base[] = { /* WTAP_ENCAP_IEEE_802_11_AIROPEEK */ { "IEEE 802.11 plus AiroPeek radio header", "ieee-802-11-airopeek" }, + + /* WTAP_ENCAP_DBUS */ + { "D-Bus", "dbus" } }; 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 f5cb8e4b1c..d854802ca3 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -236,6 +236,7 @@ extern "C" { #define WTAP_ENCAP_IXVERIWAVE 144 #define WTAP_ENCAP_IEEE_802_11_AIROPEEK 145 #define WTAP_ENCAP_SDH 146 +#define WTAP_ENCAP_DBUS 147 #define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types() |