fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/29204 ) Change subject: rlcmac/ts_44_018: add missing M_PADDING_BITS to SI_13_t ...................................................................... rlcmac/ts_44_018: add missing M_PADDING_BITS to SI_13_t According to table 10.5.2.37b.1, SI 13 Rest Octets IE does contain spare padding. Adding M_PADDING_BITS fixes decoder warnings about unhandled remaining bits. Change-Id: I44fb7e2a60da022ee99f1a6cd4f2635bef2bfe1e --- M src/rlcmac/ts_44_018.c M tests/ts_44_018/ts_44_018_test.err 2 files changed, 6 insertions(+), 10 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/rlcmac/ts_44_018.c b/src/rlcmac/ts_44_018.c index c9e63e7..288fa6c 100644 --- a/src/rlcmac/ts_44_018.c +++ b/src/rlcmac/ts_44_018.c @@ -437,6 +437,7 @@ M_NEXT_EXIST_OR_NULL_LH(SI_13_t, Exist_AdditionsR99, 1), M_TYPE (SI_13_t, AdditionsR99, SI13_AdditionR99), + M_PADDING_BITS (SI_13_t), CSN_DESCR_END (SI_13_t) /* Enhanced Measurement Report */ diff --git a/tests/ts_44_018/ts_44_018_test.err b/tests/ts_44_018/ts_44_018_test.err index ebea6e0..ebed024 100644 --- a/tests/ts_44_018/ts_44_018_test.err +++ b/tests/ts_44_018/ts_44_018_test.err @@ -1,10 +1,5 @@ -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 69 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 2 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 6 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 74 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 104 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 62 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 40 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 0 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 62 remaining bits unhandled by decoder -DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 3 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 0 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 0 | BS_CV_MAX = 10 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 7 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 10 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | -DLGLOBAL NOTICE SI13 Rest Octets: 67 remaining bits unhandled by decoder +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | Padding = 5|101|101|101|101|101|101|101|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 2 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 0 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 3 | T3192 = 2 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 15 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 1 | PAN_MAX = 7 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 6 | Extension_Info = 6 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 0 | T_AVG_W = 16 | T_AVG_T = 16 | PC_MEAS_CHAN = 0 | N_AVG_I = 8 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 0 | : End AdditionsR99 | Padding = 0|172|172|172|172|172|172|172|172|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 104 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | Padding = 10|202|202|202|202|202|202|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 1 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 7 | DRX_TIMER_MAX = 7 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 1 | BS_CV_MAX = 6 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 16 | Extension_Info = 148 | Extension_Info = 40 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 12 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 0 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | Padding = 10|202|202|202|202|202|202|-22| +DLCSN1 INFO osmo_csn1_stream_decode (SI13 Rest Octets): Exist = 1 | BCCH_CHANGE_MARK = 3 | SI_CHANGE_FIELD = 0 | Exist_MA = 0 | u.PBCCH_Not_present = 0 | : u.PBCCH_Not_present | RAC = 1 | SPGC_CCCH_SUP = 0 | PRIORITY_ACCESS_THR = 6 | NETWORK_CONTROL_ORDER = 0 | : GPRS_Cell_Options | NMO = 1 | T3168 = 0 | T3192 = 0 | DRX_TIMER_MAX = 3 | ACCESS_BURST_TYPE = 0 | CONTROL_ACK_TYPE = 0 | BS_CV_MAX = 10 | Exist_PAN = 1 | PAN_DEC = 1 | PAN_INC = 2 | PAN_MAX = 4 | Exist_Extension_Bits = 1 | : Extension_Bits | extension_length = 11 | Extension_Info = 212 | Extension_Info = 7 | : End Extension_Bits | : End GPRS_Cell_Options | : GPRS_Power_Control_Parameters | ALPHA = 8 | T_AVG_W = 10 | T_AVG_T = 10 | PC_MEAS_CHAN = 0 | N_AVG_I = 2 | : End GPRS_Power_Control_Parameters | : End u.PBCCH_Not_present | Exist_AdditionsR99 = 1 | : AdditionsR99 | SGSNR = 1 | Exist_AdditionsR4 = 1 | : AdditionsR4 | SI_STATUS_IND = 1 | Exist_AdditionsR6 = 0 | : End AdditionsR4 | : End AdditionsR99 | Padding = 1|89|89|89|89|89|89|89|-22| 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/29204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I44fb7e2a60da022ee99f1a6cd4f2635bef2bfe1e Gerrit-Change-Number: 29204 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-MessageType: merged