diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-05-28 21:21:23 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-05-28 21:21:23 +0000 |
| commit | a2b30d028c225a301eaddaeeee9ee55a24415725 (patch) | |
| tree | 6bbe4dc1fbbde30a4166053af7a1fe9cdf06555e /packet-llc.c | |
| parent | b977b382b3f2426c4a47637283e4d496dce2836a (diff) | |
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.
svn path=/trunk/; revision=2020
Diffstat (limited to 'packet-llc.c')
| -rw-r--r-- | packet-llc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/packet-llc.c b/packet-llc.c index 4b143a3ac9..df9a7a6394 100644 --- 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)) { |