diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-12-21 17:46:25 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-12-21 17:46:25 +0000 |
| commit | 1386eb8fa3d25bb3fd78a5a7301150f54a3022b3 (patch) | |
| tree | f710b64151309799177912057894a3e63cf5b773 /epan/dissectors/packet-catapult-dct2000.c | |
| parent | dfb9193526f96718faba63dafd55453dfde33ad7 (diff) | |
Be more consistent about how offset is updated while dissecting lte_rrc fields.
Show cell-id in info column (if don't manage to call RRC).
svn path=/trunk/; revision=35237
Diffstat (limited to 'epan/dissectors/packet-catapult-dct2000.c')
| -rw-r--r-- | epan/dissectors/packet-catapult-dct2000.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/epan/dissectors/packet-catapult-dct2000.c b/epan/dissectors/packet-catapult-dct2000.c index d3ffeb13e0..61cdfdd4dc 100644 --- a/epan/dissectors/packet-catapult-dct2000.c +++ b/epan/dissectors/packet-catapult-dct2000.c @@ -615,6 +615,7 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, dissector_handle_t protocol_handle = 0; gboolean isUplink = FALSE; LogicalChannelType logicalChannelType; + guint16 cell_id; guint8 bcch_transport = 0; tvbuff_t *rrc_tvb; @@ -692,16 +693,22 @@ static void dissect_rrc_lte(tvbuff_t *tvb, gint offset, /* Cell-id */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_cellid, tvb, offset, 2, FALSE); + cell_id = tvb_get_ntohs(tvb, offset); offset += 2; /* Logical channel type */ proto_tree_add_item(tree, hf_catapult_dct2000_lte_rlc_channel_type, tvb, offset, 1, FALSE); - logicalChannelType = (LogicalChannelType)tvb_get_guint8(tvb, offset++); - col_append_fstr(pinfo->cinfo, COL_INFO, " %s", + logicalChannelType = (LogicalChannelType)tvb_get_guint8(tvb, offset); + offset++; + + /* Won't be seen if RRC decoder is called... */ + col_append_fstr(pinfo->cinfo, COL_INFO, " cell-id=%u %s", + cell_id, val_to_str_const(logicalChannelType, rlc_logical_channel_vals, "UNKNOWN-CHANNEL")); + switch (logicalChannelType) { case Channel_BCCH: /* Skip length */ |