May 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: library: add a receive equivalent for ts_RSL_ChanMode_SIGN

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33034 ) Change subject: library: add a receive equivalent for ts_RSL_ChanMode_SIGN ...................................................................... library: add a receive equivalent for ts_RSL_ChanMode_SIGN Also take a chance to enrich the already existing send template. Change-Id: Id39ca75a9194d7c62b9e5e2d96e766c4940c8281 Related: OS#1572, OS#4396 --- M bts/BTS_Tests.ttcn M library/RSL_Types.ttcn 2 files changed, 31 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 8fc0fa9..a0d2cfe 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -7921,7 +7921,7 @@ var ConnHdlrPars pars; pars.t_guard := 60.0; f_init(); - ch_mode := ts_RSL_ChanMode_SIGN(dtx_downlink := dtxd); + ch_mode := ts_RSL_ChanMode_SIGN(dtxd := dtxd); for (var integer i := 0; i < sizeof(g_AllChannels); i := i + 1) { pars := valueof(t_Pars(g_AllChannels[i], ch_mode)); if (dtxd) { diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index c1b7a80..08e49b5 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -439,12 +439,26 @@ data, spd_ind = RSL_SPDI_DATA; )"} - template (value) RSL_IE_ChannelMode ts_RSL_ChanMode_SIGN(RSL_ChanRateType t := RSL_CHRT_SDCCH, - boolean dtx_downlink := false) := { + template (value) RSL_IE_ChannelMode + ts_RSL_ChanMode_SIGN(template (value) RSL_ChanRateType t := RSL_CHRT_SDCCH, + template (value) boolean dtxd := false, + template (value) boolean dtxu := false) := { len := 0, /* overwritten */ reserved := '000000'B, - dtx_d := dtx_downlink, - dtx_u := false, + dtx_d := dtxd, + dtx_u := dtxu, + spd_ind := RSL_SPDI_SIGN, + ch_rate_type := t, + u := { sign := RSL_CMOD_NO_RESOURCE } + } + template RSL_IE_ChannelMode + tr_RSL_ChanMode_SIGN(template (present) RSL_ChanRateType t := ?, + template (present) boolean dtxd := ?, + template (present) boolean dtxu := ?) := { + len := ?, + reserved := ?, + dtx_d := dtxd, + dtx_u := dtxu, spd_ind := RSL_SPDI_SIGN, ch_rate_type := t, u := { sign := RSL_CMOD_NO_RESOURCE } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33034 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Id39ca75a9194d7c62b9e5e2d96e766c4940c8281 Gerrit-Change-Number: 33034 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_dchan(): add support for CSD channel modes

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035 ) Change subject: BTS_Tests: f_est_dchan(): add support for CSD channel modes ...................................................................... BTS_Tests: f_est_dchan(): add support for CSD channel modes Change-Id: I066657941dd751183aa5e937a6bfe9ab7837d46b Related: OS#1572, OS#4396 --- M bts/BTS_Tests.ttcn M library/L1CTL_Types.ttcn 2 files changed, 42 insertions(+), 18 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index a0d2cfe..8dcfb01 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -2542,24 +2542,35 @@ var uint8_t amr_start_codec := 0; var BIT8 amr_codecs_bitmask := '00000000'B; - if (ischosen(g_pars.chan_mode.u.sign) and g_pars.chan_mode.u.sign == RSL_CMOD_NO_RESOURCE) { - tch_mode := L1CTL_CHAN_MODE_SIGN; - } else if (ischosen(g_pars.chan_mode.u.speech)) { - select (g_pars.chan_mode.u.speech) { - case (RSL_CMOD_SP_GSM1) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V1; } - case (RSL_CMOD_SP_GSM2) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V2; } - case (RSL_CMOD_SP_GSM3) { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3; - amr_codecs_bitmask := g_pars.mr_conf.codec_modes; - } - case else { - log("RSL channel mode := ", g_pars.chan_mode.u.speech, - " is not supported by the L1, falling back to signalling"); - tch_mode := L1CTL_CHAN_MODE_SIGN; - } - } - } else { + select (g_pars.chan_mode) { + case (tr_RSL_ChanMode_SIGN) + { tch_mode := L1CTL_CHAN_MODE_SIGN; } + /* Speech modes */ + case (tr_RSL_ChanMode((RSL_CHRT_TCH_F, RSL_CHRT_TCH_H), RSL_CMOD_SP_GSM1)) + { tch_mode := L1CTL_CHAN_MODE_SPEECH_V1; } + case (tr_RSL_ChanMode((RSL_CHRT_TCH_F, RSL_CHRT_TCH_H), RSL_CMOD_SP_GSM2)) + { tch_mode := L1CTL_CHAN_MODE_SPEECH_V2; } + case (tr_RSL_ChanMode((RSL_CHRT_TCH_F, RSL_CHRT_TCH_H), RSL_CMOD_SP_GSM3)) + { tch_mode := L1CTL_CHAN_MODE_SPEECH_V3; + amr_codecs_bitmask := g_pars.mr_conf.codec_modes; } + /* Data modes */ + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, /* TCH/F14.4 */ + (RSL_CMOD_CSD_T_14k4, RSL_CMOD_CSD_NT_14k5))) + { tch_mode := L1CTL_CHAN_MODE_DATA_14k5; } + case (tr_RSL_ChanMode_DATA(RSL_CHRT_TCH_F, /* TCH/F9.6 */ + (RSL_CMOD_CSD_T_9k6, RSL_CMOD_CSD_NT_12k0))) + { tch_mode := L1CTL_CHAN_MODE_DATA_12k0; } + case (tr_RSL_ChanMode_DATA((RSL_CHRT_TCH_F, RSL_CHRT_TCH_H), /* TCH/[FH]4.8 */ + (RSL_CMOD_CSD_T_4k8, RSL_CMOD_CSD_NT_6k0))) + { tch_mode := L1CTL_CHAN_MODE_DATA_6k0; } + case (tr_RSL_ChanMode_DATA((RSL_CHRT_TCH_F, RSL_CHRT_TCH_H), /* TCH/[FH]2.4 */ + (RSL_CMOD_CSD_T_2k4, RSL_CMOD_CSD_T_1k2, + RSL_CMOD_CSD_T_600, RSL_CMOD_CSD_T_1200_75))) + { tch_mode := L1CTL_CHAN_MODE_DATA_3k6; } + case else { log("RSL channel mode is not supported by the L1, falling back to signalling"); tch_mode := L1CTL_CHAN_MODE_SIGN; + } } f_L1CTL_TCH_MODE(L1CTL, diff --git a/library/L1CTL_Types.ttcn b/library/L1CTL_Types.ttcn index 192091e..fe56459 100644 --- a/library/L1CTL_Types.ttcn +++ b/library/L1CTL_Types.ttcn @@ -127,8 +127,11 @@ L1CTL_CHAN_MODE_SIGN ('00000000'B), /* Signalling */ L1CTL_CHAN_MODE_SPEECH_V1 ('00000001'B), /* FR or HR codec */ L1CTL_CHAN_MODE_SPEECH_V2 ('00100001'B), /* EFR codec */ - L1CTL_CHAN_MODE_SPEECH_V3 ('01000001'B) /* AMR codec */ - /* Other modes are not supported for now */ + L1CTL_CHAN_MODE_SPEECH_V3 ('01000001'B), /* AMR codec */ + L1CTL_CHAN_MODE_DATA_14k5 ('00001111'B), /* CSD: TCH/F14.4 */ + L1CTL_CHAN_MODE_DATA_12k0 ('00000011'B), /* CSD: TCH/F9.6 */ + L1CTL_CHAN_MODE_DATA_6k0 ('00001011'B), /* CSD: TCH/{FH}4.8 */ + L1CTL_CHAN_MODE_DATA_3k6 ('00010011'B) /* CSD: TCH/{FH}2.4 */ } with { variant "FIELDLENGTH(8)" }; type enumerated L1ctlLoopMode { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I066657941dd751183aa5e937a6bfe9ab7837d46b Gerrit-Change-Number: 33035 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: library: add RSL_IE_ChannelMode templates for CSD

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33033 ) Change subject: library: add RSL_IE_ChannelMode templates for CSD ...................................................................... library: add RSL_IE_ChannelMode templates for CSD Change-Id: Ic10b3d791b6e9553dddf7d55f097483164fc9d4d Related: OS#1572, OS#4396 --- M library/RSL_Types.ttcn 1 file changed, 37 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/library/RSL_Types.ttcn b/library/RSL_Types.ttcn index ceb6adb..c1b7a80 100644 --- a/library/RSL_Types.ttcn +++ b/library/RSL_Types.ttcn @@ -450,6 +450,33 @@ u := { sign := RSL_CMOD_NO_RESOURCE } } + template (value) RSL_IE_ChannelMode + ts_RSL_ChanMode_DATA(template (value) RSL_ChanRateType t, + template (value) RSL_ChanModeOct6DataRate r, + template (value) boolean dtxd := false, + template (value) boolean dtxu := false) := { + len := 0, /* overwritten */ + reserved := '000000'B, + dtx_d := dtxd, + dtx_u := dtxu, + spd_ind := RSL_SPDI_DATA, + ch_rate_type := t, + u := { data := r } + } + template RSL_IE_ChannelMode + tr_RSL_ChanMode_DATA(template (present) RSL_ChanRateType t := ?, + template (present) RSL_ChanModeOct6DataRate r := ?, + template (present) boolean dtxd := ?, + template (present) boolean dtxu := ?) := { + len := ?, + reserved := ?, + dtx_d := dtxd, + dtx_u := dtxu, + spd_ind := RSL_SPDI_DATA, + ch_rate_type := t, + u := { data := r } + } + template (value) RSL_IE_ChannelMode ts_RSL_ChanMode(RSL_ChanRateType t, RSL_ChanModeOct6SpeechAlgo alg, boolean dtx_downlink := false) := { len := 0, /* overwritten */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33033 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ic10b3d791b6e9553dddf7d55f097483164fc9d4d Gerrit-Change-Number: 33033 Gerrit-PatchSet: 1 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: f_est_dchan(): add support for CSD channel modes

