aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-llc.c
diff options
context:
space:
mode:
authorjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2008-05-14 05:44:42 +0000
committerjake <jake@f5534014-38df-0310-8fa8-9805f1628bb7>2008-05-14 05:44:42 +0000
commit1ef5868218c1d19a3178c68df794d060076d5059 (patch)
treeeeb444945c4e86a2f4229f6517e59f513491fed6 /epan/dissectors/packet-llc.c
parentd363109f9a05c4de82a19c622a62b170eb1cbf6a (diff)
From Steve Karg:
Added MS/TP decoding for the WTAP BACnet MS/TP datalink, and added decoding for BACnet MS/TP datalink from a Cimetrics U+4 which spews SNAP protocol packets. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@25291 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-llc.c')
-rw-r--r--epan/dissectors/packet-llc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index a41ef4c25d..f8cc30ec07 100644
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -193,6 +193,7 @@ http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r
{ OUI_PROFINET, "PROFIBUS Nutzerorganisation e.V." },
{ OUI_SONY_ERICSSON_3, "Sony Ericsson Mobile Communications AB" },
{ OUI_CATENA, "Catena Networks" },
+ { OUI_CIMETRICS, "Cimetrics" },
{ OUI_IEEE_802_3, "IEEE 802.3" },
{ OUI_MEDIA_ENDPOINT, "Media (TIA TR-41 Committee)" },
{ OUI_SONY_ERICSSON_4, "Sony Ericsson Mobile Communications AB" },