From Hakim Bellam:

-Added support for aggregate frames
-Added correct decoding for most fields

svn path=/trunk/; revision=25945

1 files changed, 243 insertions, 84 deletions

diff --git a/epan/dissectors/packet-turbocell.c b/epan/dissectors/packet-turbocell.c
index 597f10ce56..4f4713e236 100644
--- a/epan/dissectors/packet-turbocell.c
+++ b/epan/dissectors/packet-turbocell.c
@@ -29,6 +29,12 @@
  * these packets, or if you can supply packet captures from turbocell 
  * networks, contact kiltedtaco@xxxxxxxxx */
 
+/* 2008-08-05 : Added support for aggregate frames.
+ * AP mode, NWID and sat mode fiels identification were
+ * taken from http://aphopper.sourceforge.net/turbocell.html
+ * everything else is based on (educated) guesses.
+*/
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -40,83 +46,104 @@
 #include <glib.h>
 
 #include <epan/packet.h>
+#include <epan/strutil.h>
 
 #include "oui.h"
 
-#define TURBOCELL_TYPE_BEACON	0x00
-#define TURBOCELL_TYPE_DATA	0x01
-#define TURBOCELL_TYPE_MANAGEMENT	0x11
-#define TURBOCELL_TYPE_NAME	0xA0
+#define TURBOCELL_TYPE_BEACON_NON_POLLING  0x00
+#define TURBOCELL_TYPE_BEACON_NORMAL	   0x40
+#define TURBOCELL_TYPE_BEACON_POLLING      0x80
+#define TURBOCELL_TYPE_BEACON_ISP          0xA0
+
+#define TURBOCELL_TYPE_DATA             0x01
+#define TURBOCELL_TYPE_MANAGEMENT       0x11
+
+#define TURBOCELL_SATTELITE_MODE_DENY  0x1
+#define TURBOCELL_SATTELITE_MODE_ALLOW 0x2
+
+#define STATION(i) \
+            { &hf_turbocell_station[i], \
+            { "Station " #i , "turbocell.station", \
+            FT_ETHER, BASE_NONE, NULL, 0, \
+            "connected stations / satellites ?", HFILL } \
+        }
 
 /* Initialize the protocol and registered fields */
+
 static int proto_turbocell = -1;
+static int proto_aggregate = -1;
+
 static int hf_turbocell_type = -1;
-static int hf_turbocell_baseid = -1;
+static int hf_turbocell_dst = -1;
 static int hf_turbocell_counter = -1;
-static int hf_turbocell_station_number = -1;
 static int hf_turbocell_name = -1;
