osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Neil Piercy: 

Adds BMC protocol, including adding support for MAC and RLC CTCH channels to carry it.
From me:
Removed hf blurbs = def and removed check_col added tp CMakeList.

svn path=/trunk/; revision=36662
This commit is contained in:
Anders Broman 2011-04-16 12:22:16 +00:00
parent 214b9c3ad0
commit ffae0f912d
5 changed files with 412 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
epan/CMakeLists.txt
View File

@ -363,6 +363,7 @@ set(DISSECTOR_SRC
dissectors/packet-bgp.c
dissectors/packet-bittorrent.c
dissectors/packet-bjnp.c
dissectors/packet-bmc.c
dissectors/packet-bofl.c
dissectors/packet-bootp.c
dissectors/packet-bootparams.c

1
epan/dissectors/Makefile.common
View File

@ -276,6 +276,7 @@ DISSECTOR_SRC = \
packet-bgp.c \
packet-bittorrent.c \
packet-bjnp.c \
packet-bmc.c \
packet-bofl.c \
packet-bootp.c \
packet-bootparams.c \

350
epan/dissectors/packet-bmc.c Normal file
View File

@ -0,0 +1,350 @@
/* packet-bmc.c
* Routines for Broadcast/Multicast Control dissection
* Copyright 2011, Neil Piercy <Neil.Piercy@ipaccess.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 <string.h>
#include <epan/bitswap.h>
#include <epan/packet.h>
#include <epan/prefs.h>
static int dissect_bmc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_bmc_cbs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_bmc_schedule_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
static int dissect_bmc_cbs41_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
void proto_reg_handoff_bmc(void);
static int proto_bmc = -1;
static int hf_bmc_message_type = -1;
static int hf_bmc_message_id = -1;
static int hf_bmc_serial_number = -1;
static int hf_bmc_data_coding_scheme = -1;
static int hf_bmc_cb_data = -1;
static int hf_bmc_offset_to_begin_ctch_bs_index = -1;
static int hf_bmc_length_of_cbs_schedule_period = -1;
static int hf_bmc_new_message_bitmap = -1;
static int hf_bmc_message_description_type = -1;
static int hf_bmc_offset_to_ctch_bs_index_of_first_transmission = -1;
static int hf_bmc_broadcast_address = -1;
static int hf_bmc_cb_data41 = -1;
static int hf_bmc_cbs_schedule_message_extension = -1;
static int hf_bmc_future_extension_bitmap = -1;
static int hf_bmc_length_of_serial_number_list = -1;
static int hf_bmc_ctch_bs_index = -1;
#define MESSAGE_TYPE_CBS_MESSAGE 1
#define MESSAGE_TYPE_SCHEDULE_MESSAGE 2
#define MESSAGE_TYPE_CBS41_MESSAGE 3
const static value_string message_type_vals[] = {
{MESSAGE_TYPE_CBS_MESSAGE, "CBS Message"},
{MESSAGE_TYPE_SCHEDULE_MESSAGE, "Schedule Message"},
{MESSAGE_TYPE_CBS41_MESSAGE, "CBS41 Message"},
{0, NULL}
};
const static value_string message_description_type_vals[] = {
{0, "Repetition of new BMC CBS message within schedule period"},
{1, "New BMC CBS message (a BMC CBS message never previously sent)"},
{2, "Reading advised"},
{3, "Reading optional"},
{4, "Repetition of old BMC CBS message within schedule period"},
{5, "Old BMC CBS message (repetition of a BMC CBS message sent in a previous schedule period)"},
{6, "Schedule message"},
{7, "CBS41 message"},
{8, "no message"},
{0, NULL}
};
static gint ett_bmc = -1;
static gint ett_bmc_message_description = -1;
static int
dissect_bmc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
guint8 message_type;
guint8 *p_rev, *reversing_buffer;
gint offset = 0;
gint i, len;
proto_item *ti;
proto_tree *bmc_tree;
tvbuff_t *bit_reversed_tvb;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "BMC");
col_clear(pinfo->cinfo, COL_INFO);
ti = proto_tree_add_item(tree, proto_bmc, tvb, 0, -1, ENC_NA);
bmc_tree = proto_item_add_subtree(ti, ett_bmc);
/* Needs bit-reversing. Create a new buffer, copy the message to it and bit-reverse */
len = tvb_length(tvb);
reversing_buffer = se_alloc(len);
memcpy(reversing_buffer, tvb_get_ptr(tvb, offset, -1), len);
p_rev = reversing_buffer;
/* Entire message is bit reversed */
for (i=0; i<len; i++, p_rev++)
*p_rev = BIT_SWAP(*p_rev);
/* Make this new buffer part of the display and provide a way to dispose of it */
bit_reversed_tvb = tvb_new_real_data(reversing_buffer, len, len);
tvb_set_child_real_data_tvbuff(tvb, bit_reversed_tvb);
add_new_data_source(pinfo, bit_reversed_tvb, "Bit-reversed Data");
message_type = tvb_get_guint8(bit_reversed_tvb, offset);
proto_tree_add_item(bmc_tree, hf_bmc_message_type, bit_reversed_tvb, offset, 1, ENC_BIG_ENDIAN);
offset++;
col_add_fstr(pinfo->cinfo, COL_INFO, "%s", val_to_str(message_type, message_type_vals,"Reserved 0x%02x"));
switch (message_type) {
case MESSAGE_TYPE_CBS_MESSAGE:
offset = dissect_bmc_cbs_message(bit_reversed_tvb, pinfo, bmc_tree);
break;
case MESSAGE_TYPE_SCHEDULE_MESSAGE:
offset = dissect_bmc_schedule_message(bit_reversed_tvb, pinfo, bmc_tree);
break;
case MESSAGE_TYPE_CBS41_MESSAGE:
offset = dissect_bmc_cbs41_message(bit_reversed_tvb, pinfo, bmc_tree);
break;
default:
break;
}
return offset;
}
static int dissect_bmc_cbs_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gint offset=1;
proto_tree_add_item(tree, hf_bmc_message_id, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_bmc_serial_number, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_bmc_data_coding_scheme, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
proto_tree_add_item(tree, hf_bmc_cb_data, tvb, offset, tvb_length_remaining(tvb,offset), ENC_BIG_ENDIAN);
offset = tvb_length(tvb);
return offset;
}
static int dissect_bmc_schedule_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gint offset=1, i, bitmap_offset, saved_offset;
guint8 new_message_bitmap_len;
guint8 length_of_cbs_schedule_period;
guint8 message_description_type;
guint8 future_extension_bitmap;
guint8 length_of_serial_number_list;
guint8 entry;
guint8 byte, mask, bit;
proto_tree *message_description_tree;
proto_item *ti;
proto_tree_add_item(tree, hf_bmc_offset_to_begin_ctch_bs_index, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
length_of_cbs_schedule_period = tvb_get_guint8(tvb,offset);
proto_tree_add_item(tree, hf_bmc_length_of_cbs_schedule_period, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
new_message_bitmap_len = length_of_cbs_schedule_period>>3;
if (length_of_cbs_schedule_period & 0x7)
new_message_bitmap_len += 1;
proto_tree_add_item(tree, hf_bmc_new_message_bitmap, tvb, offset, new_message_bitmap_len, ENC_BIG_ENDIAN);
bitmap_offset = offset;
offset += new_message_bitmap_len;
ti = proto_tree_add_text(tree, tvb, offset, 0, "Message Description" );
message_description_tree = proto_item_add_subtree(ti, ett_bmc_message_description);
saved_offset = offset;
bit=1;
for (i=0; i<new_message_bitmap_len; i++) {
byte = tvb_get_guint8(tvb,bitmap_offset+i);
for(mask=1; mask, bit<=length_of_cbs_schedule_period; mask<<=1, bit++) {
message_description_type = tvb_get_guint8(tvb,offset);
proto_tree_add_uint_format(message_description_tree, hf_bmc_message_description_type, tvb, offset, 1, message_description_type, "Message %d Message Description Type: %s (%d)", bit, val_to_str(message_description_type, message_description_type_vals,"Unknown"), message_description_type);
offset += 1;
if ((message_description_type==1) || (message_description_type==5)) {
proto_tree_add_item(message_description_tree, hf_bmc_message_id, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
}
else if ((message_description_type==0) || (message_description_type==4)) {
proto_tree_add_item(message_description_tree, hf_bmc_offset_to_ctch_bs_index_of_first_transmission, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
}
}
}
proto_item_set_len(ti, offset-saved_offset);
if (tvb_length_remaining(tvb,offset)) {
future_extension_bitmap = tvb_get_guint8(tvb,offset);
proto_tree_add_item(tree, hf_bmc_future_extension_bitmap, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
if (future_extension_bitmap & 0x01) {
length_of_serial_number_list = tvb_get_guint8(tvb,offset);
proto_tree_add_item(tree, hf_bmc_length_of_serial_number_list, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
for (entry=0; entry<length_of_serial_number_list; entry++) {
proto_tree_add_item(tree, hf_bmc_serial_number, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
proto_tree_add_item(tree, hf_bmc_ctch_bs_index, tvb, offset, 1, ENC_BIG_ENDIAN);
offset += 1;
}
}
}
return offset;
}
static int dissect_bmc_cbs41_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
gint offset=1;
proto_tree_add_item(tree, hf_bmc_broadcast_address, tvb, offset, 5, ENC_BIG_ENDIAN);
offset += 5;
proto_tree_add_item(tree, hf_bmc_cb_data41, tvb, offset, tvb_length_remaining(tvb,offset), ENC_BIG_ENDIAN);
offset = tvb_length(tvb);
return offset;
}
void
proto_register_bmc(void)
{
static hf_register_info hf[] = {
{ &hf_bmc_message_type,
{ "Message Type", "bmc.message_type",
FT_UINT8, BASE_DEC, message_type_vals, 0,
NULL, HFILL }
},
{ &hf_bmc_message_id,
{ "Message ID", "bmc.message_id",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_serial_number,
{ "Serial Number", "bmc.serial_number",
FT_UINT16, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_data_coding_scheme,
{ "Data Coding Scheme", "bmc.data_coding_scheme",
FT_UINT8, BASE_HEX, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_cb_data,
{ "CB Data", "bmc.cb_data",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_offset_to_begin_ctch_bs_index,
{ "Offset to Begin CTCH Block Set Index", "bmc.offset_to_begin_ctch_bs_index",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_length_of_cbs_schedule_period,
{ "Length of CBS Schedule Period", "bmc.length_of_cbs_schedule_period",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_new_message_bitmap,
{ "New Message Bitmap", "bmc.new_message_bitmap",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_message_description_type,
{ "Message Description Type", "bmc.message_description_type",
FT_UINT8, BASE_DEC, message_description_type_vals, 0,
NULL, HFILL }
},
{ &hf_bmc_offset_to_ctch_bs_index_of_first_transmission,
{ "Offset to CTCH BS index of first transmission", "bmc.offset_to_ctch_bs_index_of_first_transmission",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_broadcast_address,
{ "Broadcast Address", "bmc.broadcast_address",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_cb_data41,
{ "CB Data41", "bmc.cb_data41",
FT_BYTES, BASE_NONE, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_future_extension_bitmap,
{ "Future Extension Bitmap", "bmc.future_extension_bitmap",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_length_of_serial_number_list,
{ "Length of Serial Number List", "bmc.length_of_serial_number_list",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
},
{ &hf_bmc_ctch_bs_index,
{ "CTCH BS Index", "bmc.ctch_bs_index",
FT_UINT8, BASE_DEC, NULL, 0,
NULL, HFILL }
}
};
static gint *ett[] = {
&ett_bmc,
&ett_bmc_message_description
};
proto_bmc = proto_register_protocol("Broadcast/Multicast Control", "BMC", "bmc");
register_dissector("bmc", dissect_bmc, proto_bmc);
proto_register_field_array(proto_bmc, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
void
proto_reg_handoff_bmc(void)
{
dissector_handle_t bmc_handle;
bmc_handle = new_create_dissector_handle(dissect_bmc, proto_bmc);
}

83
epan/dissectors/packet-rlc.c
View File

@ -93,6 +93,7 @@ static int ett_rlc_sufi = -1;
static dissector_handle_t ip_handle;
static dissector_handle_t rrc_handle;
static dissector_handle_t bmc_handle;
enum channel_type {
PCCH,
@ -101,6 +102,7 @@ enum channel_type {
UL_DCCH,
DL_DCCH,
PS_DTCH,
DL_CTCH,
};
static const true_false_string rlc_ext_val = {
@ -754,6 +756,10 @@ static void rlc_call_subdissector(enum channel_type channel, tvbuff_t *tvb,
case DL_CCCH:
msgtype = RRC_MESSAGE_TYPE_DL_CCCH;
break;
case DL_CTCH:
msgtype = RRC_MESSAGE_TYPE_INVALID;
call_dissector(bmc_handle, tvb, pinfo, tree);
break;
case UL_DCCH:
msgtype = RRC_MESSAGE_TYPE_UL_DCCH;
break;
@ -830,7 +836,7 @@ static void rlc_um_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr
}
/* add remaining data as fragment */
add_fragment(RLC_UM, tvb, pinfo, tree, offs, seq, i, tvb_length_remaining(tvb, offs), FALSE);
if (dissected == FALSE && check_col(pinfo->cinfo, COL_INFO))
if (dissected == FALSE)
col_set_str(pinfo->cinfo, COL_INFO, "[RLC UM Fragment]");
}
}
@ -887,8 +893,7 @@ static gint16 rlc_decode_li(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinf
proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto);
expert_add_info_format(pinfo, malformed, PI_MALFORMED, PI_ERROR,
"Malformed Packet (Uses reserved LI)");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
return -1; /* just give up on this */
default:
/* since the LI is an offset (from the end of the header), it
@ -902,8 +907,7 @@ static gint16 rlc_decode_li(enum rlc_mode mode, tvbuff_t *tvb, packet_info *pinf
proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto);
expert_add_info_format(pinfo, malformed, PI_MALFORMED, PI_ERROR,
"Malformed Packet (incorrect LI value)");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
return -1; /* just give up on this */
}
li[num_li].len = li[num_li].li - prev_li;
@ -970,8 +974,7 @@ static void dissect_rlc_um(enum channel_type channel, tvbuff_t *tvb, packet_info
if (pinfo->fd->num == 0) return;
/* check for duplicates */
if (rlc_is_duplicate(RLC_UM, pinfo, seq, &orig_num) == TRUE) {
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "[RLC UM Fragment] [Duplicate]");
col_set_str(pinfo->cinfo, COL_INFO, "[RLC UM Fragment] [Duplicate]");
proto_tree_add_uint(tree, hf_rlc_duplicate_of, tvb, 0, 0, orig_num);
return;
}
@ -1062,8 +1065,7 @@ static void dissect_rlc_status(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree
proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto);
expert_add_info_format(pinfo, malformed, PI_MALFORMED, PI_ERROR,
"Malformed Packet (invalid SUFI type)");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, " [Malformed Packet]");
col_append_str(pinfo->cinfo, COL_INFO, " [Malformed Packet]");
return; /* invalid value, ignore the rest */
}
}
@ -1091,8 +1093,7 @@ static void dissect_rlc_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto);
expert_add_info_format(pinfo, malformed, PI_MALFORMED, PI_ERROR,
"Malformed Packet (invalid RLC AM control type %u)", type);
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, " [Malformed Packet]");
col_append_str(pinfo->cinfo, COL_INFO, " [Malformed Packet]");
return; /* invalid */
}
}
@ -1148,7 +1149,7 @@ static void rlc_am_reassemble(tvbuff_t *tvb, guint8 offs, packet_info *pinfo, pr
next_tvb = NULL;
}
}
if (dissected == FALSE && check_col(pinfo->cinfo, COL_INFO))
if (dissected == FALSE)
col_set_str(pinfo->cinfo, COL_INFO, "[RLC AM Fragment]");
}
@ -1169,8 +1170,7 @@ static void dissect_rlc_am(enum channel_type channel, tvbuff_t *tvb, packet_info
if (tree)
proto_tree_add_item(tree, hf_rlc_dc, tvb, 0, 1, FALSE);
if (dc == 0) {
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "RLC Control Frame");
col_set_str(pinfo->cinfo, COL_INFO, "RLC Control Frame");
dissect_rlc_control(tvb, pinfo, tree);
return;
}
@ -1195,8 +1195,7 @@ static void dissect_rlc_am(enum channel_type channel, tvbuff_t *tvb, packet_info
proto_malformed, tvb, 0, 0, "[Malformed Packet: %s]", pinfo->current_proto);
expert_add_info_format(pinfo, malformed, PI_MALFORMED, PI_ERROR,
"Malformed Packet (incorrect HE value)");
if (check_col(pinfo->cinfo, COL_INFO))
col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
col_append_str(pinfo->cinfo, COL_INFO, "[Malformed Packet]");
return;
}
@ -1222,8 +1221,7 @@ static void dissect_rlc_am(enum channel_type channel, tvbuff_t *tvb, packet_info
if (pinfo->fd->num == 0) return;
/* check for duplicates */
if (rlc_is_duplicate(RLC_AM, pinfo, seq, &orig_num) == TRUE) {
if (check_col(pinfo->cinfo, COL_INFO))
col_set_str(pinfo->cinfo, COL_INFO, "[RLC AM Fragment] [Duplicate]");
col_set_str(pinfo->cinfo, COL_INFO, "[RLC AM Fragment] [Duplicate]");
proto_tree_add_uint(tree, hf_rlc_duplicate_of, tvb, 0, 0, orig_num);
return;
}
@ -1235,10 +1233,8 @@ static void dissect_rlc_am(enum channel_type channel, tvbuff_t *tvb, packet_info
static void dissect_rlc_pcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_tree *subtree = NULL;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
col_clear(pinfo->cinfo, COL_INFO);
/* PCCH is always RLC UM */
if (tree) {
@ -1256,10 +1252,8 @@ static void dissect_rlc_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
proto_item *ti = NULL;
proto_tree *subtree = NULL;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
col_clear(pinfo->cinfo, COL_INFO);
fpi = p_get_proto_data(pinfo->fd, proto_fp);
if (!fpi) return; /* dissection failure */
@ -1280,6 +1274,29 @@ static void dissect_rlc_ccch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
}
}
static void dissect_rlc_ctch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
fp_info *fpi;
proto_item *ti = NULL;
proto_tree *subtree = NULL;
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
col_clear(pinfo->cinfo, COL_INFO);
fpi = p_get_proto_data(pinfo->fd, proto_fp);
if (!fpi) return; /* dissection failure */
if (tree) {
ti = proto_tree_add_item(tree, proto_rlc, tvb, 0, -1, FALSE);
subtree = proto_item_add_subtree(ti, ett_rlc);
}
/* CTCH is always UM */
proto_item_append_text(ti, " UM (CTCH)");
dissect_rlc_um(DL_CTCH, tvb, pinfo, tree, subtree);
}
static void dissect_rlc_dcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
proto_item *ti = NULL;
@ -1288,10 +1305,8 @@ static void dissect_rlc_dcch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree
rlc_info *rlci;
enum channel_type channel;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
col_clear(pinfo->cinfo, COL_INFO);
fpi = p_get_proto_data(pinfo->fd, proto_fp);
rlci = p_get_proto_data(pinfo->fd, proto_rlc);
@ -1324,10 +1339,8 @@ static void dissect_rlc_ps_dtch(tvbuff_t *tvb, packet_info *pinfo, proto_tree *t
fp_info *fpi;
rlc_info *rlci;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
if (check_col(pinfo->cinfo, COL_INFO))
col_clear(pinfo->cinfo, COL_INFO);
col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC");
col_clear(pinfo->cinfo, COL_INFO);
fpi = p_get_proto_data(pinfo->fd, proto_fp);
rlci = p_get_proto_data(pinfo->fd, proto_rlc);
@ -1401,6 +1414,7 @@ proto_register_rlc(void)
proto_rlc = proto_register_protocol("RLC", "RLC", "rlc");
register_dissector("rlc.pcch", dissect_rlc_pcch, proto_rlc);
register_dissector("rlc.ccch", dissect_rlc_ccch, proto_rlc);
register_dissector("rlc.ctch", dissect_rlc_ctch, proto_rlc);
register_dissector("rlc.dcch", dissect_rlc_dcch, proto_rlc);
register_dissector("rlc.ps_dtch", dissect_rlc_ps_dtch, proto_rlc);
@ -1415,4 +1429,5 @@ proto_reg_handoff_rlc(void)
{
rrc_handle = find_dissector("rrc");
ip_handle = find_dissector("ip");
bmc_handle = find_dissector("bmc");
}

12
epan/dissectors/packet-umts_mac.c
View File

@ -55,6 +55,7 @@ static int ett_mac_hsdsch = -1;
static dissector_handle_t rlc_pcch_handle;
static dissector_handle_t rlc_ccch_handle;
static dissector_handle_t rlc_ctch_handle;
static dissector_handle_t rlc_dcch_handle;
static dissector_handle_t rlc_ps_dtch_handle;
@ -387,8 +388,16 @@ static void dissect_mac_fdd_fach(tvbuff_t *tvb, packet_info *pinfo, proto_tree *
proto_item_append_text(ti, " (Unknown FACH Content");
}
break;
case TCTF_CTCH_FACH_FDD:
proto_item_append_text(ti, " (CTCH)");
channel_type = proto_tree_add_uint(fach_tree, hf_mac_channel, tvb, 0, 0, MAC_CTCH);
PROTO_ITEM_SET_GENERATED(channel_type);
/* CTCH over FACH is always octet aligned */
next_tvb = tvb_new_subset(tvb, 1, tvb_length_remaining(tvb, 1), -1);
call_dissector(rlc_ctch_handle, next_tvb, pinfo, tree);
break;
default:
proto_item_append_text(ti, " (Unknown FACH Content");
proto_item_append_text(ti, " (Unknown FACH Content)");
}
}
@ -601,6 +610,7 @@ proto_reg_handoff_umts_mac(void)
{
rlc_pcch_handle = find_dissector("rlc.pcch");
rlc_ccch_handle = find_dissector("rlc.ccch");
rlc_ctch_handle = find_dissector("rlc.ctch");
rlc_dcch_handle = find_dissector("rlc.dcch");
rlc_ps_dtch_handle = find_dissector("rlc.ps_dtch");
}