by fixeria

Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035 ) Change subject: BTS_Tests: f_est_dchan(): add support for CSD channel modes ...................................................................... Patch Set 1: (1 comment) File bts/BTS_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035/comment/e002476a_a17e… PS1, Line 2546: case (tr_RSL_ChanMode_SIGN) > what? you can use templates as cases? Yeah, why not? :) ETSI ES 201 873-1 defines the syntax as follows: ``` select "(" SingleExpression ")" "{" { case "(" { TemplateInstance[","] } ")" StatementBlock }+ [ case else StatementBlock ] "}" ``` > I wonder how is that implemented, given that 2 templates could match the same value... I guess the one that matches first wins. > did you make sure this works as expected? Yes. Actually we already do have templates-in-select in our code base: ``` bsc/BSC_Tests.ttcn: select (arfcn_) { bsc/BSC_Tests.ttcn- case (tr_GsmBandArfcn((259..293), false, ?)) { band := "GSM450"; } bsc/BSC_Tests.ttcn- case (tr_GsmBandArfcn((306..340), false, ?)) { band := "GSM480"; } bsc/BSC_Tests.ttcn- case (tr_GsmBandArfcn((438..511), false, ?)) { band := "GSM750"; } bsc/BSC_Tests.ttcn- case (tr_GsmBandArfcn((128..251), false, ?)) { band := "GSM850"; } bsc/BSC_Tests.ttcn- case (tr_GsmBandArfcn((0..124), false, ?)) { band := "GSM900"; } ``` -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33035 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I066657941dd751183aa5e937a6bfe9ab7837d46b Gerrit-Change-Number: 33035 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Sat, 27 May 2023 09:11:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: coding: gsm0503_tch_{fr,hr}_encode(): add ability to emit BFI

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33063 ) Change subject: coding: gsm0503_tch_{fr,hr}_encode(): add ability to emit BFI ...................................................................... coding: gsm0503_tch_{fr,hr}_encode(): add ability to emit BFI Every BTS needs to have some graceful handling for the scenario where it is time to send out a speech frame on TCH DL, but there is no frame to be sent. One possible solution is to transmit dummy FACCH, but this option is unattractive for TCH/HS where FACCH displaces two speech frames rather than one. A more elegant solution is to emit a speech frame with inverted CRC3, causing the MS receiver to declare a BFI condition to its Rx DTX handler. Setting all u(k) bits to 0 is one way to produce such an inverted-CRC speech frame (normal TCH FR/HR CRC3 for an all-zeros frame would be 111), and this method is in fact what sysmoBTS PHY is observed to do. Add the same ability to gsm0503_tch_{fr,hr}_encode() functions, indicated by payload length of 0. Change-Id: Iade3310e16b906efb6892d28f474a0d15204e861 --- M src/coding/gsm0503_coding.c 1 file changed, 43 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/63/33063/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 724bea2..c3b7bbc 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -1941,6 +1941,20 @@ osmo_conv_encode(&gsm0503_tch_fr, conv, cB); h = 0; break; + case 0: /* no data, induce BFI in the receiver */ + /* Do the same thing that sysmoBTS PHY does when fed a 0-length + * payload for DL: set all u(k) bits to 0, and do the same + * with all class 2 bits. This operation is NOT the same as + * an FR codec frame of all zero bits: with all-zeros d(k) input + * the CRC3 function will produce 111 output, whereas we + * transmit 000 in those parity bits too. The result will be + * an induced BFI (bad frame indication) condition in the + * receiver. */ + memset(conv, 0, 185); + memset(cB + 378, 0, 78); + osmo_conv_encode(&gsm0503_tch_fr, conv, cB); + h = 0; + break; case GSM_MACBLOCK_LEN: /* FACCH */ _xcch_encode_cB(cB, tch_data); h = 1; @@ -2084,8 +2098,9 @@ tch_hr_b_to_d(d, b); osmo_crc8gen_set_bits(&gsm0503_tch_fr_crc3, d + 73, 22, p); tch_hr_reorder(conv, d, p); - osmo_conv_encode(&gsm0503_tch_hr, conv, cB); memcpy(cB + 211, d + 95, 17); +hr_conv_coding: + osmo_conv_encode(&gsm0503_tch_hr, conv, cB); h = 0; gsm0503_tch_hr_interleave(cB, iB); for (i = 0; i < 4; i++) { @@ -2093,6 +2108,11 @@ &bursts[i * 116], &h, i >> 1); } break; + case 0: /* no data, induce BFI in the receiver */ + /* see comments in gsm0503_tch_fr_encode() - same deal here */ + memset(conv, 0, 98); + memset(cB + 211, 0, 17); + goto hr_conv_coding; case GSM_MACBLOCK_LEN: /* FACCH */ _xcch_encode_cB(cB, tch_data); h = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33063 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Iade3310e16b906efb6892d28f474a0d15204e861 Gerrit-Change-Number: 33063 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in libosmocore[master]: coding cosmetic: gsm0503_tch_{fr,hr}_encode(): remove extra spacing

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/33062 ) Change subject: coding cosmetic: gsm0503_tch_{fr,hr}_encode(): remove extra spacing ...................................................................... coding cosmetic: gsm0503_tch_{fr,hr}_encode(): remove extra spacing These two functions are structured as switch statements handling different types of input, but they also have a lot of empty spacing lines in strange places, making them difficult to read and even more difficult to add new functionality while maintaining the same style. Remove those extra spaces. Change-Id: I595a80898283d0932fb33f582347ec39a9481d1a --- M src/coding/gsm0503_coding.c 1 file changed, 15 insertions(+), 27 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/62/33062/1 diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index a34cd92..724bea2 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -1925,40 +1925,25 @@ switch (len) { case GSM_EFR_BYTES: /* TCH EFR */ - tch_efr_disassemble(s, tch_data); - tch_efr_protected(s, b); - osmo_crc8gen_set_bits(&gsm0503_tch_efr_crc8, b, 65, p); - tch_efr_reorder(w, s, p); - tch_efr_w_to_d(d, w); - goto coding_efr_fr; case GSM_FR_BYTES: /* TCH FR */ tch_fr_disassemble(w, tch_data, net_order); - tch_fr_b_to_d(d, w); - coding_efr_fr: osmo_crc8gen_set_bits(&gsm0503_tch_fr_crc3, d, 50, p); - tch_fr_reorder(conv, d, p); - memcpy(cB + 378, d + 182, 78); - osmo_conv_encode(&gsm0503_tch_fr, conv, cB); - h = 0; - break; case GSM_MACBLOCK_LEN: /* FACCH */ _xcch_encode_cB(cB, tch_data); - h = 1; - break; default: return -1; @@ -2096,21 +2081,13 @@ /* fall-through */ case GSM_HR_BYTES: /* TCH HR in "pure" form */ tch_hr_disassemble(b, tch_data); - tch_hr_b_to_d(d, b); - osmo_crc8gen_set_bits(&gsm0503_tch_fr_crc3, d + 73, 22, p); - tch_hr_reorder(conv, d, p); - osmo_conv_encode(&gsm0503_tch_hr, conv, cB); - memcpy(cB + 211, d + 95, 17); - h = 0; - gsm0503_tch_hr_interleave(cB, iB); - for (i = 0; i < 4; i++) { gsm0503_tch_burst_map(&iB[i * 114], &bursts[i * 116], &h, i >> 1); @@ -2118,16 +2095,12 @@ break; case GSM_MACBLOCK_LEN: /* FACCH */ _xcch_encode_cB(cB, tch_data); - h = 1; - gsm0503_tch_fr_interleave(cB, iB); - for (i = 0; i < 6; i++) { gsm0503_tch_burst_map(&iB[i * 114], &bursts[i * 116], &h, i >> 2); } - for (i = 2; i < 4; i++) { gsm0503_tch_burst_map(&iB[i * 114 + 456], &bursts[i * 116], &h, 1); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33062 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I595a80898283d0932fb33f582347ec39a9481d1a Gerrit-Change-Number: 33062 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-bts[master]: trx: fix HR1 codec breakage from format change

by falconia

falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/33061 ) Change subject: trx: fix HR1 codec breakage from format change ...................................................................... trx: fix HR1 codec breakage from format change As of commit 1160cabefb23, the common layer of osmo-bts accepts both TS 101 318 and RFC 5993 formats for HR1 codec, and always passes the more basic TS 101 318 format to the BTS model. Unfortunately, osmo-bts-trx has model-specific code checking the payload length that was overlooked in that patch, causing breakage. Fix that bug. (The actual channel encoding function in libosmocoding already accepts 14-byte payloads.) Related: OS#5688 Fixes: I702e26c3ad5b9d8347e73c6cd23efa38a3a3407e Change-Id: I0e251faeffb76d2604a4100c848141d239d1d86f --- M src/osmo-bts-trx/sched_lchan_tchf.c 1 file changed, 20 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/33061/1 diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index 43a3784..0d0f52a 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -390,7 +390,7 @@ switch (tch_mode) { case GSM48_CMODE_SPEECH_V1: /* FR / HR */ if (br->chan != TRXC_TCHF) /* HR */ - len = GSM_HR_BYTES_RTP_RFC5993; + len = GSM_HR_BYTES; else len = GSM_FR_BYTES; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33061 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I0e251faeffb76d2604a4100c848141d239d1d86f Gerrit-Change-Number: 33061 Gerrit-PatchSet: 1 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: remove obsolete context_map_check_released() call

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32912 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: remove obsolete context_map_check_released() call ...................................................................... remove obsolete context_map_check_released() call When in map_rua_fsm_cleanup(), we are always already deallocating the context map, i.e. neither RUA nor SCCP are active anymore. No need to call context_map_check_released() again. Change-Id: I4bf9a9de7861296ec38c3a37de0254ad9a41ef1b --- M src/osmo-hnbgw/context_map_rua.c 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index bc012f3..5a715c4 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -314,7 +314,6 @@ { struct hnbgw_context_map *map = fi->priv; map->rua_fi = NULL; - context_map_check_released(map); } #define S(x) (1 << (x)) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32912 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I4bf9a9de7861296ec38c3a37de0254ad9a41ef1b Gerrit-Change-Number: 32912 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[M] Change in osmo-hnbgw[master]: drop dead code: cnlink.T_RafC

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32911 ) ( 2 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: drop dead code: cnlink.T_RafC ...................................................................... drop dead code: cnlink.T_RafC This looks like working RANAP RESET handling, but is in fact dead code. Instead of testing and completing this implementation, I will copy the RESET handling FSM from osmo-bsc, which is proven to work well. See Id3eefdea889a736fd5957b80280fa45b9547b792 "detect in/active CN links by RANAP RESET" The future patch will start to use transmit_rst(). So instead of dropping now and resurrecting later, let's keep the code -- but it has to be '#if 0'-ed to avoid compiler complaints about the unused function. Related: SYS#6412 Change-Id: I7cacaec631051cf5420202f2f0dd9665a5565b17 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw_cn.c 2 files changed, 28 insertions(+), 55 deletions(-) Approvals: neels: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index e3ec38b..e67a86a 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -61,24 +61,9 @@ uint32_t cid; /*!< Cell ID */ }; -enum hnbgw_cnlink_state { - /* we have just been initialized or were disconnected */ - CNLINK_S_NULL, - /* establishment of the SUA/SCCP link is pending */ - CNLINK_S_EST_PEND, - /* establishment of the SUA/SCCP link was confirmed */ - CNLINK_S_EST_CONF, - /* we have esnt the RANAP RESET and wait for the ACK */ - CNLINK_S_EST_RST_TX_WAIT_ACK, - /* we have received the RANAP RESET ACK and are active */ - CNLINK_S_EST_ACTIVE, -}; - struct hnbgw_cnlink { struct llist_head list; - enum hnbgw_cnlink_state state; - /* timer for re-transmitting the RANAP Reset */ - struct osmo_timer_list T_RafC; + /* reference to the SCCP User SAP by which we communicate */ struct osmo_sccp_instance *sccp; struct osmo_sccp_user *sccp_user; diff --git a/src/osmo-hnbgw/hnbgw_cn.c b/src/osmo-hnbgw/hnbgw_cn.c index a256b24..d9e35af 100644 --- a/src/osmo-hnbgw/hnbgw_cn.c +++ b/src/osmo-hnbgw/hnbgw_cn.c @@ -37,14 +37,9 @@ #include <osmocom/ranap/ranap_msg_factory.h> #include <osmocom/hnbgw/context_map.h> -/*********************************************************************** - * Outbound RANAP RESET to CN - ***********************************************************************/ - -void hnbgw_cnlink_change_state(struct hnbgw_cnlink *cnlink, enum hnbgw_cnlink_state state); - -static int transmit_rst(RANAP_CN_DomainIndicator_t domain, - struct osmo_sccp_addr *remote_addr) +#if 0 +this code will soon move to new file cnlink.c +static int transmit_rst(struct hnbgw_cnlink *cnlink) { struct msgb *msg; RANAP_Cause_t cause = { @@ -63,6 +58,7 @@ remote_addr, msg); } +#endif static int transmit_reset_ack(RANAP_CN_DomainIndicator_t domain, const struct osmo_sccp_addr *remote_addr) @@ -81,35 +77,6 @@ msg); } -/* Timer callback once T_RafC expires */ -static void cnlink_trafc_cb(void *unused) -{ - transmit_rst(RANAP_CN_DomainIndicator_cs_domain, &g_hnbgw->sccp.iucs_remote_addr); - transmit_rst(RANAP_CN_DomainIndicator_ps_domain, &g_hnbgw->sccp.iups_remote_addr); - hnbgw_cnlink_change_state(g_hnbgw->sccp.cnlink, CNLINK_S_EST_RST_TX_WAIT_ACK); - /* The spec states that we should abandon after a configurable - * number of times. We decide to simply continue trying */ -} - -/* change the state of a CN Link */ -void hnbgw_cnlink_change_state(struct hnbgw_cnlink *cnlink, enum hnbgw_cnlink_state state) -{ - switch (state) { - case CNLINK_S_NULL: - case CNLINK_S_EST_PEND: - break; - case CNLINK_S_EST_CONF: - cnlink_trafc_cb(NULL); - break; - case CNLINK_S_EST_RST_TX_WAIT_ACK: - osmo_timer_schedule(&cnlink->T_RafC, 5, 0); - break; - case CNLINK_S_EST_ACTIVE: - osmo_timer_del(&cnlink->T_RafC); - break; - } -} - /*********************************************************************** * Incoming primitives from SCCP User SAP ***********************************************************************/ @@ -148,7 +115,8 @@ rc = ranap_decode_resetacknowledgeies(&ies, &omsg->value); - hnbgw_cnlink_change_state(cnlink, CNLINK_S_EST_ACTIVE); + /* FUTURE: will do something useful in commit 'detect in/active CN links by RANAP RESET' + * Id3eefdea889a736fd5957b80280fa45b9547b792 */ ranap_free_resetacknowledgeies(&ies); return rc; @@ -527,7 +495,6 @@ cnlink = talloc_zero(g_hnbgw, struct hnbgw_cnlink); INIT_LLIST_HEAD(&cnlink->map_list); - cnlink->T_RafC.cb = cnlink_trafc_cb; cnlink->next_conn_id = 1000; cnlink->sccp_user = osmo_sccp_user_bind_pc(g_hnbgw->sccp.client, "OsmoHNBGW", sccp_sap_up, -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32911 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I7cacaec631051cf5420202f2f0dd9665a5565b17 Gerrit-Change-Number: 32911 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

[S] Change in osmo-hnbgw[master]: unbloat: drop context_map_check_released()

by neels

neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/32913 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: unbloat: drop context_map_check_released() ...................................................................... unbloat: drop context_map_check_released() When I implemented it, I thought context_map_check_released() would help clarify context map deallocation, but instead it just bloats. Simplify and tweak related comment. Change-Id: I535780de0d3b09893ba89d66804e5e36b26db049 --- M include/osmocom/hnbgw/context_map.h M src/osmo-hnbgw/context_map.c M src/osmo-hnbgw/context_map_rua.c M src/osmo-hnbgw/context_map_sccp.c 4 files changed, 22 insertions(+), 18 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/hnbgw/context_map.h b/include/osmocom/hnbgw/context_map.h index 2b60958..a2e76c3 100644 --- a/include/osmocom/hnbgw/context_map.h +++ b/include/osmocom/hnbgw/context_map.h @@ -156,6 +156,6 @@ bool map_rua_is_active(struct hnbgw_context_map *map); bool map_sccp_is_active(struct hnbgw_context_map *map); -void context_map_check_released(struct hnbgw_context_map *map); +void context_map_free(struct hnbgw_context_map *map); unsigned int msg_has_l2_data(const struct msgb *msg); diff --git a/src/osmo-hnbgw/context_map.c b/src/osmo-hnbgw/context_map.c index c9507be..f610087 100644 --- a/src/osmo-hnbgw/context_map.c +++ b/src/osmo-hnbgw/context_map.c @@ -247,12 +247,3 @@ LOG_MAP(map, DMAIN, LOGL_INFO, "Deallocating\n"); talloc_free(map); } - -void context_map_check_released(struct hnbgw_context_map *map) -{ - if (map_rua_is_active(map) || map_sccp_is_active(map)) { - /* still active, do not release yet. */ - return; - } - context_map_free(map); -} diff --git a/src/osmo-hnbgw/context_map_rua.c b/src/osmo-hnbgw/context_map_rua.c index 5a715c4..f50f711 100644 --- a/src/osmo-hnbgw/context_map_rua.c +++ b/src/osmo-hnbgw/context_map_rua.c @@ -294,13 +294,13 @@ static void map_rua_disconnected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct hnbgw_context_map *map = fi->priv; - /* For sanity, always tell SCCP to disconnect, if it hasn't done so. Dispatching MAP_SCCP_EV_RAN_DISC may send - * SCCP into MAP_RUA_ST_DISCONNECTED, which calls context_map_check_released() and frees the hnbgw_context_map, - * so don't free it a second time. If SCCP stays active, calling context_map_check_released() has no effect. */ + /* From RUA's POV, we can now free the hnbgw_context_map. + * If SCCP is still active, tell it to disconnect -- in that case the SCCP side will call context_map_free(). + * If SCCP is no longer active, free this map. */ if (map_sccp_is_active(map)) map_sccp_dispatch(map, MAP_SCCP_EV_RAN_DISC, NULL); else - context_map_check_released(map); + context_map_free(map); } static void map_rua_disconnected_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) diff --git a/src/osmo-hnbgw/context_map_sccp.c b/src/osmo-hnbgw/context_map_sccp.c index 8e04fba..132d03e 100644 --- a/src/osmo-hnbgw/context_map_sccp.c +++ b/src/osmo-hnbgw/context_map_sccp.c @@ -419,13 +419,13 @@ static void map_sccp_disconnected_onenter(struct osmo_fsm_inst *fi, uint32_t prev_state) { struct hnbgw_context_map *map = fi->priv; - /* For sanity, always tell RUA to disconnect, if it hasn't done so. Dispatching MAP_RUA_EV_CN_DISC may send - * RUA into MAP_RUA_ST_DISCONNECTED, which calls context_map_check_released() and frees the hnbgw_context_map, - * so don't free it a second time. If RUA stays active, calling context_map_check_released() has no effect. */ + /* From SCCP's POV, we can now free the hnbgw_context_map. + * If RUA is still active, tell it to disconnect -- in that case the RUA side will call context_map_free(). + * If RUA is no longer active, free this map. */ if (map_rua_is_active(map)) map_rua_dispatch(map, MAP_RUA_EV_CN_DISC, NULL); else - context_map_check_released(map); + context_map_free(map); } static void map_sccp_disconnected_action(struct osmo_fsm_inst *fi, uint32_t event, void *data) -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/32913 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I535780de0d3b09893ba89d66804e5e36b26db049 Gerrit-Change-Number: 32913 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023