March 2022 - gerrit-log - lists.osmocom.org

Change in osmo-bsc[master]: struct gsm_encr: store alg_id in human-readable format

by neels

Attention is currently required from: fixeria. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27509 ) Change subject: struct gsm_encr: store alg_id in human-readable format ...................................................................... Patch Set 2: Code-Review-1 (6 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/27509/comment/bf470c69_00486e0f PS2, Line 30: ciph_mod_set = (lchan->encr.alg_id << 1) | 1; well, in Cipher Mode Setting, it has to be (a5_n - 1) << 1 File include/osmocom/bsc/gsm_data.h: https://gerrit.osmocom.org/c/osmo-bsc/+/27509/comment/cea727ab_cb86df91 PS2, Line 613: uint8_t alg_id; alg_id is named after the Algorithm Identifier IE. I'd like to rename this member to 'a5_n' or 'alg_a5_n', because - we use alg_id in various places, e.g. osmo-msc uses it as N+1, and it also exists in libosmocore - to me 'a5_n' most clearly indicates which representation it is storing. - with a rename the patch shows every place in the code that uses this and we can easily verify that all of them are correct. File src/osmo-bsc/abis_rsl.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27509/comment/5e15b741_e994f735 PS2, Line 163: switch (*out++) { nitpick (ok, it's correct, but IMHO the code becomes far less head scratchy when we don't ++ inline in conditionals. i'd have put a local variable there / maybe do the switch on the human readable a5_n) https://gerrit.osmocom.org/c/osmo-bsc/+/27509/comment/542605d6_0f78c2f8 PS2, Line 663: if (lchan->encr.alg_id > 0) { (here is a place where i have to think twice, I thought it is incorrect at first; if the name were a5_n, it would have helped me here) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27509/comment/0617ceb0_a94f7a3d PS2, Line 596: _id "- 1" is missing now! 44.018 10.5.2.9 File src/osmo-bsc/gsm_08_08.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27509/comment/43598214_90ded639 PS2, Line 88: chosen_encr also rename this to chosen_a5_n? -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27509 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ieb50c9a352cfa5481aebac2379e0a461663543ec Gerrit-Change-Number: 27509 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:40:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bts[master]: osmo-bts-trx: do not run osmo_{fr,hr}_check_sid() on FACCH/U frames

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27429 ) Change subject: osmo-bts-trx: do not run osmo_{fr,hr}_check_sid() on FACCH/U frames ...................................................................... osmo-bts-trx: do not run osmo_{fr,hr}_check_sid() on FACCH/U frames It makes no sense to perform the SID codeword lookup in signalling frames (FACCH), because it can be present only in speech frames. Change-Id: I2f8137993acfe8a8add3fc2af276e5eb4da1605e Related: SYS#5853 --- M src/osmo-bts-trx/sched_lchan_tchf.c M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c b/src/osmo-bts-trx/sched_lchan_tchf.c index b100fab..1bf67a0 100644 --- a/src/osmo-bts-trx/sched_lchan_tchf.c +++ b/src/osmo-bts-trx/sched_lchan_tchf.c @@ -119,7 +119,7 @@ : tch_mode) { case GSM48_CMODE_SPEECH_V1: /* FR */ rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0, &n_errors, &n_bits_total); - if (rc >= 0) + if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */ lchan_set_marker(osmo_fr_check_sid(tch_data, rc), lchan); /* DTXu */ break; case GSM48_CMODE_SPEECH_EFR: /* EFR */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 51a0b90..27880c1 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -147,8 +147,8 @@ */ rc = gsm0503_tch_hr_decode(tch_data, *bursts_p, fn_is_odd, &n_errors, &n_bits_total); - if (rc >= 0) /* DTXu */ - lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan); + if (rc == (GSM_HR_BYTES + 1)) /* only for valid *speech* frames */ + lchan_set_marker(osmo_hr_check_sid(tch_data, rc), lchan); /* DTXu */ break; case GSM48_CMODE_SPEECH_AMR: /* AMR */ /* the first FN 0,8,17 or 1,9,18 defines that CMI is included -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27429 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I2f8137993acfe8a8add3fc2af276e5eb4da1605e Gerrit-Change-Number: 27429 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: BTS_Tests: fix some compilation warnings (template restrictions)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27494 ) Change subject: BTS_Tests: fix some compilation warnings (template restrictions) ...................................................................... BTS_Tests: fix some compilation warnings (template restrictions) Change-Id: I53286a7b4b78a3e816d94d880ae290771cdd7ee8 --- M bts/BTS_Tests.ttcn 1 file changed, 7 insertions(+), 9 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index eeb305f..1d3dfe7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -6258,7 +6258,6 @@ /* Verify periodic interference reports on PDCH */ testcase TC_pcu_interf_ind() runs on test_CT { var template PCUIF_Message tr_interf_ind; - var template PCUIF_interf ts_interf; var integer interf_ind_num := 0; var boolean first := true; var PCUIF_send_data sd; @@ -6277,12 +6276,11 @@ f_l1_tune(L1CTL); /* Expect -120 .. -90 dBm on TS7 of BTS0/TRX0 */ - ts_interf := { 0, 0, 0, 0, 0, 0, 0, (90..120) }; tr_interf_ind := tr_PCUIF_INTERF_IND( bts_nr := 0, trx_nr := 0, fn := ?, - interf := ts_interf + interf := { 0, 0, 0, 0, 0, 0, 0, (90..120) } ); T.start(0.480 * 1.5); @@ -7375,7 +7373,7 @@ } /* Verify RF RESource INDication messages (periodically sent over the RSL) */ -private function f_TC_rsl_rf_resource_ind(template RSL_ResourceInfo info) +private function f_TC_rsl_rf_resource_ind(template (present) RSL_ResourceInfo info) runs on test_CT { const IpaStreamId sid := IPAC_PROTO_RSL_TRX0; var ASP_RSL_Unitdata ud; @@ -8248,7 +8246,7 @@ f_init(); /* Verify lower and upper RxQual thresholds */ - var template TopTestCase top := { + var template (value) TopTestCase top := { bs_power := ts_RSL_IE_BS_Power(4), /* 4 x 2dB = 8dB */ top_cap := ts_RSL_IE_OSMO_TopAcchCap(4), /* 4dB */ steps := { @@ -8295,7 +8293,7 @@ f_init(); /* Verify handling of FULL and SUB values */ - var template TopTestCase top := { + var template (value) TopTestCase top := { bs_power := ts_RSL_IE_BS_Power(4), /* 4 x 2dB = 8dB */ top_cap := ts_RSL_IE_OSMO_TopAcchCap(4), /* 4dB */ steps := { @@ -8336,7 +8334,7 @@ f_init(); /* Overpower is always on, SACCH disabled */ - var template TopTestCase top := { + var template (value) TopTestCase top := { bs_power := ts_RSL_IE_BS_Power(4), /* 4 x 2dB = 8dB */ top_cap := ts_RSL_IE_OSMO_TopAcchCap(overpower := 4, /* 4dB */ rxqual := 0, /* always on */ @@ -8368,7 +8366,7 @@ f_init(); /* Overpower is always on, FACCH disabled */ - var template TopTestCase top := { + var template (value) TopTestCase top := { bs_power := ts_RSL_IE_BS_Power(4), /* 4 x 2dB = 8dB */ top_cap := ts_RSL_IE_OSMO_TopAcchCap(overpower := 4, /* 4dB */ rxqual := 0, /* always on */ @@ -8400,7 +8398,7 @@ f_init(); /* Overpower higher than current power reduction level (2dB) */ - var template TopTestCase top := { + var template (value) TopTestCase top := { bs_power := ts_RSL_IE_BS_Power(1), /* 1 x 2dB = 2dB */ top_cap := ts_RSL_IE_OSMO_TopAcchCap(overpower := 4, /* 4dB */ rxqual := 0 /* always on */), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27494 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: I53286a7b4b78a3e816d94d880ae290771cdd7ee8 Gerrit-Change-Number: 27494 Gerrit-PatchSet: 2 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

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27508 ) Change subject: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE ...................................................................... gsm48_make_ho_cmd(): optionally add Synchronization Indication IE Change-Id: I4e5b1163a71443d706f14ce4bfd5c2294c320432 Related: SYS#5838 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/handover_fsm.c 3 files changed, 16 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 75307d6..7d68fc8 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -27,7 +27,7 @@ const struct gsm48_multi_rate_conf *mr_conf, const struct amr_mode *modes, unsigned int num_modes); struct msgb *gsm48_make_ho_cmd(const struct gsm_lchan *new_lchan, - enum handover_scope ho_scope, + enum handover_scope ho_scope, bool async, uint8_t power_command, uint8_t ho_ref); int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, uint8_t power_command); int gsm48_send_rr_app_info(struct gsm_lchan *lchan, uint8_t apdu_id, uint8_t apdu_flags, diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index cf74118..368ad73 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -534,7 +534,7 @@ /* Chapter 9.1.15: Handover Command */ struct msgb *gsm48_make_ho_cmd(const struct gsm_lchan *new_lchan, - enum handover_scope ho_scope, + enum handover_scope ho_scope, bool async, uint8_t power_command, uint8_t ho_ref) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 HO CMD"); @@ -555,6 +555,19 @@ ho->ho_ref = ho_ref; ho->power_command = power_command; + /* Synchronization Indication, TV (see 3GPP TS 44.018, 9.1.15.1). + * In the case of inter-RAT handover, always include this IE for the sake of + * explicitness. In the case of intra-RAT handover, include this IE only for + * the synchronized handover. If omitted, non-synchronized handover is assumed. */ + if (!async || (ho_scope & HO_INTER_BSC_IN)) { + /* Only the SI field (Non-synchronized/Synchronized) is present. + * TODO: ROT (Report Observed Time Difference), currently 0. + * TODO: NCI (Normal cell indication), currently 0. */ + const uint8_t sync_ind = async ? 0x00 : 0x01; + /* T (4 bit) + V (4 bit), see 3GPP TS 44.018, 10.5.2.39 */ + msgb_v_put(msg, GSM48_IE_SYNC_IND | (sync_ind & 0x0f)); + } + if (new_lchan->ts->hopping.enabled) { struct gsm48_system_information_type_1 *si1; @@ -564,7 +577,6 @@ GSM48_HOCMD_CCHDESC_LEN, si1->cell_channel_description); } - /* FIXME: optional bits for type of synchronization? */ msgb_tv_put(msg, GSM48_IE_CHANMODE_1, new_lchan->current_ch_mode_rate.chan_mode); diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index b3f78c0..5ae3787 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1216,7 +1216,7 @@ struct handover *ho = &conn->ho; struct msgb *rr_ho_cmd = gsm48_make_ho_cmd(ho->new_lchan, - ho->scope, + ho->async, ho->scope, ho->new_lchan->ms_power, ho->ho_ref); if (!rr_ho_cmd) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4e5b1163a71443d706f14ce4bfd5c2294c320432 Gerrit-Change-Number: 27508 Gerrit-PatchSet: 2 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27507 ) Change subject: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE ...................................................................... gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE According to 3GPP TS 44.018, section 9.1.15, the RR Handover Command message may optionally contain the Cipher Mode Setting IE (10.5.2.9). Section 9.1.15.10 states that this IE may be omitted in case of the intra-RAT GERAN-to-GERAN handover, however in case of the inter-RAT handover (e.g. EUTRAN-to-GERAN), this IE *shall* always be included. Change-Id: I1d270e82d0a9b12897fc94dae4e8999aa132a22f Related: SYS#5838 --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/handover_fsm.c 3 files changed, 17 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve neels: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 613787d..75307d6 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -3,6 +3,8 @@ #include <stdint.h> #include <osmocom/core/msgb.h> +enum handover_scope; + struct amr_mode; struct amr_multirate_conf; struct bsc_subscr; @@ -25,6 +27,7 @@ const struct gsm48_multi_rate_conf *mr_conf, const struct amr_mode *modes, unsigned int num_modes); struct msgb *gsm48_make_ho_cmd(const struct gsm_lchan *new_lchan, + enum handover_scope ho_scope, uint8_t power_command, uint8_t ho_ref); int gsm48_send_rr_ass_cmd(struct gsm_lchan *dest_lchan, struct gsm_lchan *lchan, uint8_t power_command); int gsm48_send_rr_app_info(struct gsm_lchan *lchan, uint8_t apdu_id, uint8_t apdu_flags, diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 3f11e48..cf74118 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -534,6 +534,7 @@ /* Chapter 9.1.15: Handover Command */ struct msgb *gsm48_make_ho_cmd(const struct gsm_lchan *new_lchan, + enum handover_scope ho_scope, uint8_t power_command, uint8_t ho_ref) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 HO CMD"); @@ -574,6 +575,18 @@ new_lchan->ts->hopping.ma_data); } + /* (O) Cipher Mode Setting, TV (see 3GPP TS 44.018, 9.1.15.10). + * Omitted in the case of intra-RAT (GERAN-to-GERAN) handover. + * Shall be included in the case of inter-RAT handover. */ + if (ho_scope & HO_INTER_BSC_IN) { + uint8_t cms = 0x00; + /* This formula copied from gsm48_send_rr_ciph_mode() */ + if (new_lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) + cms = (new_lchan->encr.alg_id - 2) << 1 | 1; + /* T (4 bit) + V (4 bit), see 3GPP TS 44.018, 10.5.2.9 */ + msgb_v_put(msg, GSM48_IE_CIP_MODE_SET | (cms & 0x0f)); + } + /* in case of multi rate we need to attach a config */ if (gsm48_chan_mode_to_non_vamos(new_lchan->current_ch_mode_rate.chan_mode) == GSM48_CMODE_SPEECH_AMR) { if (put_mr_config_for_ms(msg, &new_lchan->current_mr_conf, diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index e957a96..b3f78c0 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1216,6 +1216,7 @@ struct handover *ho = &conn->ho; struct msgb *rr_ho_cmd = gsm48_make_ho_cmd(ho->new_lchan, + ho->scope, ho->new_lchan->ms_power, ho->ho_ref); if (!rr_ho_cmd) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d270e82d0a9b12897fc94dae4e8999aa132a22f Gerrit-Change-Number: 27507 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27507 ) Change subject: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE ...................................................................... Patch Set 1: Code-Review+2 (2 comments) Patchset: PS1: 1+1=2 File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27507/comment/938c9477_36a3ea80 PS1, Line 585: (new_lchan->encr.alg_id - 2) << 1 > for some reason i did not see that patch yet Because I forgot to submit it yesterday, and your comment reminded me about that :D -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d270e82d0a9b12897fc94dae4e8999aa132a22f Gerrit-Change-Number: 27507 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:28:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bts[master]: rsl: fix wrong IE being checked in rsl_rx_chan_activ()

