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

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

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 ) Change subject: lib/DIAMETER: Allow sending CEA with AuthAppId ...................................................................... Patch Set 4: Code-Review+2 -- 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:11:59 +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 Synchronization Indication IE

by fixeria

Attention is currently required from: neels, pespin. fixeria 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 1: (1 comment) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27508/comment/fece5c93_a50b1f3f PS1, Line 562: if (!async || ho_scope & HO_INTER_BSC_IN) { > The last sentence "If ommited, ..." is not really clear imho, what is omitted? The whole paragraph/comment is about optional Synchronization Indication IE, so it applies to this IE. There is nothing else that can be omitted in this context. > ack: please parenthesis around the & operation Done. -- 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: 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:10:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> 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]: struct gsm_encr: store alg_id in human-readable format

by pespin

Attention is currently required from: fixeria. pespin 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 -- 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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:09:47 +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 Synchronization Indication IE

by fixeria

Attention is currently required from: pespin, fixeria. Hello Jenkins Builder, neels, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27508 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/08/27508/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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

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

by pespin

Attention is currently required from: pespin. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27424 to look at the new patch set (#4). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/24/27424/4 -- 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: laforge <laforge(a)osmocom.org> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_make_ho_cmd(): make 'struct gsm_lchan' pointer const

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27506 ) Change subject: gsm48_make_ho_cmd(): make 'struct gsm_lchan' pointer const ...................................................................... gsm48_make_ho_cmd(): make 'struct gsm_lchan' pointer const Change-Id: I731179bf7f5d711ca114e36af661faccf0caa19f --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 5 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: 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 d4617ae..613787d 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -24,7 +24,8 @@ int gsm48_multirate_config(struct msgb *msg, const struct gsm48_multi_rate_conf *mr_conf, const struct amr_mode *modes, unsigned int num_modes); -struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); +struct msgb *gsm48_make_ho_cmd(const struct gsm_lchan *new_lchan, + 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, const uint8_t *apdu_data, ssize_t apdu_data_len); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 53953e9..3f11e48 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -533,13 +533,14 @@ #define GSM48_HOCMD_CCHDESC_LEN 16 /* Chapter 9.1.15: Handover Command */ -struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref) +struct msgb *gsm48_make_ho_cmd(const struct gsm_lchan *new_lchan, + uint8_t power_command, uint8_t ho_ref) { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 HO CMD"); struct gsm48_hdr *gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh)); struct gsm48_ho_cmd *ho = (struct gsm48_ho_cmd *) msgb_put(msg, sizeof(*ho)); - struct gsm_bts *bts = new_lchan->ts->trx->bts; + const struct gsm_bts *bts = new_lchan->ts->trx->bts; gh->proto_discr = GSM48_PDISC_RR; gh->msg_type = GSM48_MT_RR_HANDO_CMD; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27506 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I731179bf7f5d711ca114e36af661faccf0caa19f Gerrit-Change-Number: 27506 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

3 years, 3 months

1
0
0 0

