Added support for Router-Alert IP option (RFC2113)

[obnox/wireshark/wip.git] / packet-ieee80211.c

diff --git a/packet-ieee80211.c b/packet-ieee80211.c
index cef385c824b0827716916b75fb11c59f191a89f1..91b43088c78385ca726e425bc9d1f53062bf3f15 100644 (file)
--- a/packet-ieee80211.c
+++ b/packet-ieee80211.c
@@ -3,7 +3,7 @@
  * Copyright 2000, Axis Communications AB 
  * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com
  *
- * $Id: packet-ieee80211.c,v 1.3 2000/11/19 08:53:58 guy Exp $
+ * $Id: packet-ieee80211.c,v 1.6 2000/12/02 09:09:25 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@unicom.net>
@@ -746,6 +746,8 @@ dissect_ieee80211 (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
   cap_len = pinfo->captured_len;
   fcf = tvb_get_letohs (tvb, 0);
 
+  CHECK_DISPLAY_AS_DATA(proto_wlan, tvb, pinfo, tree);
+
   pinfo->current_proto = capture_proto_name;
 
   if (check_col (pinfo->fd, COL_PROTOCOL))
@@ -1733,7 +1735,13 @@ proto_register_wlan (void)
     &ett_cap_tree,
   };
 
-  proto_wlan = proto_register_protocol ("Wireless ethernet", "wlan");
+  proto_wlan = proto_register_protocol ("IEEE 802.11 wireless LAN", "wlan");
   proto_register_field_array (proto_wlan, hf, array_length (hf));
   proto_register_subtree_array (tree_array, array_length (tree_array));
 }
+
+void
+proto_reg_handoff_wlan(void)
+{
+       dissector_add("wtap_encap", WTAP_ENCAP_IEEE_802_11, dissect_ieee80211);
+}