by fixeria

Attention is currently required from: neels, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27486 ) Change subject: rsl: fix wrong IE being checked in rsl_rx_chan_activ() ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: > Didn't I already review this patch somewhere else? This is the original patch for master. There are two cherry-picks: * 2021q1: https://gerrit.osmocom.org/c/osmo-bts/+/27501 * 2021q4: https://gerrit.osmocom.org/c/osmo-bts/+/27502 P.S. Gerrit shows all these patches in 'Cherry picks' section on the right sidebar. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27486 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icd8ccfd6e37ded8966125a473b5003845ba87fec Gerrit-Change-Number: 27486 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:27:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27508 ) Change subject: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27508 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I4e5b1163a71443d706f14ce4bfd5c2294c320432 Gerrit-Change-Number: 27508 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:22:17 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE

by neels

Attention is currently required from: fixeria, pespin. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27507 ) Change subject: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE ...................................................................... Patch Set 1: (1 comment) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27507/comment/0ee28df9_8722ce11 PS1, Line 585: (new_lchan->encr.alg_id - 2) << 1 > Hi Neels, […] for some reason i did not see that patch yet -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27507 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1d270e82d0a9b12897fc94dae4e8999aa132a22f Gerrit-Change-Number: 27507 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:22:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: lib/DIAMETER: Allow sending CEA with AuthAppId

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 ) Change subject: lib/DIAMETER: Allow sending CEA with AuthAppId ...................................................................... lib/DIAMETER: Allow sending CEA with AuthAppId The new message is to be used by Gy interface emulation, which according to RFC4006 uses AppId 4 "Credit Control Application". The application is apparently not 3GPP vendor specific. Change-Id: I0e33673d65140aad34d2efcae3c7f49154ceb99f --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Emulation.ttcn M library/DIAMETER_Templates.ttcn M mme/MME_Tests.ttcn M pgw/PGW_Tests.ttcn 5 files changed, 47 insertions(+), 6 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 7a7ff97..203dcbf 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -210,6 +210,7 @@ local_sctp_port := PCRF_PORT, origin_host := "pcrf.localdomain", origin_realm := "localdomain", + auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; vc_Gx := DIAMETER_Emulation_CT.create(id); diff --git a/library/DIAMETER_Emulation.ttcn b/library/DIAMETER_Emulation.ttcn index e35a87a..73fc87c 100644 --- a/library/DIAMETER_Emulation.ttcn +++ b/library/DIAMETER_Emulation.ttcn @@ -111,7 +111,8 @@ PortNumber local_sctp_port, charstring origin_host, charstring origin_realm, - uint32_t vendor_app_id + uint32_t auth_app_id optional, + uint32_t vendor_app_id optional } function tr_DIAMETER_RecvFrom_R(template PDU_DIAMETER msg) @@ -329,8 +330,8 @@ /* handle CER/CEA handshake */ [] DIAMETER.receive(tr_DIAMETER_RecvFrom_R(tr_DIAMETER_R(cmd_code := Capabilities_Exchange))) -> value mrf { var template (value) PDU_DIAMETER resp; - resp := ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id, p.origin_host, - p.origin_realm, f_inet_addr(p.local_ip), p.vendor_app_id); + resp := f_ts_DIA_CEA(mrf.msg.hop_by_hop_id, mrf.msg.end_to_end_id, p.origin_host, + p.origin_realm, f_inet_addr(p.local_ip), p.auth_app_id, p.vendor_app_id); DIAMETER.send(t_DIAMETER_Send(g_diameter_conn_id, resp)); /* notify our user that the CER->CEA exchange has happened */ DIAMETER_UNIT.send(DiameterCapabilityExchgInd:{rx:=mrf.msg, tx:=valueof(resp)}); diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index b56363f..944dfd7 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -864,9 +864,31 @@ /* 5.3.2 Capabilities Exchange Answer */ template (value) PDU_DIAMETER -ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, - template (value) charstring origin_host, template (value) charstring origin_realm, - template (value) octetstring host_ip, uint32_t vendor_app_id) +ts_DIA_CEA_AUTH_APP_ID(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) charstring origin_host, + template (value) charstring origin_realm, + template (value) octetstring host_ip, uint32_t auth_app_id) +:= ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost(origin_host), + ts_AVP_OriginRealm(origin_realm), + ts_AVP_HostIpAddr(host_ip), + ts_AVP_VendorId(vendor_id_3GPP), + ts_AVP_ProductName("TTCN-3 Testsuite"), + ts_AVP_OriginStateId('00000001'O), + ts_AVP_SuppVendorIdRaw(5535), /* 3GPP2 */ + ts_AVP_SuppVendorId(vendor_id_3GPP), + ts_AVP_SuppVendorIdRaw(13019), /* ETSI */ + ts_AVP_AuthAppId('FFFFFFFF'O), + ts_AVP_AuthAppId(int2oct(auth_app_id, 4)), + ts_AVP_InbSecId('00000000'O) + }); +template (value) PDU_DIAMETER +ts_DIA_CEA_VENDOR_APP_ID(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) charstring origin_host, + template (value) charstring origin_realm, + template (value) octetstring host_ip, uint32_t vendor_app_id) := ts_DIAMETER(flags:='00000000'B, cmd_code:=Capabilities_Exchange, hbh_id:=hbh_id, ete_id:=ete_id, avps := { ts_AVP_ResultCode(DIAMETER_SUCCESS), @@ -883,6 +905,21 @@ ts_AVP_InbSecId('00000000'O), ts_AVP_VendorSpecAppId(vendor_id_3GPP, vendor_app_id) }); +function f_ts_DIA_CEA(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) charstring origin_host, + template (value) charstring origin_realm, + template (value) octetstring host_ip, template (omit) uint32_t auth_app_id, + template (omit) uint32_t vendor_app_id) + return template (value) PDU_DIAMETER +{ + var template (value) PDU_DIAMETER diam_pdu; + if (istemplatekind(vendor_app_id, "omit")) { + diam_pdu := ts_DIA_CEA_AUTH_APP_ID(hbh_id, ete_id, origin_host, origin_realm, host_ip, valueof(auth_app_id)); + } else { + diam_pdu := ts_DIA_CEA_VENDOR_APP_ID(hbh_id, ete_id, origin_host, origin_realm, host_ip, valueof(vendor_app_id)); + } + return diam_pdu; +} template (value) PDU_DIAMETER diff --git a/mme/MME_Tests.ttcn b/mme/MME_Tests.ttcn index 3c35359..14965e6 100644 --- a/mme/MME_Tests.ttcn +++ b/mme/MME_Tests.ttcn @@ -223,6 +223,7 @@ local_sctp_port := mp_s6_local_port, origin_host := "hss.localdomain", origin_realm := "localdomain", + auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_S6_AID }; vc_DIAMETER := DIAMETER_Emulation_CT.create(id); diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index 34090d2..d9f4979 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -126,6 +126,7 @@ local_sctp_port := mp_pcrf_local_port, origin_host := "pcrf.localdomain", origin_realm := "localdomain", + auth_app_id := omit, vendor_app_id := c_DIAMETER_3GPP_Gx_AID }; vc_DIAMETER := DIAMETER_Emulation_CT.create(id); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 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: I0e33673d65140aad34d2efcae3c7f49154ceb99f Gerrit-Change-Number: 27424 Gerrit-PatchSet: 4 Gerrit-Owner: pespin <pespin(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

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022