rlcmac: add dissection of 2G->3G/4G PS handover

Port from wireshark.git 428ee66ae1c524b49f9043729b1f1e9b4f52f409, from
Pascal Quantin.

The original commit is also changing the RRC_Container field to
M_CALLBACK, but we leave them as M_VAR_ARRAY since the callback is
basically used to add more dissection information in wireshark.

Change-Id: I0f374e78300efddff00c4df26a401adcdee18a12
This commit is contained in:
Pau Espin 2020-03-26 18:50:00 +01:00 committed by laforge
parent f3ac06bbaf
commit 99eb353337
2 changed files with 13 additions and 1 deletions

View File

@ -4573,6 +4573,12 @@ CSN_DESCR_BEGIN(PS_HandoverTo_UTRAN_Payload_t)
CSN_DESCR_END (PS_HandoverTo_UTRAN_Payload_t)
static const
CSN_DESCR_BEGIN(PS_HandoverTo_E_UTRAN_Payload_t)
M_UINT (PS_HandoverTo_E_UTRAN_Payload_t, RRC_ContainerLength, 8),
M_VAR_ARRAY (PS_HandoverTo_E_UTRAN_Payload_t, RRC_Container, RRC_ContainerLength, 0),
CSN_DESCR_END (PS_HandoverTo_E_UTRAN_Payload_t)
static const
CSN_DESCR_BEGIN(PHO_RadioResources_t)
M_NEXT_EXIST (PHO_RadioResources_t, Exist_HandoverReference, 1),
@ -4633,7 +4639,7 @@ CSN_DESCR_BEGIN(Packet_Handover_Command_t)
M_UNION (Packet_Handover_Command_t, 4),
M_TYPE (Packet_Handover_Command_t, u.PS_HandoverTo_A_GB_ModePayload, PS_HandoverTo_A_GB_ModePayload_t),
M_TYPE (Packet_Handover_Command_t, u.PS_HandoverTo_UTRAN_Payload, PS_HandoverTo_UTRAN_Payload_t),
CSN_ERROR (Packet_Handover_Command_t, "10 <extension> not implemented", CSN_ERROR_STREAM_NOT_SUPPORTED),
M_TYPE (Packet_Handover_Command_t, u.PS_HandoverTo_E_UTRAN_Payload, PS_HandoverTo_E_UTRAN_Payload_t),
CSN_ERROR (Packet_Handover_Command_t, "11 <extension> not implemented", CSN_ERROR_STREAM_NOT_SUPPORTED),
M_PADDING_BITS(Packet_Handover_Command_t),

View File

@ -4877,6 +4877,11 @@ typedef struct
guint8 RRC_Container[MAX_RRC_CONTAINER_LENGTH];
} PS_HandoverTo_UTRAN_Payload_t;
typedef struct
{
guint8 RRC_ContainerLength;
guint8 RRC_Container[MAX_RRC_CONTAINER_LENGTH];
} PS_HandoverTo_E_UTRAN_Payload_t;
typedef struct
{
@ -4929,6 +4934,7 @@ typedef struct
{
PS_HandoverTo_A_GB_ModePayload_t PS_HandoverTo_A_GB_ModePayload;
PS_HandoverTo_UTRAN_Payload_t PS_HandoverTo_UTRAN_Payload;
PS_HandoverTo_E_UTRAN_Payload_t PS_HandoverTo_E_UTRAN_Payload;
} u;
} Packet_Handover_Command_t;