-static int hf_turbocell_base[6];
+static int hf_turbocell_nwid = -1;
+static int hf_turbocell_satmode = -1;
+static int hf_turbocell_unknown = -1;
+static int hf_turbocell_timestamp  = -1;
+static int hf_turbocell_station[32]={-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
+static int hf_turbocell_ip = -1;
+
+static int hf_turbocell_aggregate_msdu_header_text = -1;
+static int hf_turbocell_aggregate_msdu_len = -1;
+static int hf_turbocell_aggregate_unknown1 = -1;
+static int hf_turbocell_aggregate_unknown2 = -1;
+static int hf_turbocell_aggregate_len = -1;
 
 /* Initialize the subtree pointers */
 static gint ett_turbocell = -1;
 static gint ett_network = -1;
+static gint ett_msdu_aggregation_parent_tree = -1;
+static gint ett_msdu_aggregation_subframe_tree = -1;
 
 /* The ethernet dissector we hand off to */
-static dissector_handle_t eth_handle;
+static dissector_handle_t eth_handle=NULL;
+
+static dissector_handle_t data_handle=NULL;
 
-/* Guesses at what the first byte of the protocol id means */
 static const value_string turbocell_type_values[] = {
-    { TURBOCELL_TYPE_BEACON,     "Beacon" },
-    { TURBOCELL_TYPE_DATA,       "Data packet" },
-    { TURBOCELL_TYPE_MANAGEMENT, "Management Packet" },
-    { TURBOCELL_TYPE_NAME,       "Name" },
+    { TURBOCELL_TYPE_BEACON_NON_POLLING, "Beacon (Non-Polling Base Station)" },
+    { TURBOCELL_TYPE_BEACON_NORMAL,      "Beacon (Normal Base Station)" },
+    { TURBOCELL_TYPE_BEACON_POLLING,     "Beacon (Polling Base Station)" },
+    { TURBOCELL_TYPE_BEACON_ISP,         "Beacon (ISP Base Station)" },
+    { TURBOCELL_TYPE_DATA,               "Data Packet" },
+    { TURBOCELL_TYPE_MANAGEMENT,         "Management Packet" },
+    { 0, NULL }
+};
+
+static const value_string turbocell_satmode_values[] = {
+    { TURBOCELL_SATTELITE_MODE_DENY,     "Allowed to connect" },
+    { TURBOCELL_SATTELITE_MODE_ALLOW,    "NOT allowed to connect" },
     { 0, NULL }
 };
 
 
-static void
-dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+static void dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 
     proto_item *ti, *name_item;
     proto_tree *turbocell_tree, *network_tree;
     tvbuff_t   *next_tvb;
-    int i;
+    int i=0;
+    guint8 packet_type;
+    guint8 * str_name;
+    guint str_len;
 
-    if (tree) {
-        ti = proto_tree_add_item(tree, proto_turbocell, tvb, 0, -1, FALSE);
-
-        turbocell_tree = proto_item_add_subtree(ti, ett_turbocell);
-
-        proto_tree_add_item(turbocell_tree, hf_turbocell_type, tvb, 0, 1, FALSE);
-        proto_tree_add_item(turbocell_tree, hf_turbocell_baseid, tvb, 4, 6, FALSE);
-        proto_tree_add_item(turbocell_tree, hf_turbocell_station_number, tvb, 10, 1, FALSE);
-        proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 2, 2, FALSE);
-
-        if (tvb_get_guint8(tvb, 0) == TURBOCELL_TYPE_NAME) {
-            name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, FALSE);
-            network_tree = proto_item_add_subtree(name_item, ett_network);
-
-            for (i=0; i<6; i++) {
-                proto_tree_add_item(network_tree, hf_turbocell_base[i], tvb, 0x34+8*i, 6, FALSE);
-            }
-        }
-    }
+    packet_type = tvb_get_guint8(tvb, 0);
 
-    if (tvb_get_guint8(tvb, 0) == TURBOCELL_TYPE_BEACON) {
+    if (!(packet_type & 0x0F)){
         if (check_col(pinfo->cinfo, COL_INFO))
             col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Beacon)");
         if (check_col(pinfo->cinfo, COL_PROTOCOL))
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell");
-    } else if ((tvb_get_guint8(tvb, 0) == TURBOCELL_TYPE_DATA) || (tvb_get_guint8(tvb, 0) == TURBOCELL_TYPE_MANAGEMENT)) {
-        /* The hardcoded 0x1A offset here is where the ethernet header
-         * appears to always start. It would not suprize me if it changed
-         * between different networks, though. */
-        next_tvb = tvb_new_subset(tvb, 0x1a, -1, -1);
-        call_dissector(eth_handle, next_tvb, pinfo, tree);
-    } else if (tvb_get_guint8(tvb, 0) == TURBOCELL_TYPE_NAME) {
+    }  else if ( packet_type == TURBOCELL_TYPE_MANAGEMENT ) {
         if (check_col(pinfo->cinfo, COL_INFO))
-            col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Name)");
+            col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Management)");
+        if (check_col(pinfo->cinfo, COL_PROTOCOL))
+            col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell");
+    } else if ( packet_type == TURBOCELL_TYPE_DATA ) {
+        if (check_col(pinfo->cinfo, COL_INFO))
+            col_set_str(pinfo->cinfo, COL_INFO, "Turbocell Packet (Data)");
         if (check_col(pinfo->cinfo, COL_PROTOCOL))
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell");
     } else {
@@ -125,8 +152,109 @@ dissect_turbocell(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         if (check_col(pinfo->cinfo, COL_PROTOCOL))
             col_set_str(pinfo->cinfo, COL_PROTOCOL, "Turbocell");
     }
-}
 