Change in osmo-bsc[master]: gsm48_send_ho_cmd(): this function is not used, remove it

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27504 ) Change subject: gsm48_send_ho_cmd(): this function is not used, remove it ...................................................................... gsm48_send_ho_cmd(): this function is not used, remove it Change-Id: I9771d7e1f2073ebf6d900c067885485e54790bca --- M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/gsm_04_08_rr.c 2 files changed, 0 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 1f50ef9..d4617ae 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -25,8 +25,6 @@ const struct gsm48_multi_rate_conf *mr_conf, const struct amr_mode *modes, unsigned int num_modes); struct msgb *gsm48_make_ho_cmd(struct gsm_lchan *new_lchan, uint8_t power_command, uint8_t ho_ref); -int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, - 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, const uint8_t *apdu_data, ssize_t apdu_data_len); diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 03b1e98..472e81f 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -587,16 +587,6 @@ return msg; } -int gsm48_send_ho_cmd(struct gsm_lchan *old_lchan, struct gsm_lchan *new_lchan, - uint8_t power_command, uint8_t ho_ref) -{ - struct msgb *msg = gsm48_make_ho_cmd(new_lchan, power_command, ho_ref); - if (!msg) - return -EINVAL; - msg->lchan = old_lchan; - return gsm48_sendmsg(msg); -} - /* Chapter 9.1.2: Assignment Command */ int gsm48_send_rr_ass_cmd(struct gsm_lchan *current_lchan, struct gsm_lchan *new_lchan, uint8_t power_command) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27504 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9771d7e1f2073ebf6d900c067885485e54790bca Gerrit-Change-Number: 27504 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(): cosmetic: use existing BTS pointer

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27505 ) Change subject: gsm48_make_ho_cmd(): cosmetic: use existing BTS pointer ...................................................................... gsm48_make_ho_cmd(): cosmetic: use existing BTS pointer Change-Id: I98abe2e43af1f8fa7e70fcf7155478b39751fced --- M src/osmo-bsc/gsm_04_08_rr.c 1 file changed, 1 insertion(+), 2 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved neels: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 472e81f..53953e9 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -545,7 +545,7 @@ gh->msg_type = GSM48_MT_RR_HANDO_CMD; /* mandatory bits */ - gsm48_cell_desc(&ho->cell_desc, new_lchan->ts->trx->bts); + gsm48_cell_desc(&ho->cell_desc, bts); if (gsm48_lchan2chan_desc(&ho->chan_desc, new_lchan, gsm_ts_tsc(new_lchan->ts), false)) { msgb_free(msg); return NULL; @@ -554,7 +554,6 @@ ho->power_command = power_command; if (new_lchan->ts->hopping.enabled) { - struct gsm_bts *bts = new_lchan->ts->trx->bts; struct gsm48_system_information_type_1 *si1; si1 = GSM_BTS_SI(bts, SYSINFO_TYPE_1); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27505 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I98abe2e43af1f8fa7e70fcf7155478b39751fced Gerrit-Change-Number: 27505 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-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: (2 comments) File src/osmo-bsc/gsm_04_08_rr.c: https://gerrit.osmocom.org/c/osmo-bsc/+/27507/comment/e0dddade_7544a434 PS1, Line 584: if (new_lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) > Looks like we want this stuff as "lchan_get_cms()" put somewhere and reuse here and gsm48_send_rr_ci […] This calculation is performed only two times, and both in this file. I hope after my https://gerrit.osmocom.org/c/osmo-bsc/+/27509 is merged, the formula gets cleaner and easier to read. https://gerrit.osmocom.org/c/osmo-bsc/+/27507/comment/dd91f366_c86d545d PS1, Line 585: (new_lchan->encr.alg_id - 2) << 1 Hi Neels, > If I were to write this from scratch, I'd have rather stored the plain A5/n number in encr.alg_id (as encr.alg_a5). Since we have alg_id around everywhere already, I think it would be nice to have a macro like ALG_A5_NR_TO_RSL() or a seprate function to explicitly show the intended conversion. This is exactly why I submitted: https://gerrit.osmocom.org/c/osmo-bsc/+/27509 because it's so confusing that we store it in the RSL specific format, and then print it as-is in some logging statements without any conversion... -- 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: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 14 Mar 2022 11:04:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> 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]: struct gsm_encr: store alg_id in human-readable format

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27509 ) Change subject: struct gsm_encr: store alg_id in human-readable format ...................................................................... struct gsm_encr: store alg_id in human-readable format I find it weird that we store the A5 algorithm ID in a format that is used on the wire: N + 1 (valid for both A-bis and A interfaces). What confused me even more is that in some functions we print it as if it was in a normal, human-readable format. And this is also why one can see weird constructions like: if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) ciph_mod_set = (lchan->encr.alg_id-2)<<1 | 1; Let's ensure that our internal structures use the A5/N format: alg_id=0: A5/0 (0x01 on the A-bis/A interface) alg_id=1: A5/1 (0x02 on the A-bis/A interface) alg_id=2: A5/2 (0x03 on the A-bis/A interface) ... alg_id=7: A5/7 (0x08 on the A-bis/A interface) so that we can print and compare the value alg_id without using additional arithmetics. This is how the above snippet changes: if (lchan->encr.alg_id > 0) ciph_mod_set = (lchan->encr.alg_id << 1) | 1; Change-Id: Ieb50c9a352cfa5481aebac2379e0a461663543ec --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/assignment_fsm.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/handover_fsm.c M src/osmo-bsc/lchan_fsm.c M src/osmo-bsc/osmo_bsc_bssap.c 8 files changed, 19 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/09/27509/1 diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4fe97a2..434af5f 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -546,6 +546,7 @@ * These macros convert from n to the other representations: */ #define ALG_A5_NR_TO_RSL(A5_N) ((A5_N) >= 0 ? (A5_N)+1 : 0) +#define ALG_A5_NR_TO_BSSAP(A5_N) ALG_A5_NR_TO_RSL(A5_N) #define ALG_A5_NR_TO_PERM_ALG_BITS(A5_N) ((A5_N) >= 0 ? 1<<(A5_N) : 0) /* Up to 16 SI2quater are multiplexed; each fits 3 EARFCNS, so the practical maximum is 3*16. @@ -608,6 +609,7 @@ #define MAX_A5_KEY_LEN (128/8) struct gsm_encr { + /* Human readable: 0 (A5/0), 1 (A5/1), ... 7 (A5/7) */ uint8_t alg_id; uint8_t key_len; uint8_t key[MAX_A5_KEY_LEN]; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index a49cc65..b367149 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -159,8 +159,8 @@ * 'out' must provide room for 17 bytes. */ static int build_encr_info(uint8_t *out, struct gsm_lchan *lchan) { - *out++ = lchan->encr.alg_id & 0xff; - switch (lchan->encr.alg_id) { + *out = ALG_A5_NR_TO_RSL(lchan->encr.alg_id); + switch (*out++) { case GSM0808_ALG_ID_A5_1: case GSM0808_ALG_ID_A5_2: case GSM0808_ALG_ID_A5_3: @@ -660,7 +660,7 @@ msg->l3h = len + 1; *len = msgb_l3len(msg); - if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { + if (lchan->encr.alg_id > 0) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) @@ -764,7 +764,7 @@ msgb_tlv_put(msg, RSL_IE_CHAN_MODE, sizeof(cm), (uint8_t *) &cm); - if (lchan->encr.alg_id > ALG_A5_NR_TO_RSL(0)) { + if (lchan->encr.alg_id > 0) { uint8_t encr_info[MAX_A5_KEY_LEN+2]; rc = build_encr_info(encr_info, lchan); if (rc > 0) diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c index 0243058..2b8b8b0 100644 --- a/src/osmo-bsc/assignment_fsm.c +++ b/src/osmo-bsc/assignment_fsm.c @@ -226,7 +226,7 @@ resp = gsm0808_create_ass_compl2(lchan->abis_ip.ass_compl.rr_cause, chosen_channel, - lchan->encr.alg_id, perm_spch, + ALG_A5_NR_TO_BSSAP(lchan->encr.alg_id), perm_spch, addr_local_p, sc_ptr, NULL, lcls_get_status(conn)); if (!resp) { diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 560eb16..2232762 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -374,10 +374,10 @@ DEBUGP(DRR, "TX CIPHERING MODE CMD\n"); - if (lchan->encr.alg_id <= ALG_A5_NR_TO_RSL(0)) - ciph_mod_set = 0; + if (lchan->encr.alg_id > 0) + ciph_mod_set = (lchan->encr.alg_id << 1) | 0x01; else - ciph_mod_set = (lchan->encr.alg_id-2)<<1 | 1; + ciph_mod_set = 0x00; gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1); gh->proto_discr = GSM48_PDISC_RR; @@ -592,9 +592,8 @@ * 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; + if (new_lchan->encr.alg_id > 0) + cms = (new_lchan->encr.alg_id << 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)); } diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index a99db43..ad64a9c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -94,7 +94,7 @@ return; LOGP(DMSC, LOGL_DEBUG, "CIPHER MODE COMPLETE from MS, forwarding to MSC\n"); - resp = gsm0808_create_cipher_complete(msg, chosen_encr); + resp = gsm0808_create_cipher_complete(msg, ALG_A5_NR_TO_BSSAP(chosen_encr)); rate_ctr_inc(rate_ctr_group_get_ctr(conn->sccp.msc->msc_ctrs, MSC_CTR_BSSMAP_TX_DT1_CIPHER_COMPLETE)); rc = osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_TX_SCCP, resp); if (rc != 0) diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index 5ae3787..6a12d04 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -756,7 +756,7 @@ } /* Put encryption info in the chan activation info */ - info.encr.alg_id = ALG_A5_NR_TO_RSL(chosen_a5_n); + info.encr.alg_id = chosen_a5_n; if (chosen_a5_n > 0) { if (req->ei.key_len > sizeof(info.encr.key)) { ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u", @@ -933,7 +933,7 @@ ho_perf_params.chosen_channel_present = true; /* Chosen Encryption Algorithm 3.2.2.44 */ - ho_perf_params.chosen_encr_alg = lchan->encr.alg_id; + ho_perf_params.chosen_encr_alg = ALG_A5_NR_TO_BSSAP(lchan->encr.alg_id); ho_perf_params.chosen_encr_alg_present = true; if (ho->new_lchan->activate.info.requires_voice_stream) { diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 84f8dc5..3a87d42 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -750,7 +750,7 @@ : "none", gsm_lchant_name(lchan->type), gsm48_chan_mode_name(lchan->activate.ch_mode_rate.chan_mode), - (lchan->activate.info.encr.alg_id ? : 1)-1, + lchan->activate.info.encr.alg_id, lchan->activate.info.encr.key_len ? osmo_hexdump_nospc(lchan->activate.info.encr.key, lchan->activate.info.encr.key_len) : "none"); diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index df22a09..ed0b7b8 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -532,7 +532,7 @@ goto reject; } - conn->lchan->encr.alg_id = ALG_A5_NR_TO_RSL(chosen_cipher); + conn->lchan->encr.alg_id = chosen_cipher; if (enc_key_len) { conn->lchan->encr.key_len = enc_key_len; memcpy(conn->lchan->encr.key, enc_key, enc_key_len); @@ -1436,7 +1436,7 @@ .l3_info_len = rr_ho_command->len, .chosen_channel_present = true, .chosen_channel = gsm0808_chosen_channel(new_lchan->type, new_lchan->current_ch_mode_rate.chan_mode), - .chosen_encr_alg = new_lchan->encr.alg_id, + .chosen_encr_alg = ALG_A5_NR_TO_BSSAP(new_lchan->encr.alg_id), .chosen_speech_version = gsm0808_permitted_speech(new_lchan->type, new_lchan->current_ch_mode_rate.chan_mode), }; @@ -1506,7 +1506,7 @@ struct gsm0808_handover_complete params = { .chosen_encr_alg_present = true, - .chosen_encr_alg = lchan->encr.alg_id, + .chosen_encr_alg = ALG_A5_NR_TO_BSSAP(lchan->encr.alg_id), .chosen_channel_present = true, .chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->current_ch_mode_rate.chan_mode), -- 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: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022