Change in osmo-pcu[master]: rlcmac: add dissection of 2G->3G/4G PS handover

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17629 )

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

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
---
M src/gsm_rlcmac.c
M src/gsm_rlcmac.h
2 files changed, 13 insertions(+), 1 deletion(-)

Approvals:
  laforge: Looks good to me, approved
  osmith: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/src/gsm_rlcmac.c b/src/gsm_rlcmac.c
index b421624..9b5ecfe 100644
--- a/src/gsm_rlcmac.c
+++ b/src/gsm_rlcmac.c
@@ -4574,6 +4574,12 @@
 
 
 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),
   M_UINT       (PHO_RadioResources_t,  HandoverReference,  8),
@@ -4633,7 +4639,7 @@
   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),
diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h
index 48abac0..e9ae20a 100644
--- a/src/gsm_rlcmac.h
+++ b/src/gsm_rlcmac.h
@@ -4877,6 +4877,11 @@
   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 @@
   {
     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;
 

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17629
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-pcu
Gerrit-Branch: master
Gerrit-Change-Id: I0f374e78300efddff00c4df26a401adcdee18a12
Gerrit-Change-Number: 17629
Gerrit-PatchSet: 4
Gerrit-Owner: pespin <pespin at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <axilirator at gmail.com>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200330/b273be94/attachment.htm>