aboutsummaryrefslogtreecommitdiffstats
path: root/pcap-common.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-01-10 14:44:29 +0100
committerPatrick McHardy <kaber@trash.net>2011-01-10 14:44:29 +0100
commit481ab2d4a607c4a4914ddd9debbf336f1f805c61 (patch)
tree790854e4554c575ab59abcc783ebf422b85e730a /pcap-common.c
parentf6e28f8d1980c94cfe6f18ec22231009c633b69b (diff)
parent028204e0f99f0bad5dfd01add364ebd4f4befabb (diff)
Merge branch 'master' of git://bpf.tcpdump.org/libpcapHEADmaster
Conflicts: pcap/bpf.h Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'pcap-common.c')
-rw-r--r--pcap-common.c21
1 files changed, 21 insertions, 0 deletions
diff --git a/pcap-common.c b/pcap-common.c
index 5f6a929..3989dfc 100644
--- a/pcap-common.c
+++ b/pcap-common.c
@@ -735,6 +735,24 @@ static const char rcsid[] _U_ =
*/
#define LINKTYPE_IEEE802_15_4_NOFCS 230
+/*
+ * Raw D-Bus:
+ *
+ * http://www.freedesktop.org/wiki/Software/dbus
+ *
+ * messages:
+ *
+ * http://dbus.freedesktop.org/doc/dbus-specification.html#message-protocol-messages
+ *
+ * starting with the endianness flag, followed by the message type, etc.,
+ * but without the authentication handshake before the message sequence:
+ *
+ * http://dbus.freedesktop.org/doc/dbus-specification.html#auth-protocol
+ *
+ * Requested by Martin Vidner <martin@vidner.net>.
+ */
+#define LINKTYPE_DBUS 231
+
static struct linktype_map {
int dlt;
@@ -1084,6 +1102,9 @@ static struct linktype_map {
/* IEEE 802.15.4 exactly as it appears in the spec, without FCS */
{ DLT_IEEE802_15_4_NOFCS, LINKTYPE_IEEE802_15_4_NOFCS },
+ /* D-Bus messages */
+ { DLT_DBUS, LINKTYPE_DBUS },
+
{ -1, -1 }
};