From David Pelton:

Add  the ieee802a_add_oui function to libwireshark.def, and also adds the OUI that I am using to a couple of internal lists (in epan/oui.h and dissectors/packet-llc.c).

From me:
Resorted the oui  lists, some witespace changes and added Ericsson OUI:s.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@19262 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-llc.c b/epan/dissectors/packet-llc.c
index 6360936a43a3e15cd06a79993598ff045e7853d8..864dfc90e0407353b4a95bd4dc662ec3d54818b9 100644 (file)
--- a/epan/dissectors/packet-llc.c
+++ b/epan/dissectors/packet-llc.c
@@ -177,23 +177,38 @@ const value_string sap_vals[] = {
  * for the PIDs for VTP and DRiP that go with an OUI of OUI_CISCO.
  */
 const value_string oui_vals[] = {
-       { OUI_ENCAP_ETHER, "Encapsulated Ethernet" },
-       { OUI_APPLE_ATALK, "Apple (AppleTalk)" },
-       { OUI_ATM_FORUM,   "ATM Forum" },
-       /* RFC 2427, RFC 2684 */
-       { OUI_BRIDGED,     "Frame Relay or ATM bridged frames" },
-       { OUI_CABLE_BPDU,  "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
-       { OUI_SIEMENS,     "Siemens AG" },
-       { OUI_XEROX,       "Xerox" },
+       { OUI_ENCAP_ETHER,      "Encapsulated Ethernet" },
+       { OUI_XEROX,            "Xerox" },
 /*
 http://www.cisco.com/univercd/cc/td/doc/product/software/ios113ed/113ed_cr/ibm_r/brprt1/brsrb.htm
 */
-       { OUI_CISCO,       "Cisco" },
-       { OUI_CISCO_90,    "Cisco IOS 9.0 Compatible" },
-       { OUI_CISCOWL,     "Cisco Wireless (Aironet) L2" },
-       { OUI_EXTREME,     "Extreme Networks" },
-       { OUI_HP,          "Hewlett-Packard" },
-       { OUI_NORTEL,      "Nortel Networks SONMP" },
+       { OUI_CISCO,                    "Cisco" },
+       { OUI_NORTEL,                   "Nortel Networks SONMP" },
+       { OUI_CISCO_90,                 "Cisco IOS 9.0 Compatible" },
+       { OUI_ERICSSON,                 "Ericsson Group" },
+       { OUI_SONY_ERICSSON,    "Sony Ericsson Mobile Communications AB" },
+       { OUI_SONY_ERICSSON_2,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_PROFINET,                 "PROFIBUS Nutzerorganisation e.V." },
+       { OUI_SONY_ERICSSON_3,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_CATENA,                   "Catena Networks" },
+       { OUI_IEEE_802_3,               "IEEE 802.3" },
+       { OUI_MEDIA_ENDPOINT,   "Media (TIA TR-41 Committee)" },
+       { OUI_SONY_ERICSSON_4,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_ERICSSON_MOBILE,  "Ericsson Mobile Platforms" },
+       { OUI_SONY_ERICSSON_5,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_SONY_ERICSSON_6,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_SONY_ERICSSON_7,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_SONY_ERICSSON_8,  "Sony Ericsson Mobile Communications AB" },
+       { OUI_CISCOWL,                  "Cisco Wireless (Aironet) L2" },
+       { OUI_ERICSSON_2,                       "Ericsson Group" },
+       { OUI_BRIDGED,                  "Frame Relay or ATM bridged frames" },
+       { OUI_ATM_FORUM,                "ATM Forum" },
+       { OUI_EXTREME,                  "Extreme Networks" },
+       /* RFC 2427, RFC 2684 */
+       { OUI_CABLE_BPDU,               "DOCSIS Spanning Tree" }, /* DOCSIS spanning tree BPDU */
+       { OUI_SIEMENS,                  "Siemens AG" },
+       { OUI_APPLE_ATALK,              "Apple (AppleTalk)" },
+       { OUI_HP,                               "Hewlett-Packard" },
        { 0,               NULL }
 };
 

diff --git a/epan/libwireshark.def b/epan/libwireshark.def
index 1dc90d509e5dd40c7505a638c8d0fd6ab5cd1846..e9a34311ac0b798d74a338ce05fe6fe1f6ff4503 100644 (file)
--- a/epan/libwireshark.def
+++ b/epan/libwireshark.def
@@ -411,6 +411,7 @@ hf_frame_packet_len             DATA
 hf_text_only                    DATA
 host_ip_af
 host_name_lookup_process
+ieee802a_add_oui
 incomplete_tcp_stream           DATA
 InfoRequestNakReason_vals       DATA
 init_dissection

diff --git a/epan/oui.h b/epan/oui.h
index 59bab2f6d9627f60749c82b46f7a66706c9451b6..db0ac06b2c290d87c457f8bc0887a93df0254298 100644 (file)
--- a/epan/oui.h
+++ b/epan/oui.h
@@ -25,25 +25,50 @@
 #ifndef __OUI_H__
 #define __OUI_H__
 
+/*
+ * See
+ *
+ * http://standards.ieee.org/regauth/oui/oui.txt
+ *
+ * http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/vlan.htm
+ *
+ * for the PIDs for VTP and DRiP that go with an OUI of OUI_CISCO.
+ */
+
 #define        OUI_ENCAP_ETHER         0x000000        /* encapsulated Ethernet */
-#define        OUI_XEROX               0x000006        /* Xerox */
-#define        OUI_CISCO               0x00000C        /* Cisco (future use) */
-#define OUI_NORTEL             0x000081        /* Nortel SONMP */
+#define        OUI_XEROX                       0x000006        /* Xerox */
+#define        OUI_CISCO                       0x00000C        /* Cisco (future use) */
+#define OUI_NORTEL                     0x000081        /* Nortel SONMP */
 #define        OUI_CISCO_90            0x0000F8        /* Cisco (IOS 9.0 and above?) */
-#define OUI_CISCOWL            0x004096        /* Cisco Wireless (Aironet) */
-#define OUI_BRIDGED            0x0080C2        /* Bridged Frame-Relay, RFC 2427 */
-                                               /* and Bridged ATM, RFC 2684 */
+#define OUI_ERICSSON           0x0001EC        /* Ericsson Group */    
+#define OUI_CATENA                     0x00025A        /* Catena Networks */
+#define OUI_SONY_ERICSSON      0x000AD9        /* Sony Ericsson Mobile Communications AB */
+#define OUI_SONY_ERICSSON_2    0x000E07        /* Sony Ericsson Mobile Communications AB */
+#define OUI_PROFINET           0x000ECF        /* PROFIBUS Nutzerorganisation e.V. */
+#define OUI_SONY_ERICSSON_3    0x000FDE        /* Sony Ericsson Mobile Communications AB */
+#define OUI_IEEE_802_3         0x00120F        /* IEEE 802.3 */
+#define OUI_MEDIA_ENDPOINT     0x0012BB        /* Media (TIA TR-41 Committee) */
+#define OUI_SONY_ERICSSON_4    0x0012EE        /* Sony Ericsson Mobile Communications AB */
+#define OUI_ERICSSON_MOBILE 0x0015E0   /* Ericsson Mobile Platforms */ 
+#define OUI_SONY_ERICSSON_5    0x001620        /* Sony Ericsson Mobile Communications AB */
+#define OUI_SONY_ERICSSON_6    0x0016B8        /* Sony Ericsson Mobile Communications AB */
+#define OUI_SONY_ERICSSON_7    0x001813        /* Sony Ericsson Mobile Communications AB */
+#define OUI_SONY_ERICSSON_8    0x001963        /* Sony Ericsson Mobile Communications AB */
+#define OUI_CISCOWL                    0x004096        /* Cisco Wireless (Aironet) */
+#define OUI_ERICSSON_2         0x008037        /* Ericsson Group */    
+#define OUI_BRIDGED                    0x0080C2        /* Bridged Frame-Relay, RFC 2427 */
+                                                                               /* and Bridged ATM, RFC 2684 */
+#define OUI_IEEE_802_1         0x0080C2        /* IEEE 802.1 Committee */
 #define        OUI_ATM_FORUM           0x00A03E        /* ATM Forum */
-#define OUI_EXTREME            0x00E02B        /* Extreme EDP/ESRP */
+#define OUI_EXTREME                    0x00E02B        /* Extreme EDP/ESRP */
 #define OUI_CABLE_BPDU         0x00E02F        /* DOCSIS spanning tree BPDU */
-#define        OUI_SIEMENS             0x080006        /* Siemens AG */
+#define        OUI_SIEMENS                     0x080006        /* Siemens AG */
 #define        OUI_APPLE_ATALK         0x080007        /* Appletalk */
-#define        OUI_HP                  0x080009        /* Hewlett-Packard */
-#define OUI_IEEE_802_1         0x0080C2        /* IEEE 802.1 Committee */
-#define OUI_IEEE_802_3         0x00120F        /* IEEE 802.3 */
-#define OUI_MEDIA_ENDPOINT     0x0012BB        /* Media (TIA TR-41 Committee) */
-#define OUI_PROFINET           0x000ECF        /* PROFIBUS Nutzerorganisation e.V. */
+#define        OUI_HP                          0x080009        /* Hewlett-Packard */
 
+/* 
+ * Defined in packet-llc.c
+ */
 extern const value_string oui_vals[];
 
 #endif