osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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) 

svn path=/trunk/; revision=44319
This commit is contained in:
Pascal Quantin 2012-08-08 00:11:14 +00:00
parent 670be00aea
commit 9f8b638cfa
1 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
epan/dissectors/packet-gsm_rlcmac.h
View File

@ -4517,13 +4517,6 @@ typedef struct
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
@ -4889,45 +4882,31 @@ typedef struct
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_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
@ -4949,17 +4928,17 @@ typedef struct
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;