Use separate filters for the RTT found on a SACK and the RTT found on a

DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.


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

1 files changed, 309 insertions, 0 deletions

diff --git a/epan/dissectors/packet-sync.c b/epan/dissectors/packet-sync.c
new file mode 100644
index 0000000000..959af49dc5
--- /dev/null
+++ b/epan/dissectors/packet-sync.c
@@ -0,0 +1,309 @@
+/* packet-sync.c
+ * Routines for MBMS synchronisation protocol dissection
+ * Copyright 2012, David Wei <davidwei@lavabit.com>
+ *
+ * $Id$
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <glib.h>
+
+#include <epan/packet.h>
+
+#define TYPE_0_LEN 17
+#define TYPE_1_LEN 11
+#define TYPE_2_LEN 12
+#define TYPE_3_LEN 19
+
+/* Initialize the protocol and registered fields */
+static int proto_sync = -1;
+static int hf_sync_type = -1;
+static int hf_sync_spare4 = -1;
+static int hf_sync_timestamp = -1;
+static int hf_sync_packet_nr = -1;
+static int hf_sync_elapsed_octet_ctr = -1;
+static int hf_sync_total_nr_of_packet = -1;
+static int hf_sync_total_nr_of_octet = -1;
+static int hf_sync_header_crc = -1;
+static int hf_sync_payload_crc = -1;
+static int hf_sync_length_of_packet = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_sync = -1;
+
+static dissector_handle_t sync_handle;
+static dissector_handle_t ip_handle;
+
+static const value_string sync_type_vals[] = {
+    { 0, "Synchronisation frame without payload" },
+    { 1, "User data with synchronisation frame for uncompressed headers" },
+    { 2, "User data with synchronisation frame for compressed headers" },
+    { 3, "Synchronisation frame with Length of Packets" },
+    /* 4-15 reserved for future PDU type extensions */
+    { 0, NULL}
+};
+
+static int
+dissect_sync(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+    proto_item *ti;
+    proto_tree *sync_tree;
+    guint8      type, spare;
+    guint16     packet_nr, packet_len1, packet_len2;
+    guint32     timestamp, total_nr_of_packet;
+    int         offset = 0;
+    tvbuff_t   *next_tvb;
+
+    type  = tvb_get_guint8(tvb, offset) >> 4;
+    spare = tvb_get_guint8(tvb, offset) & 0x0F;
+
+    /* Heuristics to check if packet is really MBMS sync */
+#if 0
+    if ( type > 3 )
+        return 0;
+
+    if ( type == 0 && tvb_length(tvb) < 18) {
+        return 0;
+    } else if ( type == 1 && tvb_length(tvb) < 11 ) {
+        return 0;
+    } else if ( type == 3 && tvb_length(tvb) < 19 ) {
+        return 0;
+    }
+
+    if ( (type != 2) && (spare != 0) )
+        return 0;
+#endif
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "SYNC");
+    col_set_str(pinfo->cinfo, COL_INFO, "MBMS synchronisation protocol");
+
+    /* Ugly, but necessary to get the correct length for type 3 */
+    packet_nr = tvb_get_ntohs(tvb, offset+3);
+
+    if (tree) {
+        /* The length varies depending on PDU type */
+        switch (type) {
+            case 0:
+                ti = proto_tree_add_item(tree, proto_sync, tvb, 0, TYPE_0_LEN, ENC_NA);
+                break;
+            case 1:
+                ti = proto_tree_add_item(tree, proto_sync, tvb, 0, TYPE_1_LEN, ENC_NA);
+                break;
+            case 2:
+                ti = proto_tree_add_item(tree, proto_sync, tvb, 0, TYPE_2_LEN + (spare & 0x01 ? 40 : 20), ENC_NA);
+                break;
+            case 3:
+                ti = proto_tree_add_item(tree, proto_sync, tvb, 0,
+                                         TYPE_3_LEN + (gint16)(packet_nr % 2 == 0 ?
+                                                               1.5*packet_nr : 1.5*(packet_nr-1)+2),
+                                         ENC_NA);
+                break;
+            default:
+                ti = proto_tree_add_item(tree, proto_sync, tvb, 0, -1, ENC_NA);
+                break;
+        }
+
+        sync_tree = proto_item_add_subtree(ti, ett_sync);
+
+        /* Octet 1 - PDU Type */
+        proto_tree_add_item(sync_tree, hf_sync_type, tvb, offset, 1, ENC_BIG_ENDIAN);
+        proto_tree_add_item(sync_tree, hf_sync_spare4, tvb, offset, 1, ENC_BIG_ENDIAN);
+        offset++;
+
+        /* Octet 2 - Time Stamp */
+        timestamp = tvb_get_ntohs(tvb, offset) * 10;
+        proto_tree_add_string_format(sync_tree, hf_sync_timestamp, tvb, offset, 2, "", "Timestamp: %u ms", timestamp);
+        offset += 2;
+
+        /* Octet 4 - Packet Number */
+        proto_tree_add_string_format(sync_tree, hf_sync_packet_nr, tvb, offset, 2, "", "Packet Number: %hu", packet_nr+1);
+        offset += 2;
+
+        /* Octet 6 - Elapsed Octet Counter */
+        proto_tree_add_item(sync_tree, hf_sync_elapsed_octet_ctr, tvb, offset, 4, ENC_BIG_ENDIAN);
+        offset += 4;
+
+        switch (type) {
+            case 0:
+                /* SYNC PDU Type 0 */
+                proto_tree_add_item(sync_tree, hf_sync_total_nr_of_packet, tvb, offset, 3, ENC_BIG_ENDIAN);
+                offset += 3;
+                proto_tree_add_item(sync_tree, hf_sync_total_nr_of_octet, tvb, offset, 5, ENC_BIG_ENDIAN);
+                offset += 5;
+                proto_tree_add_item(sync_tree, hf_sync_header_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
+                offset++;
+                break;
+            case 1:
+                /* SYNC PDU Type 1 */
+                /* XXX - Calculate the CRC and check against this value? */
+                proto_tree_add_item(sync_tree, hf_sync_header_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
+                proto_tree_add_item(sync_tree, hf_sync_payload_crc, tvb, offset, 2, ENC_BIG_ENDIAN);
+                offset += 2;
+
+                /* XXX - The payload may not always be present? */
+                next_tvb = tvb_new_subset(tvb, offset, -1, -1);
+                /* XXX - The payload may not always be IP? */
+                call_dissector(ip_handle, next_tvb, pinfo, tree);
+                break;
+            case 2:
+                /* SYNC PDU Type 2 */
+                proto_tree_add_text(tree, tvb, offset, -1, "SYNC PDU type 2 unsupported");
+                break;
+            case 3:
+                /* SYNC PDU Type 3 */
+                total_nr_of_packet = tvb_get_ntoh24(tvb, offset);
+                proto_tree_add_item(sync_tree, hf_sync_total_nr_of_packet, tvb, offset, 3, ENC_BIG_ENDIAN);
+                offset += 3;
+                proto_tree_add_item(sync_tree, hf_sync_total_nr_of_octet, tvb, offset, 5, ENC_BIG_ENDIAN);
+                offset += 5;
+                proto_tree_add_item(sync_tree, hf_sync_header_crc, tvb, offset, 1, ENC_BIG_ENDIAN);
+                proto_tree_add_item(sync_tree, hf_sync_payload_crc, tvb, offset, 2, ENC_BIG_ENDIAN);
+                offset += 2;
+
+                if (offset < (gint)tvb_reported_length(tvb)) {
+                    int i;
+
+                    if (total_nr_of_packet != 0 && packet_nr % 2 == 0) {
+                        /* Even number of packets */
+                        for (i = 1; i < packet_nr; i+=2, offset+=3) {
+                            packet_len1 = tvb_get_bits16(tvb, offset*8,    12, ENC_BIG_ENDIAN);
+                            packet_len2 = tvb_get_bits16(tvb, offset*8+12, 12, ENC_BIG_ENDIAN);
+                            proto_tree_add_string_format(sync_tree, hf_sync_length_of_packet, tvb, offset,   2, "", "Length of Packet %u : %hu", i,   packet_len1);
+                            proto_tree_add_string_format(sync_tree, hf_sync_length_of_packet, tvb, offset+1, 2, "", "Length of Packet %u : %hu", i+1, packet_len2);
+                        }
+                    } else {
+                        /* Odd number of packets */
+                        for (i = 1; i < packet_nr; i+=2, offset+=3) {
+                            packet_len1 = tvb_get_bits16(tvb, offset*8,    12, ENC_BIG_ENDIAN);
+                            packet_len2 = tvb_get_bits16(tvb, offset*8+12, 12, ENC_BIG_ENDIAN);
+                            proto_tree_add_string_format(sync_tree, hf_sync_length_of_packet, tvb, offset,   2, "", "Length of Packet %u : %hu", i,   packet_len1);
+                            proto_tree_add_string_format(sync_tree, hf_sync_length_of_packet, tvb, offset+1, 2, "", "Length of Packet %u : %hu", i+1, packet_len2);
+                        }
+                        packet_len1 = tvb_get_bits16(tvb, offset*8, 12, ENC_BIG_ENDIAN);
+                        proto_tree_add_string_format(sync_tree, hf_sync_length_of_packet, tvb, offset, 2, "", "Length of Packet %u : %hu", packet_nr, packet_len1);
+                        offset++;
+                        proto_tree_add_item(sync_tree, hf_sync_spare4, tvb, offset, 1, ENC_BIG_ENDIAN);
+                    }
+
+                }
+                break;
+            default:
+                proto_tree_add_text(tree, tvb, offset, -1, "Unknown SYNC PDU type");
+                break;
+        }
+    }
+
+    return tvb_length(tvb);
+
+}
+
+void
+proto_register_sync(void)
+{
+    static hf_register_info hf_sync[] = {
+        { &hf_sync_type,
+            { "PDU Type", "sync.type",
+            FT_UINT8, BASE_DEC, VALS(sync_type_vals), 0xF0,
+            NULL, HFILL }
+        },
+        { &hf_sync_spare4,
+            { "Spare", "sync.spare",
+            FT_UINT8, BASE_DEC, NULL, 0x0F,
+            NULL, HFILL }
+        },
+        { &hf_sync_timestamp,
+            { "Timestamp", "sync.timestamp",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            "Relative time value for the starting time of a synchronisation sequence within the synchronisation period.", HFILL }
+        },
+        { &hf_sync_packet_nr,
+            { "Packet Number", "sync.packet_nr",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            "Number of elapsed SYNC PDUs cumulatively within the synchronisation sequence.", HFILL }
+        },
+        { &hf_sync_elapsed_octet_ctr,
+            { "Elapsed Octet Counter", "sync.elapsed_octet_ctr",
+            FT_UINT32, BASE_DEC, NULL, 0x0,
+            "Number of elapsed cumulative octets cumulatively within one synchronisation sequence.", HFILL }
+        },
+        { &hf_sync_total_nr_of_packet,
+            { "Total Number of Packet", "sync.total_nr_of_packet",
+            FT_UINT24, BASE_DEC, NULL, 0x0,
+            "Cumulatively the number of the packets for the MBMS service within one synchronisation period.", HFILL }
+        },
+        { &hf_sync_total_nr_of_octet,
+            { "Total Number of Octet", "sync.total_nr_of_octet",
+            FT_UINT64, BASE_DEC, NULL, 0x0,
+            "Cumulatively the number of the octets for the MBMS service within one synchronisation period.", HFILL }
+        },
+        { &hf_sync_header_crc,
+            { "Header CRC", "sync.header_crc",
+            FT_UINT8, BASE_HEX, NULL, 0xFC,
+            NULL, HFILL }
+        },
+        { &hf_sync_payload_crc,
+            { "Payload CRC", "sync.payload_crc",
+            FT_UINT16, BASE_HEX, NULL, 0x3FF,
+            NULL, HFILL }
+        },
+        { &hf_sync_length_of_packet,
+            { "Length of Packet", "sync.length_of_packet",
+            FT_STRING, BASE_NONE, NULL, 0x0,
+            NULL, HFILL }
+        },
+    };
+
+    static gint *ett_sync_array[] = {
+        &ett_sync
+    };
+
+    proto_sync = proto_register_protocol("MBMS synchronisation protocol", "SYNC", "sync");
+
+    proto_register_field_array(proto_sync, hf_sync, array_length(hf_sync));
+    proto_register_subtree_array(ett_sync_array, array_length(ett_sync_array));
+
+    new_register_dissector("sync", dissect_sync, proto_sync);
+}
+
+void
+proto_reg_handoff_sync(void)
+{
+    sync_handle = new_create_dissector_handle(dissect_sync, proto_sync);
+    ip_handle   = find_dissector("ip");
+
+    dissector_add_handle("udp.port", sync_handle);
+}
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */