"dissect_llc()" is called for RFC 2684 LLC Encapsulation over ATM, so

LLC *does* have to support bridged frames over ATM; the correct bridge
padding is 2 (well, except for bridged 802.6 frames, but, if we ever
support that, we just wouldn't add "bridge_pad" to "offset+5" when
constructing the next tvbuff).

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

diff --git a/packet-llc.c b/packet-llc.c
index a41b9e2fccfa2f6db00f1391b41d9e850c9ec417..f6b6a5cbf03c9169f1264541f8d678d16c191130 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.79 2001/01/10 09:07:35 guy Exp $
+ * $Id: packet-llc.c,v 1.80 2001/01/11 07:24:17 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -332,7 +332,7 @@ dissect_llc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
        if (is_snap) {
                dissect_snap(tvb, 3, pinfo, tree, llc_tree, control,
-                   hf_llc_oui, hf_llc_type, hf_llc_pid, -1);
+                   hf_llc_oui, hf_llc_type, hf_llc_pid, 2);
        }
        else {
                if (check_col(pinfo->fd, COL_INFO)) {
@@ -421,16 +421,6 @@ dissect_snap(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tree *tree,
                            etype);
                }
 
-               if (bridge_pad == -1) {
-                       /*
-                        * This is LLC, for example, which, as far as I
-                        * know, doesn't support that type of bridging.
-                        */
-                       next_tvb = tvb_new_subset(tvb, offset+5, -1, -1);
-                       dissect_data(next_tvb, 0, pinfo, tree);
-                       break;
-               }
-                       
                switch (etype) {
 
                case BPID_ETH_WITH_FCS: