diff options
| author | Pau Espin Pedrol <pespin@sysmocom.de> | 2020-03-25 14:27:22 +0100 |
|---|---|---|
| committer | Pascal Quantin <pascal@wireshark.org> | 2020-03-25 20:16:50 +0000 |
| commit | 439005cc2c78258d47a85e4b161df9c37041e60a (patch) | |
| tree | 441fb1e56e9875b6a2e24d0e84945400dc63daff /epan/dissectors/packet-gsm_rlcmac.h | |
| parent | 69a47691cdf6a9304ef8689d3a39d510e81e001c (diff) | |
rlcmac: Introduce MS Radio Access Capabilities 2 to fix related spare bits
There's two variants for the Ms Radio Access Capabilities.
* The usual encoding with spare bits (usually to fill up to octet boundary)
as defined in TS 24.008 Table 10.5.146
And there's too:
* MS Radio Access Capabilities 2 IE from TS44.060 section 12.30, which is
the same but removing all spare bits, and which is used in messages like
Packet Resource Request and Additional MS RAC messages.
The later is used basically for messages having extra IEs after the MS
Radio Access capabilities IE, since they are encoded immediatelly
afterwards.
So this patch does:
* Adds the expected spare bits (M_PADDING) to MS_Radio_Access_capability_t
* Creates a new MS_Radio_Access_capability2_t without padding
* Updates code to use the new "2" version where needed.
The new MS_Radio_Access_capability_t with padding is disabled since it's
not used in wirehsark because it's using an ad-hoc decoder for that TS
24.008 IE: see packet-gsm_a_gm.c de_gmm_ms_radio_acc_cap()
Port from osmo-pcu.git e50ce6e45c4509805807d599cadf1a1b23d37f63
Related: https://osmocom.org/issues/4463
Change-Id: Ie2844bd94437c8d7a50787cc7c8c4d81a4fc48ba
Reviewed-on: https://code.wireshark.org/review/36574
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-gsm_rlcmac.h')
| -rw-r--r-- | epan/dissectors/packet-gsm_rlcmac.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_rlcmac.h b/epan/dissectors/packet-gsm_rlcmac.h index bd64e1b330..2b50c9c9f7 100644 --- a/epan/dissectors/packet-gsm_rlcmac.h +++ b/epan/dissectors/packet-gsm_rlcmac.h @@ -1594,8 +1594,8 @@ typedef struct PacketResourceRequestID_t ID; - guint8 Exist_MS_Radio_Access_capability; - MS_Radio_Access_capability_t MS_Radio_Access_capability; + guint8 Exist_MS_Radio_Access_capability2; + MS_Radio_Access_capability_t MS_Radio_Access_capability2; Channel_Request_Description_t Channel_Request_Description; @@ -4949,7 +4949,7 @@ typedef struct guint8 R; AdditionalMsRadAccessCapID_t ID; - MS_Radio_Access_capability_t MS_Radio_Access_capability; + MS_Radio_Access_capability_t MS_Radio_Access_capability2; } Additional_MS_Rad_Access_Cap_t; /* End ADDITIONAL MS RADIO ACCESS CAPABILITIES */ |