diff options
| author | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-28 18:36:20 +0000 |
|---|---|---|
| committer | martinm <martinm@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-10-28 18:36:20 +0000 |
| commit | 7b1929e5322e0be3ae27ceab903e3c3631b993a8 (patch) | |
| tree | 6d55ab2c69d0de8afffb31908a231dbac724a55f /epan/dissectors/packet-rlc.c | |
| parent | 996991a1297a92cbca1be22749d07ca9af58dafc (diff) | |
First go at calling UMTS RLC dissector from IxCatapult logs.
Had to change some #defines in the header file (for UDP-framed/heuristic
dissector) - will need to update example sending program later on tonight.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39656 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rlc.c')
| -rw-r--r-- | epan/dissectors/packet-rlc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-rlc.c b/epan/dissectors/packet-rlc.c index ca8135f720..ca738a351b 100644 --- a/epan/dissectors/packet-rlc.c +++ b/epan/dissectors/packet-rlc.c @@ -1746,7 +1746,7 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) rlc_info *rlci; tvbuff_t *rlc_tvb; guint8 tag = 0; - guint channelType = CHANNEL_TYPE_UNSPECIFIED; + guint channelType = UMTS_CHANNEL_TYPE_UNSPECIFIED; gboolean fpInfoAlreadySet = FALSE; gboolean rlcInfoAlreadySet = FALSE; gboolean channelTypePresent = FALSE; @@ -1854,7 +1854,7 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* Create tvb that starts at actual RLC PDU */ rlc_tvb = tvb_new_subset(tvb, offset, -1, tvb_reported_length(tvb)-offset); switch (channelType) { - case CHANNEL_TYPE_UNSPECIFIED: + case UMTS_CHANNEL_TYPE_UNSPECIFIED: /* Call relevant dissector according to RLC mode */ col_set_str(pinfo->cinfo, COL_PROTOCOL, "RLC"); col_clear(pinfo->cinfo, COL_INFO); @@ -1875,21 +1875,22 @@ dissect_rlc_heur(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_rlc_tm(UNKNOWN, rlc_tvb, pinfo, tree, subtree); } break; - case CHANNEL_TYPE_PCCH: + case UMTS_CHANNEL_TYPE_PCCH: dissect_rlc_pcch(rlc_tvb, pinfo, tree); break; - case CHANNEL_TYPE_CCCH: + case UMTS_CHANNEL_TYPE_CCCH: dissect_rlc_ccch(rlc_tvb, pinfo, tree); break; - case CHANNEL_TYPE_DCCH: + case UMTS_CHANNEL_TYPE_DCCH: dissect_rlc_dcch(rlc_tvb, pinfo, tree); break; - case CHANNEL_TYPE_PS_DTCH: + case UMTS_CHANNEL_TYPE_PS_DTCH: dissect_rlc_ps_dtch(rlc_tvb, pinfo, tree); break; - case CHANNEL_TYPE_CTCH: + case UMTS_CHANNEL_TYPE_CTCH: dissect_rlc_ctch(rlc_tvb, pinfo, tree); break; + default: /* Unknown channel type */ return FALSE; |