<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17043">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure<br><br>(as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function).<br><br>Port from wireshark.git commit 9f8b638cfa8a660fb64c54dcadb83e6747db0a15.<br><br>Ported-by: Pau Espin Pedrol <pespin@sysmocom.de><br>Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00<br>---<br>M src/gsm_rlcmac.h<br>M tests/rlcmac/RLCMACTest.cpp<br>2 files changed, 25 insertions(+), 46 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/17043/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h</span><br><span>index 196ced2..90c5bfd 100644</span><br><span>--- a/src/gsm_rlcmac.h</span><br><span>+++ b/src/gsm_rlcmac.h</span><br><span>@@ -4528,13 +4528,6 @@</span><br><span> PMO_AdditionsR98_t AdditionsR98;</span><br><span> } Packet_Measurement_Order_t;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-typedef struct</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 MESSAGE_TYPE;</span><br><span style="color: hsl(0, 100%, 40%);">- guint8 PAGE_MODE;</span><br><span style="color: hsl(0, 100%, 40%);">- PacketDownlinkID_t ID;</span><br><span style="color: hsl(0, 100%, 40%);">-} Packet_Measurement_Order_Reduced_t;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Enhanced measurement report */</span><br><span> </span><br><span> typedef struct</span><br><span>@@ -4900,45 +4893,32 @@</span><br><span> union</span><br><span> {</span><br><span> guint8 MESSAGE_TYPE;</span><br><span style="color: hsl(0, 100%, 40%);">- Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap;</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_PD_AckNack_t EGPRS_PD_AckNack;</span><br><span style="color: hsl(0, 100%, 40%);">- PSI13_t PSI13;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Access_Reject_t Packet_Access_Reject;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Cell_Change_Order_t Packet_Cell_Change_Order;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Downlink_Assignment_t Packet_Downlink_Assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Measurement_Order_t Packet_Measurement_Order;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Paging_Request_t Packet_Paging_Request;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_PDCH_Release_t Packet_PDCH_Release;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Polling_Request_t Packet_Polling_Request;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_PRACH_Parameters_t Packet_PRACH_Parameters;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Queueing_Notification_t Packet_Queueing_Notification;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_TBF_Release_t Packet_TBF_Release;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Uplink_Assignment_t Packet_Uplink_Assignment;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Handover_Command_t Packet_Handover_Command;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_PhysicalInformation_t Packet_PhysicalInformation;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block;</span><br><span> PSI1_t PSI1;</span><br><span> PSI2_t PSI2;</span><br><span> PSI3_t PSI3;</span><br><span> PSI5_t PSI5;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Access_Reject_t Packet_Access_Reject;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Cell_Change_Order_t Packet_Cell_Change_Order;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Downlink_Assignment_t Packet_Downlink_Assignment;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Handover_Command_t Packet_Handover_Command;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Measurement_Order_t Packet_Measurement_Order;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Measurement_Report_t Packet_Measurement_Report;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_PDCH_Release_t Packet_PDCH_Release;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_PRACH_Parameters_t Packet_PRACH_Parameters;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_PSI_Status_t Packet_PSI_Status;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Paging_Request_t Packet_Paging_Request;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Pause_t Packet_Pause;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_PhysicalInformation_t Packet_PhysicalInformation;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Polling_Request_t Packet_Polling_Request;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Queueing_Notification_t Packet_Queueing_Notification;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Resource_Request_t Packet_Resource_Request;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_SI_Status_t Packet_SI_Status;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_TBF_Release_t Packet_TBF_Release;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Uplink_Assignment_t Packet_Uplink_Assignment;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block;</span><br><span style="color: hsl(120, 100%, 40%);">+ PSI13_t PSI13;</span><br><span> } u;</span><br><span> </span><br><span> /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members</span><br><span>@@ -4974,17 +4954,17 @@</span><br><span> Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure;</span><br><span> Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement;</span><br><span> Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack;</span><br><span style="color: hsl(0, 100%, 40%);">- EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack;</span><br><span> Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block;</span><br><span> Packet_Measurement_Report_t Packet_Measurement_Report;</span><br><span> Packet_Resource_Request_t Packet_Resource_Request;</span><br><span> Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status;</span><br><span> Packet_PSI_Status_t Packet_PSI_Status;</span><br><span style="color: hsl(120, 100%, 40%);">+ EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack;</span><br><span style="color: hsl(120, 100%, 40%);">+ Packet_Pause_t Packet_Pause;</span><br><span> Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report;</span><br><span style="color: hsl(120, 100%, 40%);">+ Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap;</span><br><span> Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification;</span><br><span> Packet_SI_Status_t Packet_SI_Status;</span><br><span style="color: hsl(0, 100%, 40%);">- Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap;</span><br><span style="color: hsl(0, 100%, 40%);">- Packet_Pause_t Packet_Pause;</span><br><span> } u;</span><br><span> gint16 NrOfBits;</span><br><span> } RlcMacUplink_t;</span><br><span>diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp</span><br><span>index b51d735..f911b09 100644</span><br><span>--- a/tests/rlcmac/RLCMACTest.cpp</span><br><span>+++ b/tests/rlcmac/RLCMACTest.cpp</span><br><span>@@ -65,7 +65,6 @@</span><br><span> cout << "sizeof Packet_Access_Reject_t " << sizeof(Packet_Access_Reject_t) << endl;</span><br><span> cout << "sizeof Packet_Cell_Change_Order_t " << sizeof(Packet_Cell_Change_Order_t) << endl;</span><br><span> cout << "sizeof Packet_Downlink_Assignment_t " << sizeof(Packet_Downlink_Assignment_t) << endl;</span><br><span style="color: hsl(0, 100%, 40%);">- cout << "sizeof Packet_Measurement_Order_Reduced_t " << sizeof(Packet_Measurement_Order_Reduced_t) << endl;</span><br><span> cout << "sizeof Packet_Neighbour_Cell_Data_t " << sizeof(Packet_Neighbour_Cell_Data_t) << endl;</span><br><span> cout << "sizeof Packet_Serving_Cell_Data_t " << sizeof(Packet_Serving_Cell_Data_t) << endl;</span><br><span> cout << "sizeof Packet_Paging_Request_t " << sizeof(Packet_Paging_Request_t) << endl;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-pcu/+/17043">change 17043</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-pcu/+/17043"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-pcu </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 </div>
<div style="display:none"> Gerrit-Change-Number: 17043 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>