diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2014-05-25 18:01:31 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2014-05-25 16:39:00 +0000 |
| commit | c4ead251da7199cfd746d378c51eb8c30d09a6ba (patch) | |
| tree | 0bfce49eda15065ea8bf7b31219f1c49a5e49cf8 /epan/dissectors/packet-gsm_rlcmac.c | |
| parent | ff2061ac0acf4fe4cbc6aa10bd98da32a7884926 (diff) | |
GSM RLC MAC: Do not skip too many lines of the CSN_DESCR when the field is missing
While we are at it, replace an undefined hf_timeslot_allocation_usf_tn by its hf_usf equivalent
Bug: 10120
Change-Id: I3fe113279c779a9d8143d07489747a67d7351664
Reviewed-on: https://code.wireshark.org/review/1794
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-gsm_rlcmac.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.c b/epan/dissectors/packet-gsm_rlcmac.c index 6e5f2475de..e72930b30b 100644 --- a/epan/dissectors/packet-gsm_rlcmac.c +++ b/epan/dissectors/packet-gsm_rlcmac.c @@ -473,7 +473,6 @@ static int hf_change_mark_change_mark_1 = -1; static int hf_change_mark_change_mark_2 = -1; static int hf_indirect_encoding_ma_number = -1; static int hf_packet_request_reference_random_access_information = -1; -static int hf_timeslot_allocation_usf_tn = -1; /* XXX: missing hf[] entry */ static int hf_extended_dynamic_allocation = -1; static int hf_rlc_data_blocks_granted = -1; static int hf_single_block_allocation_timeslot_number = -1; @@ -2705,7 +2704,7 @@ CSN_DESCR_END (Packet_Request_Reference_t) static const CSN_DESCR_BEGIN(Timeslot_Allocation_t) M_NEXT_EXIST (Timeslot_Allocation_t, Exist, 1), - M_UINT (Timeslot_Allocation_t, USF_TN, 3, &hf_timeslot_allocation_usf_tn), + M_UINT (Timeslot_Allocation_t, USF_TN, 3, &hf_usf), CSN_DESCR_END (Timeslot_Allocation_t) static const @@ -5367,7 +5366,7 @@ CSN_DESCR_END (PHO_UplinkAssignment_t) static const CSN_DESCR_BEGIN (GlobalTimeslotDescription_UA_t) M_TYPE (GlobalTimeslotDescription_UA_t, GlobalTimeslotDescription, GlobalTimeslotDescription_t), - M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 3), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ + M_NEXT_EXIST (GlobalTimeslotDescription_UA_t, Exist_PHO_UA, 2), /* Don't use M_REC_TARRAY as we don't support multiple TBFs */ M_TYPE (GlobalTimeslotDescription_UA_t, PHO_UA, PHO_UplinkAssignment_t), M_FIXED (GlobalTimeslotDescription_UA_t, 1, 0x0), /* Escape recursive */ @@ -5420,7 +5419,7 @@ CSN_DESCR_BEGIN (PHO_EGPRS_t) M_NEXT_EXIST (PHO_EGPRS_t, Exist_GlobalTimeslotDescription_UA, 1), M_TYPE (PHO_EGPRS_t, GTD_UA, GlobalTimeslotDescription_UA_t), - M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 2), + M_NEXT_EXIST (PHO_EGPRS_t, Exist_DownlinkTBF, 1), M_TYPE (PHO_EGPRS_t, DownlinkTBF, DownlinkTBF_t), CSN_DESCR_END (PHO_EGPRS_t) |