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

Tweak the way we setup FP R8 info. 

svn path=/trunk/; revision=36107
This commit is contained in:
Martin Mathieson 2011-03-01 10:54:57 +00:00
parent aa9102b72f
commit 0b2e755182
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-catapult-dct2000.c
View File

@ -1308,13 +1308,15 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
(!received && (node_type == 1))); (!received && (node_type == 1)));
/* Division type introduced for R7 */ /* Division type introduced for R7 */
if (p_fp_info->release == 7) { if ((p_fp_info->release == 7) ||
(p_fp_info->release == 8)) {
p_fp_info->division = outhdr_values[i++]; p_fp_info->division = outhdr_values[i++];
} }
/* HS-DSCH config */ /* HS-DSCH config */
if (p_fp_info->channel == CHANNEL_HSDSCH) { if (p_fp_info->channel == CHANNEL_HSDSCH) {
if (p_fp_info->release == 7) { if ((p_fp_info->release == 7) ||
(p_fp_info->release == 8)) {
/* Entity (MAC-hs or MAC-ehs) used */ /* Entity (MAC-hs or MAC-ehs) used */
if (outhdr_values[i++]) { if (outhdr_values[i++]) {
p_fp_info->hsdsch_entity = ehs; p_fp_info->hsdsch_entity = ehs;
@ -1349,6 +1351,11 @@ void attach_fp_info(packet_info *pinfo, gboolean received, const char *protocol_
/* Number of channels (for coordinated channels) */ /* Number of channels (for coordinated channels) */
p_fp_info->num_chans = outhdr_values[i++]; p_fp_info->num_chans = outhdr_values[i++];
/* EDCH-Common is always T2 */
if (p_fp_info->channel == CHANNEL_EDCH_COMMON) {
p_fp_info->edch_type = 1;
}
if (p_fp_info->channel != CHANNEL_EDCH) { if (p_fp_info->channel != CHANNEL_EDCH) {
/* TF size for each channel */ /* TF size for each channel */
tf_start = i; tf_start = i;