+    if (tree) {
+        gint remaining_length;
+        ti = proto_tree_add_item(tree, proto_turbocell, tvb, 0, 20, FALSE);
+
+        turbocell_tree = proto_item_add_subtree(ti, ett_turbocell);
+
+        proto_tree_add_item(turbocell_tree, hf_turbocell_type, tvb, 0, 1, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_satmode, tvb, 1, 1, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_nwid, tvb, 1, 1, FALSE);
+
+        /* it seem when we have this magic number,that means an alternate header version */
+
+        if (tvb_get_bits64(tvb, 64,48,FALSE) != G_GINT64_CONSTANT(0x000001fe23dc45ba)){ 
+        proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x02, 2, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x04, 6, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x0A, 3, FALSE);
+
+        } else {
+        proto_tree_add_item(turbocell_tree, hf_turbocell_timestamp, tvb, 0x02, 3, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_counter, tvb, 0x05, 3, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_dst, tvb, 0x08, 6, FALSE);
+        }
+
+        proto_tree_add_item(turbocell_tree, hf_turbocell_unknown, tvb, 0x0E, 2, FALSE);
+        proto_tree_add_item(turbocell_tree, hf_turbocell_ip, tvb, 0x10, 4, FALSE);
+
+
+        remaining_length=tvb_length_remaining(tvb, 0x14);
+
+        if (remaining_length > 6) {
+
+            /* If the first character is a printable character that means we have a payload with network info */
+            /* I couldn't find anything in the header that would definitvely indicate if payload is either data or network info */
+            /* Since the frame size is limited this should work ok */
+
+            if (tvb_get_guint8(tvb, 0x14)>=0x20){
+                name_item = proto_tree_add_item(turbocell_tree, hf_turbocell_name, tvb, 0x14, 30, FALSE);
+                network_tree = proto_item_add_subtree(name_item, ett_network);
+
+                str_name=tvb_get_ephemeral_stringz(tvb, 0x14, &str_len);
+                if (check_col (pinfo->cinfo, COL_INFO) && str_len > 0) 
+                    col_append_fstr(pinfo->cinfo, COL_INFO, ", Network=\"%s\"",format_text(str_name, str_len-1));
+
+                while(tvb_get_guint8(tvb, 0x34 + 8*i)==0x00 && (tvb_length_remaining(tvb,0x34 + 8*i) > 6) && (i<32)) {
+                    proto_tree_add_item(network_tree, hf_turbocell_station[i], tvb, 0x34+8*i, 6, FALSE);
+                    i++;
+                }
+
+                /*Couldn't make sense of the apparently random data in the end*/
+
+                next_tvb = tvb_new_subset(tvb, 0x34 + 8*i, -1, -1);
+                call_dissector(data_handle, next_tvb, pinfo, tree);
+
+            } else {
+
+                tvbuff_t *volatile msdu_tvb = NULL,*next_tvb;
+                guint32 msdu_offset = 0x04;
+                guint16 j = 1;
+                guint16 msdu_length;
+
+                proto_item *parent_item;
+                proto_tree *mpdu_tree;
+                proto_tree *subframe_tree;
+
+                next_tvb = tvb_new_subset(tvb, 0x14, -1, tvb_get_ntohs(tvb, 0x14));
+                parent_item = proto_tree_add_protocol_format(tree, proto_aggregate, next_tvb, 0,
+                              tvb_reported_length_remaining(next_tvb, 0), "Turbocell Aggregate Frames");
+                mpdu_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_parent_tree);
+                proto_tree_add_item(mpdu_tree, hf_turbocell_aggregate_len, next_tvb, 0x00, 2, FALSE);
+                proto_tree_add_item(mpdu_tree, hf_turbocell_aggregate_unknown1, next_tvb, 0x02, 2, FALSE);
+
+                remaining_length=tvb_length_remaining(next_tvb, msdu_offset);
+
+                do {
+                    msdu_length = (tvb_get_letohs(next_tvb, msdu_offset) & 0x0FFF);
+                    if (msdu_length==0) break;
+                    parent_item = proto_tree_add_uint_format(mpdu_tree, hf_turbocell_aggregate_msdu_header_text,
+                    next_tvb,msdu_offset, msdu_length + 0x02,j, "A-MSDU Subframe #%u", j);
+
+                    subframe_tree = proto_item_add_subtree(parent_item, ett_msdu_aggregation_subframe_tree);
+                    j++;
+
+                    proto_tree_add_uint_format(subframe_tree, hf_turbocell_aggregate_msdu_len, next_tvb, msdu_offset, 2,
+                    msdu_length, "MSDU length: %u (0x%04X)", msdu_length,msdu_length);
+                    proto_tree_add_item(subframe_tree, hf_turbocell_aggregate_unknown2, next_tvb, msdu_offset+1, 1, FALSE);
+
+                    msdu_offset += 0x02;
+                    remaining_length -= 0x02;
+                    msdu_tvb = tvb_new_subset(next_tvb, msdu_offset, (msdu_length>remaining_length)?remaining_length:msdu_length, msdu_length);
+                    call_dissector(eth_handle, msdu_tvb, pinfo, subframe_tree);
+                    msdu_offset += msdu_length;
+                    remaining_length -= msdu_length;
+                } while (remaining_length > 6);
+
+                if (remaining_length > 2) {
+                    next_tvb = tvb_new_subset(next_tvb, msdu_offset, -1, -1);
+                    call_dissector(data_handle, next_tvb, pinfo, tree);
+                }
+            }
+        }
+    }
+}
 
 /* Register the protocol with Wireshark */
 
