This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
pespin gerrit-no-reply at lists.osmocom.orgpespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/17043 ) Change subject: gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure ...................................................................... gsm_rlcmac.h: Remove Uplink messages from the RlcMacDownlink_t structure (as they are part of the RlcMacUplink_t structure that is also used to call csnStreamDissector function). Port from wireshark.git commit 9f8b638cfa8a660fb64c54dcadb83e6747db0a15. Ported-by: Pau Espin Pedrol <pespin at sysmocom.de> Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 --- M src/gsm_rlcmac.h M tests/rlcmac/RLCMACTest.cpp 2 files changed, 25 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/43/17043/1 diff --git a/src/gsm_rlcmac.h b/src/gsm_rlcmac.h index 196ced2..90c5bfd 100644 --- a/src/gsm_rlcmac.h +++ b/src/gsm_rlcmac.h @@ -4528,13 +4528,6 @@ PMO_AdditionsR98_t AdditionsR98; } Packet_Measurement_Order_t; -typedef struct -{ - guint8 MESSAGE_TYPE; - guint8 PAGE_MODE; - PacketDownlinkID_t ID; -} Packet_Measurement_Order_Reduced_t; - /* Enhanced measurement report */ typedef struct @@ -4900,45 +4893,32 @@ union { guint8 MESSAGE_TYPE; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - EGPRS_PD_AckNack_t EGPRS_PD_AckNack; - PSI13_t PSI13; + Packet_Access_Reject_t Packet_Access_Reject; + Packet_Cell_Change_Order_t Packet_Cell_Change_Order; + Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; + Packet_Downlink_Assignment_t Packet_Downlink_Assignment; + Packet_Measurement_Order_t Packet_Measurement_Order; + Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; + Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; + Packet_Paging_Request_t Packet_Paging_Request; + Packet_PDCH_Release_t Packet_PDCH_Release; + Packet_Polling_Request_t Packet_Polling_Request; + Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; + Packet_PRACH_Parameters_t Packet_PRACH_Parameters; + Packet_Queueing_Notification_t Packet_Queueing_Notification; + Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; + Packet_TBF_Release_t Packet_TBF_Release; + Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; + Packet_Uplink_Assignment_t Packet_Uplink_Assignment; + Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; + Packet_Handover_Command_t Packet_Handover_Command; + Packet_PhysicalInformation_t Packet_PhysicalInformation; + Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; PSI1_t PSI1; PSI2_t PSI2; PSI3_t PSI3; PSI5_t PSI5; - Packet_Access_Reject_t Packet_Access_Reject; - Packet_Cell_Change_Continue_t Packet_Cell_Change_Continue; - Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; - Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; - Packet_Cell_Change_Order_t Packet_Cell_Change_Order; - Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; - Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - Packet_Downlink_Assignment_t Packet_Downlink_Assignment; - Packet_Downlink_Dummy_Control_Block_t Packet_Downlink_Dummy_Control_Block; - Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; - Packet_Handover_Command_t Packet_Handover_Command; - Packet_Measurement_Order_t Packet_Measurement_Order; - Packet_Measurement_Report_t Packet_Measurement_Report; - Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; - Packet_Neighbour_Cell_Data_t Packet_Neighbour_Cell_Data; - Packet_PDCH_Release_t Packet_PDCH_Release; - Packet_PRACH_Parameters_t Packet_PRACH_Parameters; - Packet_PSI_Status_t Packet_PSI_Status; - Packet_Paging_Request_t Packet_Paging_Request; - Packet_Pause_t Packet_Pause; - Packet_PhysicalInformation_t Packet_PhysicalInformation; - Packet_Polling_Request_t Packet_Polling_Request; - Packet_Power_Control_Timing_Advance_t Packet_Power_Control_Timing_Advance; - Packet_Queueing_Notification_t Packet_Queueing_Notification; - Packet_Resource_Request_t Packet_Resource_Request; - Packet_SI_Status_t Packet_SI_Status; - Packet_Serving_Cell_Data_t Packet_Serving_Cell_Data; - Packet_TBF_Release_t Packet_TBF_Release; - Packet_Timeslot_Reconfigure_t Packet_Timeslot_Reconfigure; - Packet_Uplink_Ack_Nack_t Packet_Uplink_Ack_Nack; - Packet_Uplink_Assignment_t Packet_Uplink_Assignment; - Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; + PSI13_t PSI13; } u; /* NrOfBits is placed after union to avoid unnecessary code changes when addressing the union members @@ -4974,17 +4954,17 @@ Packet_Cell_Change_Failure_t Packet_Cell_Change_Failure; Packet_Control_Acknowledgement_t Packet_Control_Acknowledgement; Packet_Downlink_Ack_Nack_t Packet_Downlink_Ack_Nack; - EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; Packet_Uplink_Dummy_Control_Block_t Packet_Uplink_Dummy_Control_Block; Packet_Measurement_Report_t Packet_Measurement_Report; Packet_Resource_Request_t Packet_Resource_Request; Packet_Mobile_TBF_Status_t Packet_Mobile_TBF_Status; Packet_PSI_Status_t Packet_PSI_Status; + EGPRS_PD_AckNack_t Egprs_Packet_Downlink_Ack_Nack; + Packet_Pause_t Packet_Pause; Packet_Enh_Measurement_Report_t Packet_Enh_Measurement_Report; + Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; Packet_Cell_Change_Notification_t Packet_Cell_Change_Notification; Packet_SI_Status_t Packet_SI_Status; - Additional_MS_Rad_Access_Cap_t Additional_MS_Rad_Access_Cap; - Packet_Pause_t Packet_Pause; } u; gint16 NrOfBits; } RlcMacUplink_t; diff --git a/tests/rlcmac/RLCMACTest.cpp b/tests/rlcmac/RLCMACTest.cpp index b51d735..f911b09 100644 --- a/tests/rlcmac/RLCMACTest.cpp +++ b/tests/rlcmac/RLCMACTest.cpp @@ -65,7 +65,6 @@ cout << "sizeof Packet_Access_Reject_t " << sizeof(Packet_Access_Reject_t) << endl; cout << "sizeof Packet_Cell_Change_Order_t " << sizeof(Packet_Cell_Change_Order_t) << endl; cout << "sizeof Packet_Downlink_Assignment_t " << sizeof(Packet_Downlink_Assignment_t) << endl; - cout << "sizeof Packet_Measurement_Order_Reduced_t " << sizeof(Packet_Measurement_Order_Reduced_t) << endl; cout << "sizeof Packet_Neighbour_Cell_Data_t " << sizeof(Packet_Neighbour_Cell_Data_t) << endl; cout << "sizeof Packet_Serving_Cell_Data_t " << sizeof(Packet_Serving_Cell_Data_t) << endl; cout << "sizeof Packet_Paging_Request_t " << sizeof(Packet_Paging_Request_t) << endl; -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/17043 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If46f8cc3f21f527f911dcac6ff1b78f182104a00 Gerrit-Change-Number: 17043 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin at sysmocom.de> Gerrit-MessageType: newchange -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200128/1e210a43/attachment.htm>