Fill in the 802.11 pseudo-header and call the "802.11+radio" dissector.

Do with the Prism and AVS headers what we do with the radiotap, PPI,
etc. headers.

Change-Id: I4b2522a2b294f53f22c363cd43604c4af0304fc2
Reviewed-on: https://code.wireshark.org/review/9082
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 24 insertions, 6 deletions

diff --git a/epan/dissectors/packet-ieee80211-prism.c b/epan/dissectors/packet-ieee80211-prism.c
index c953607035..3959f09571 100644
--- a/epan/dissectors/packet-ieee80211-prism.c
+++ b/epan/dissectors/packet-ieee80211-prism.c
@@ -36,6 +36,7 @@ void proto_reg_handoff_ieee80211_prism(void);
 
 static dissector_handle_t wlancap_handle;
 static dissector_handle_t ieee80211_handle;
+static dissector_handle_t ieee80211_radio_handle;
 
 static int proto_prism = -1;
 
@@ -200,7 +201,8 @@ static const value_string prism_did_vals[] =
 /*
  * The header file mentioned above says 0 means "supplied" and 1 means
  * "not supplied".  I haven't seen a capture file with anything other
- * than 0 there.
+ * than 0 there, but there is at least one driver that appears to use
+ * 1 for values it doesn't supply (the Linux acx-20080210 driver).
  */
 static const value_string prism_status_vals[] =
 {
@@ -292,6 +294,9 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
     guint byte_order;
     guint16 status;
     guint8 *devname_p;
+    guint32 channel;
+    guint32 rate;
+    struct ieee_802_11_phdr phdr;
 
     offset = 0;
     did = 0;
@@ -326,6 +331,12 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         return;
     }
 
+    /* We don't have any 802.11 metadata yet. */
+    phdr.fcs_len = -1;
+    phdr.decrypted = FALSE;
+    phdr.datapad = FALSE;
+    phdr.presence_flags = 0;
+
     col_set_str(pinfo->cinfo, COL_PROTOCOL, "Prism");
     col_clear(pinfo->cinfo, COL_INFO);
 
@@ -405,11 +416,14 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
               case PRISM_TYPE1_CHANNEL:
               case PRISM_TYPE2_CHANNEL:
+                channel = tvb_get_enctohl(tvb, offset, byte_order);
+                phdr.presence_flags |= PHDR_802_11_HAS_CHANNEL;
+                phdr.channel = channel;
                 if(tree){
                     proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_channel, tvb, offset, 4, byte_order);
-                    proto_item_append_text(ti_did, " %d", tvb_get_enctohl(tvb, offset, byte_order) );
+                    proto_item_append_text(ti_did, " %u", channel);
                 }
-                col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", tvb_get_enctohl(tvb, offset, byte_order));
+                col_add_fstr(pinfo->cinfo, COL_FREQ_CHAN, "%u", channel);
               break;
 
               case PRISM_TYPE1_RSSI:
@@ -447,11 +461,14 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
               case PRISM_TYPE1_RATE:
               case PRISM_TYPE2_RATE:
+                rate = tvb_get_enctohl(tvb, offset, byte_order);
+                phdr.presence_flags |= PHDR_802_11_HAS_DATA_RATE;
+                phdr.data_rate = rate;
                 if(tree){
                     proto_tree_add_item(prism_did_tree, hf_ieee80211_prism_did_rate, tvb, offset, 4, byte_order);
-                    proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(tvb_get_enctohl(tvb, offset, byte_order)) );
+                    proto_item_append_text(ti_did, " %s Mb/s", prism_rate_return(rate));
                 }
-                col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(tvb_get_enctohl(tvb, offset, byte_order)) );
+                col_add_fstr(pinfo->cinfo, COL_TX_RATE, "%s", prism_rate_return(rate));
               break;
 
               case PRISM_TYPE1_ISTX:
@@ -482,7 +499,7 @@ dissect_prism(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* dissect the 802.11 header next */
     next_tvb = tvb_new_subset_remaining(tvb, offset);
-    call_dissector(ieee80211_handle, next_tvb, pinfo, tree);
+    call_dissector_with_data(ieee80211_radio_handle, next_tvb, pinfo, tree, (void *)&phdr);
 }
 
 static hf_register_info hf_prism[] = {
@@ -581,6 +598,7 @@ void proto_reg_handoff_ieee80211_prism(void)
   prism_handle = create_dissector_handle(dissect_prism, proto_prism);
   dissector_add_uint("wtap_encap", WTAP_ENCAP_IEEE_802_11_PRISM, prism_handle);
   ieee80211_handle = find_dissector("wlan");
+  ieee80211_radio_handle = find_dissector("wlan_radio");
   wlancap_handle = find_dissector("wlancap");
 }