From a12c63a6e85c7bc8fc7c070b5d9a404b8a2927a4 Mon Sep 17 00:00:00 2001
From: martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Fri, 5 Nov 2010 18:00:35 +0000
Subject: Pass ueid + channel-info into PDCP dissector. This will allow me soon
 to track per-channel sequence numbers...

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@34793 f5534014-38df-0310-8fa8-9805f1628bb7
---
 epan/dissectors/packet-catapult-dct2000.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'epan/dissectors/packet-catapult-dct2000.c')

diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c
index 039e786e98..3142b1ec2b 100644
--- a/epan/dissectors/packet-catapult-dct2000.c
+++ b/epan/dissectors/packet-catapult-dct2000.c
@@ -881,6 +881,7 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset,
     struct pdcp_lte_info   *p_pdcp_lte_info = NULL;
     tvbuff_t               *pdcp_lte_tvb;
     guint16                ueid;
+    guint8                 channelId;
 
     /* Look this up so can update channel info */
     p_pdcp_lte_info = p_get_proto_data(pinfo->fd, proto_pdcp_lte);
@@ -931,9 +932,11 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset,
                     p_pdcp_lte_info->channelType = Channel_DCCH;
 
                     /* UEId */
+                    ueid = tvb_get_ntohs(tvb, offset);
                     proto_tree_add_item(tree, hf_catapult_dct2000_lte_ueid, tvb, offset, 2, FALSE);
                     col_append_fstr(pinfo->cinfo, COL_INFO,
-                                    " UEId=%u", tvb_get_ntohs(tvb, offset));
+                                    " UEId=%u", ueid);
+                    p_pdcp_lte_info->ueid = ueid;
                     offset += 2;
 
                     /* Get tag of channel type */
@@ -942,17 +945,21 @@ static void dissect_pdcp_lte(tvbuff_t *tvb, gint offset,
                     switch (tag) {
                         case 0:
                             offset++;
+                            channelId = tvb_get_guint8(tvb, offset);
                             col_append_fstr(pinfo->cinfo, COL_INFO, " SRB:%u",
-                                            tvb_get_guint8(tvb, offset));
+                                            channelId);
                             proto_tree_add_item(tree, hf_catapult_dct2000_lte_srbid,
                                                 tvb, offset++, 1, FALSE);
+                            p_pdcp_lte_info->channelId = channelId;
                             break;
                         case 1:
                             offset++;
+                            channelId = tvb_get_guint8(tvb, offset);
                             col_append_fstr(pinfo->cinfo, COL_INFO, " DRB:%u",
-                                            tvb_get_guint8(tvb, offset));
+                                            channelId);
                             proto_tree_add_item(tree, hf_catapult_dct2000_lte_drbid,
                                                 tvb, offset++, 1, FALSE);
+                            p_pdcp_lte_info->channelId = channelId;
                             break;
 
                         default:
-- 
cgit v1.2.3