diff options
| author | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-10-08 11:03:08 +0000 |
|---|---|---|
| committer | Martin Mathieson <martin.r.mathieson@googlemail.com> | 2010-10-08 11:03:08 +0000 |
| commit | f6ee7d8d4f62a49ca9da204c748069660c4419e7 (patch) | |
| tree | 9c0d5bd780b9d708fd2f0cc4f4c19ab62caf3041 /epan/dissectors/packet-umts_mac.c | |
| parent | 2239d905dbd3cf5eba7db0d11b63c55683b3dad1 (diff) | |
From Tobias Witek (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5283)
epan/dissectors/packet-umts_fp.c
* Added mac subdissector (MAC) call to HSDSCH TYPE2 frames
epan/dissectors/packet-umts_mac.c
* Added support for HSDSCH TYPE2 frames by means of
not nibble-shifting (4 bits) the SDU if MAC-ehs is used
epan/dissectors/packet-rlc.c
* Added support for "Use special value of the HE field" (3gpp 25.332-7a0
9.2.2.7) commonly used for Release 7 HSDPA.
REMARK: although the specification mandates that the
special value is only allowed when activated by higher
layers (RRC), it is interpreted unconditionally. We assume
this is OK, because a different use in future specifications
is very unlikely.
epan/dissectors/packet-fp_hint.c
* Added decoding of MAC-ehs indicator for HSDSCH frames
* Bumped fpi->release from 6 to 7 to enable proper
HSDSCH TYPE2 frame decoding in the UTMS MAC parser.
In general, this appears not to affect decoding
of (conformant) FP frames of pevious releases.
svn path=/trunk/; revision=34433
Diffstat (limited to 'epan/dissectors/packet-umts_mac.c')
| -rw-r--r-- | epan/dissectors/packet-umts_mac.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-umts_mac.c b/epan/dissectors/packet-umts_mac.c index 1d05072cd2..36b03d636d 100644 --- a/epan/dissectors/packet-umts_mac.c +++ b/epan/dissectors/packet-umts_mac.c @@ -509,7 +509,7 @@ static void dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree fp_info *fpinf; umts_mac_info *macinf; guint16 pos; - guint8 bitoffs = 4; + guint8 bitoffs; tvbuff_t *next_tvb; proto_item *ti = NULL; @@ -522,6 +522,7 @@ static void dissect_mac_fdd_hsdsch(tvbuff_t *tvb, packet_info *pinfo, proto_tree fpinf = p_get_proto_data(pinfo->fd, proto_fp); macinf = p_get_proto_data(pinfo->fd, proto_umts_mac); pos = fpinf->cur_tb; + bitoffs = fpinf->hsdsch_entity == ehs ? 0 : 4; if (!macinf) { proto_tree_add_text(hsdsch_tree, tvb, 0, -1, |