@@ -139,69 +267,99 @@ void proto_register_turbocell(void)
             FT_UINT8, BASE_HEX, VALS(turbocell_type_values), 0,
             NULL, HFILL }
         },
-        { &hf_turbocell_baseid,
-            { "Base Station ID", "turbocell.baseid",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Seems to stay constant per base station", HFILL }
+        { &hf_turbocell_satmode,
+            { "Satellite Mode", "turbocell.satmode",
+            FT_UINT8, BASE_HEX, VALS(turbocell_satmode_values), 0xF0,
+            NULL, HFILL }
         },
-        { &hf_turbocell_station_number,
-            { "Station Number", "turbocell.stationnum",
-            FT_UINT8, BASE_HEX, NULL, 0,
-            "Seems to stay constant per station", HFILL }
+        { &hf_turbocell_nwid,
+            { "Network ID", "turbocell.nwid",
+            FT_UINT8, BASE_DEC, NULL, 0x0F,
+            NULL, HFILL }
         },
         { &hf_turbocell_counter,
             { "Counter", "turbocell.counter",
-            FT_UINT16, BASE_DEC, NULL, 0,
-            "Increments alot", HFILL }
+            FT_UINT24, BASE_DEC_HEX, NULL, 0,
+            "Increments every frame (per station)", HFILL }
+        },
+        { &hf_turbocell_dst,
+            { "Destination", "turbocell.dst",
+            FT_ETHER, BASE_NONE, NULL, 0,
+            "Seems to be the destination", HFILL }
+        },
+
+        { &hf_turbocell_ip,
+            { "IP", "turbocell.ip",
+            FT_IPv4, BASE_DEC, NULL, 0,
+            "IP adress of base station ?", HFILL }
+        },
+
+        { &hf_turbocell_unknown,
+            { "Unknown", "turbocell.unknown",
+            FT_UINT16, BASE_HEX, NULL, 0,
+            "Always 0000", HFILL }
+        },
+
+        { &hf_turbocell_timestamp,
+            { "Timestamp (in 10 ms)", "turbocell.timestamp",
+            FT_UINT24, BASE_DEC_HEX, NULL, 0,
+            "Timestamp per station (since connection?)", HFILL }
         },
         { &hf_turbocell_name,
             { "Network Name", "turbocell.name",
             FT_STRINGZ, BASE_NONE, NULL, 0,
-            "Name", HFILL }
+            "Network Name", HFILL }
         },
-        { &hf_turbocell_base[0],
-            { "Base 0", "turbocell.base0",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Base station ID?", HFILL }
+        STATION(0),STATION(1),STATION(2),STATION(3),STATION(4),STATION(5),STATION(6),STATION(7),STATION(8),STATION(9),
+        STATION(10),STATION(11),STATION(12),STATION(13),STATION(14),STATION(15),STATION(16),STATION(17),STATION(18),STATION(19),
+        STATION(20),STATION(21),STATION(22),STATION(23),STATION(24),STATION(25),STATION(26),STATION(27),STATION(28),STATION(29),
+        STATION(30),STATION(31)
+    };
+
+  static hf_register_info aggregate_fields[] = {
+        { &hf_turbocell_aggregate_msdu_header_text,
+            {"MAC Service Data Unit (MSDU)",	"turbocell_aggregate.msduheader",
+            FT_UINT16, BASE_DEC, 0, 0x0000, "MAC Service Data Unit (MSDU)", HFILL }
         },
-        { &hf_turbocell_base[1],
-            { "Base 1", "turbocell.base1",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Base station ID?", HFILL }
+        { &hf_turbocell_aggregate_msdu_len,
+            {"MSDU length", "turbocell_aggregate.msdulen",
+            FT_UINT16, BASE_DEC_HEX, 0, 0x0FFF, "MSDU length", HFILL }
         },
-        { &hf_turbocell_base[2],
-            { "Base 2", "turbocell.base2",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Base station ID?", HFILL }
+        { &hf_turbocell_aggregate_len,
+            { "Total Length", "turbocell_aggregate.len",
+            FT_UINT16, BASE_DEC_HEX, NULL, 0,
+            "Total reported length", HFILL }
         },
-        { &hf_turbocell_base[3],
-            { "Base 3", "turbocell.base3",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Base station ID?", HFILL }
+        { &hf_turbocell_aggregate_unknown1,
+            { "Unknown", "turbocell_aggregate.unknown1",
+            FT_UINT16, BASE_HEX, NULL, 0,
+            "Always 0x7856", HFILL }
         },
-        { &hf_turbocell_base[4],
-            { "Base 4", "turbocell.base4",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Base station ID?", HFILL }
+        { &hf_turbocell_aggregate_unknown2,
+            { "Unknown", "turbocell_aggregate.unknown2",
+            FT_UINT8, BASE_HEX, NULL, 0xF0,
+            "have the values 0x4,0xC or 0x8 ", HFILL }
         },
-        { &hf_turbocell_base[5],
-            { "Base 5", "turbocell.base5",
-            FT_ETHER, BASE_NONE, NULL, 0,
-            "Base station ID?", HFILL }
-        }
-    };
+  };
 
     static gint *ett[] = {
         &ett_turbocell,
-        &ett_network
+        &ett_network,
+        &ett_msdu_aggregation_parent_tree,
+        &ett_msdu_aggregation_subframe_tree
     };
 
     proto_turbocell = proto_register_protocol("Turbocell Header", "Turbocell", "turbocell");
-
+    
+    proto_aggregate = proto_register_protocol("Turbocell Aggregate Data",
+    "Turbocell Aggregate Data", "turbocell_aggregate");
+    proto_register_field_array(proto_aggregate, aggregate_fields, array_length(aggregate_fields));
+    
     register_dissector("turbocell", dissect_turbocell, proto_turbocell);
 
     proto_register_field_array(proto_turbocell, hf, array_length(hf));
     proto_register_subtree_array(ett, array_length(ett));
+
 }
 
 
@@ -210,6 +368,7 @@ void proto_reg_handoff_turbocell(void)
     dissector_handle_t turbocell_handle;
 
     eth_handle = find_dissector("eth_withoutfcs");
+    data_handle = find_dissector("data");
 
     turbocell_handle = create_dissector_handle(dissect_turbocell, proto_turbocell);
 }