Use "tvb_get_ntoh24()" to extract the OUI from a SNAP header, rather

than extracting each byte with "tvb_get_guint8()" and then putting them
together.

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

diff --git a/packet-llc.c b/packet-llc.c
index 4b143a3ac90e25099093909be79f8786664c6cce..df9a7a63943256d5e3145889d12a0da1912327b3 100644 (file)
--- a/packet-llc.c
+++ b/packet-llc.c
@@ -2,7 +2,7 @@
  * Routines for IEEE 802.2 LLC layer
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-llc.c,v 1.61 2000/05/19 04:54:33 gram Exp $
+ * $Id: packet-llc.c,v 1.62 2000/05/28 21:21:23 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -327,9 +327,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         * than overwriting it?
         */
        if (is_snap) {
-               oui =   tvb_get_guint8(tvb, 3) << 16 |
-                       tvb_get_guint8(tvb, 4) << 8  |
-                       tvb_get_guint8(tvb, 5);
+               oui =   tvb_get_ntoh24(tvb, 3);
                etype = tvb_get_ntohs(tvb, 6);
 
                if (check_col(pinfo->fd, COL_INFO)) {