- gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure
by pespin 30 Mar '22

30 Mar '22

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 ) Change subject: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 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: I124a69c515d634bc054ed35e430af6b3c11ad46e Gerrit-Change-Number: 27594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 29 Mar 2022 13:20:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: vty: Support platforms that don't support pthread_getname_np()
by laforge 29 Mar '22

29 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27591 ) Change subject: vty: Support platforms that don't support pthread_getname_np() ...................................................................... vty: Support platforms that don't support pthread_getname_np() pthread_getname_np() is a non-portable extension of pthreads. While it exists in glibc, for example musl didn't have it until rather recently (April 2021) and there still hasn't yet been a musl release with this change, resulting even current OpenWRT not yet supporting pthread_getname_np. So let's check if pthread_getname_np is supported, and only use it in that case. Change-Id: Ibd01485af24e2fe574006f8d049bf37226dda966 --- M configure.ac M src/vty/cpu_sched_vty.c 2 files changed, 22 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved; Verified Jenkins Builder: Verified diff --git a/configure.ac b/configure.ac index 0210926..990d0e7 100644 --- a/configure.ac +++ b/configure.ac @@ -78,6 +78,24 @@ # check for pthread (PTHREAD_CFLAGS, PTHREAD_LIBS) AX_PTHREAD +AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t)) +saved_CFLAGS="$CFLAGS" +saved_LIBS="$LIBS" +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +LIBS="$LIBS $PTHREAD_LIBS" +AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [#define _GNU_SOURCE + #include <pthread.h>], + [pthread_getname_np(pthread_self(),"example",0)])], + [AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_PTHREAD_GETNAME_NP,1, + [Have function pthread_setname_np(const char*)])], + [AC_MSG_RESULT(no)]) +CFLAGS="$saved_CFLAGS" +LIBS="$saved_LIBS" + + # check for old glibc < 2.17 to get clock_gettime AC_SEARCH_LIBS([clock_gettime], [rt posix4], [AC_DEFINE(HAVE_CLOCK_GETTIME, 1, [Define if clock_gettime is available]) diff --git a/src/vty/cpu_sched_vty.c b/src/vty/cpu_sched_vty.c index 0b4b249..dbb3cd5 100644 --- a/src/vty/cpu_sched_vty.c +++ b/src/vty/cpu_sched_vty.c @@ -25,6 +25,8 @@ #define _GNU_SOURCE +#include "../../config.h" + #include <string.h> #include <stdlib.h> #include <errno.h> @@ -637,8 +639,10 @@ return 0; } +#ifdef HAVE_PTHREAD_GETNAME_NP if (pthread_getname_np(pthread_self(), name, sizeof(name)) == 0) has_name = true; +#endif /* Get latest matching mask for the thread */ pthread_mutex_lock(&sched_vty_opts->cpu_affinity_li_mutex); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd01485af24e2fe574006f8d049bf37226dda966 Gerrit-Change-Number: 27591 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: vty: Support platforms that don't support pthread_getname_np()
by laforge 29 Mar '22

29 Mar '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27591 ) Change subject: vty: Support platforms that don't support pthread_getname_np() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27591 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibd01485af24e2fe574006f8d049bf37226dda966 Gerrit-Change-Number: 27591 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:57:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: configure: Support libsctp < 1.0.17 without libsctp.pc
by laforge 29 Mar '22

29 Mar '22

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27598 ) Change subject: configure: Support libsctp < 1.0.17 without libsctp.pc ...................................................................... Patch Set 1: (1 comment) File libosmocore.pc.in: https://gerrit.osmocom.org/c/libosmocore/+/27598/comment/1dd72c1f_b36904b8 PS1, Line 10: Requires.private: @LIBSCTP_PC@ > with this approach if the .pc is found it ends up looking like this: […] Ack -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 Gerrit-Change-Number: 27598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:57:44 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in libosmocore[master]: configure: Support libsctp < 1.0.17 without libsctp.pc
by laforge 29 Mar '22

29 Mar '22

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27598 ) Change subject: configure: Support libsctp < 1.0.17 without libsctp.pc ...................................................................... configure: Support libsctp < 1.0.17 without libsctp.pc libsctp 1.0.17 is the first to contain a pkgconfig file in upstream. Current OpenSure Leap 15.3 as well as our OpenEmbedded meta-telephony layer still ship 1.0.16 which contain no pkgconfig file. Let's attempt first finding the .pc file, and otherwise manually link against the lib. Related: https://bugzilla.opensuse.org/show_bug.cgi?id=1197590 Related: https://build.opensuse.org/request/show/965348 Fixes: 12eed19066a11aece6f346b54b85326bc6ba7f0b Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 --- M configure.ac M libosmocore.pc.in 2 files changed, 18 insertions(+), 12 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/configure.ac b/configure.ac index 89615fd..0210926 100644 --- a/configure.ac +++ b/configure.ac @@ -223,16 +223,22 @@ [ENABLE_LIBSCTP=$enableval], [ENABLE_LIBSCTP="yes"]) AM_CONDITIONAL(ENABLE_LIBSCTP, test x"$ENABLE_LIBSCTP" = x"yes") AS_IF([test "x$ENABLE_LIBSCTP" = "xyes"], [ - old_LIBS=$LIBS - AC_SEARCH_LIBS([sctp_bindx], [sctp], [ - AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) - AC_SUBST(HAVE_LIBSCTP, [1]) - if test -n "$ac_lib"; then - AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) - fi - ], [ - AC_MSG_ERROR([sctp_bindx not found in searched libs])]) - LIBS=$old_LIBS + AC_DEFINE(HAVE_LIBSCTP, 1, [Define 1 to enable SCTP support]) + # Attempt finding .pc, otherwise set manually (<1.0.17 have no .pc file) + PKG_CHECK_MODULES(LIBSCTP, libsctp, + [AC_SUBST(LIBSCTP_PC, [libsctp])], + [ + AC_MSG_NOTICE([libsctp.pc not found (building against <1.0.17 ?), attempting manual lib lookup]) + old_LIBS=$LIBS + AC_SEARCH_LIBS([sctp_bindx], [sctp], [ + AC_SUBST(HAVE_LIBSCTP, [1]) + if test -n "$ac_lib"; then + AC_SUBST(LIBSCTP_LIBS, [-l$ac_lib]) + fi + ], [ + AC_MSG_ERROR([sctp_bindx not found in searched libs])]) + LIBS=$old_LIBS + ]) ]) AC_ARG_ENABLE([sctp-tests], [AS_HELP_STRING([--disable-sctp-tests], [Do not run socket tests requiring system SCTP support])], diff --git a/libosmocore.pc.in b/libosmocore.pc.in index 6296417..d804b8e 100644 --- a/libosmocore.pc.in +++ b/libosmocore.pc.in @@ -7,7 +7,7 @@ Description: C Utility Library Version: @VERSION@ Requires: talloc -Requires.private: libsctp +Requires.private: @LIBSCTP_PC@ Libs: -L${libdir} -losmocore -Libs.private: @PTHREAD_LIBS@ +Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@ Cflags: -I${includedir}/ @PTHREAD_CFLAGS@ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 Gerrit-Change-Number: 27598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

Change in libosmocore[master]: configure: Support libsctp < 1.0.17 without libsctp.pc
by laforge 29 Mar '22

29 Mar '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27598 ) Change subject: configure: Support libsctp < 1.0.17 without libsctp.pc ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27598 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I241634388c2d32adffebd860c88bdd13002a6af0 Gerrit-Change-Number: 27598 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:57:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-ttcn3-hacks[master]: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure
by laforge 29 Mar '22

29 Mar '22

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 ) Change subject: bsc: Add tests for CBSP MESSAGE STATUS QUERY procedure ...................................................................... Patch Set 1: (1 comment) File library/CBSP_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594/comment/85c58f1d_a314… PS1, Line 713: function ts_CBSP_MSG_STATUS_QUERY_FAIL(template (value) uint16_t msg_id, template (value) uint16_t old_ser_nr, > we usually have f_ts_* and f_tr_* for functions like this. As far as I coudl see, not in this file; I always try to align with the surrounding code. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27594 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: I124a69c515d634bc054ed35e430af6b3c11ad46e Gerrit-Change-Number: 27594 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:55:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: hodec2: add penalty-time low-rxqual-ho
by pespin 29 Mar '22

29 Mar '22

Attention is currently required from: neels. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27596 ) Change subject: hodec2: add penalty-time low-rxqual-ho ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 Gerrit-Change-Number: 27596 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 29 Mar 2022 12:19:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in osmo-bsc[master]: hodec2: add penalty-time low-rxqual-ho
by neels 29 Mar '22

29 Mar '22

Attention is currently required from: neels. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/27596 to look at the new patch set (#3). Change subject: hodec2: add penalty-time low-rxqual-ho ...................................................................... hodec2: add penalty-time low-rxqual-ho When bad RxQual causes handover to a cell with weaker RxLev, then handover oscillation *will* happen, as shown in test_rxqual.ho_vty. Introduce a penalty timer for a cell where we had bad RxQual. This delays handover back to the cell with stronger RxLev by the penalty timeout; hopefully the interference is gone after the timeout. Usually, we set new configuration elements so that osmo-bsc behaves the same as before the config item was added. In this instance, this makes no sense, because no-one ever wants handover oscillation from bad RxQual, which is guaranteed to happen without the new penalty timer. Set it to 60 seconds by default, same as other penalty timers. Related: SYS#5911 Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 --- M include/osmocom/bsc/handover_cfg.h M src/osmo-bsc/handover_decision_2.c M tests/handover/test_rxqual.ho_vty M tests/handover_cfg.vty 4 files changed, 44 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/96/27596/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I057b156604a104a26a7ce45d1c7adadbf452c932 Gerrit-Change-Number: 27596 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

Change in osmo-bsc[master]: struct gsm_encr: store alg_id in human-readable format
by fixeria 29 Mar '22

29 Mar '22

fixeria has submitted this change. ( 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)) { ... } 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 of alg_id without using additional arithmetics. Let's also rename 'alg_id' to 'alg_a5_n' as it most clearly indicates which representation it is storing. This is how the above code snippet would look like: if (lchan->encr.alg_a5_n > 0) { ... } Change-Id: Ieb50c9a352cfa5481aebac2379e0a461663543ec --- M include/osmocom/bsc/gsm_08_08.h 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 M tests/handover/handover_test.c 10 files changed, 27 insertions(+), 29 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve neels: Looks good to me, approved Jenkins Builder: Verified diff --git a/include/osmocom/bsc/gsm_08_08.h b/include/osmocom/bsc/gsm_08_08.h index da5e2f1..07f0821 100644 --- a/include/osmocom/bsc/gsm_08_08.h +++ b/include/osmocom/bsc/gsm_08_08.h @@ -7,7 +7,7 @@ struct gsm_subscriber_connection; void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause); -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr); +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_a5_n); int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel); void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg); void bsc_cm_update(struct gsm_subscriber_connection *conn, diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 4fe97a2..fcd8883 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,7 +609,7 @@ #define MAX_A5_KEY_LEN (128/8) struct gsm_encr { - uint8_t alg_id; + uint8_t alg_a5_n; /* N: 0 (A5/0), 1 (A5/1), ... 7 (A5/7) */ uint8_t key_len; uint8_t key[MAX_A5_KEY_LEN]; bool kc128_present; diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index a49cc65..6681875 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -159,13 +159,13 @@ * '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[0] = ALG_A5_NR_TO_RSL(lchan->encr.alg_a5_n); + switch (out[0]) { case GSM0808_ALG_ID_A5_1: case GSM0808_ALG_ID_A5_2: case GSM0808_ALG_ID_A5_3: if (!lchan->encr.key_len) { - LOG_LCHAN(lchan, LOGL_ERROR, "A5/%d encryption chosen, but missing Kc\n", lchan->encr.alg_id); + LOG_LCHAN(lchan, LOGL_ERROR, "A5/%d encryption chosen, but missing Kc\n", lchan->encr.alg_a5_n); return -EINVAL; } /* fall through */ @@ -177,7 +177,7 @@ * even for A5/0. Currently our ttcn3 test suite does expect the key to be present also for A5/0, see * f_cipher_mode() in bsc/MSC_ConnectionHandler.ttcn. */ if (lchan->encr.key_len) - memcpy(out, lchan->encr.key, lchan->encr.key_len); + memcpy(&out[1], lchan->encr.key, lchan->encr.key_len); return 1 + lchan->encr.key_len; case GSM0808_ALG_ID_A5_4: @@ -185,11 +185,11 @@ LOG_LCHAN(lchan, LOGL_ERROR, "A5/4 encryption chosen, but missing Kc128\n"); return -EINVAL; } - memcpy(out, lchan->encr.kc128, sizeof(lchan->encr.kc128)); + memcpy(&out[1], lchan->encr.kc128, sizeof(lchan->encr.kc128)); return 1 + sizeof(lchan->encr.kc128); default: - LOG_LCHAN(lchan, LOGL_ERROR, "A5/%d encryption not supported\n", lchan->encr.alg_id); + LOG_LCHAN(lchan, LOGL_ERROR, "A5/%d encryption not supported\n", lchan->encr.alg_a5_n); return -EINVAL; } } @@ -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_a5_n > 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_a5_n > 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..8d5e841 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_a5_n), 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 368ad73..d1d61d6 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -368,16 +368,14 @@ { struct msgb *msg = gsm48_msgb_alloc_name("GSM 04.08 CIPH"); struct gsm48_hdr *gh; - uint8_t ciph_mod_set; + uint8_t ciph_mod_set = 0x00; msg->lchan = lchan; DEBUGP(DRR, "TX CIPHERING MODE CMD\n"); - if (lchan->encr.alg_id <= ALG_A5_NR_TO_RSL(0)) - ciph_mod_set = 0; - else - ciph_mod_set = (lchan->encr.alg_id-2)<<1 | 1; + if (lchan->encr.alg_a5_n > 0) + ciph_mod_set = (lchan->encr.alg_a5_n - 1) << 1 | 0x01; gh = (struct gsm48_hdr *) msgb_put(msg, sizeof(*gh) + 1); gh->proto_discr = GSM48_PDISC_RR; @@ -592,9 +590,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_a5_n > 0) + cms = (new_lchan->encr.alg_a5_n - 1) << 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)); } @@ -1014,7 +1011,7 @@ osmo_fsm_inst_dispatch(conn->ho.fi, HO_EV_RR_HO_FAIL, msg); break; case GSM48_MT_RR_CIPH_M_COMPL: - bsc_cipher_mode_compl(conn, msg, conn->lchan->encr.alg_id); + bsc_cipher_mode_compl(conn, msg, conn->lchan->encr.alg_a5_n); break; case GSM48_MT_RR_ASS_COMPL: if (conn->assignment.fi) diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index a99db43..6d6f57c 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -85,7 +85,7 @@ } /*! MS->MSC: Tell MSC that ciphering has been enabled. */ -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_a5_n) { int rc; struct msgb *resp; @@ -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_a5_n)); 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 488f370..a4221c4 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_a5_n = 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_a5_n); 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..00bb605 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_a5_n, 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..7f8c8a1 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_a5_n = 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_a5_n), .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_a5_n), .chosen_channel_present = true, .chosen_channel = gsm0808_chosen_channel(lchan->type, lchan->current_ch_mode_rate.chan_mode), diff --git a/tests/handover/handover_test.c b/tests/handover/handover_test.c index dd2f16a..c01b6ee 100644 --- a/tests/handover/handover_test.c +++ b/tests/handover/handover_test.c @@ -1685,7 +1685,7 @@ /* Stub */ int osmo_bsc_sigtran_open_conn(struct gsm_subscriber_connection *conn, struct msgb *msg) { return 0; } void bsc_sapi_n_reject(struct gsm_subscriber_connection *conn, uint8_t dlci, enum gsm0808_cause cause) {} -void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_encr) {} +void bsc_cipher_mode_compl(struct gsm_subscriber_connection *conn, struct msgb *msg, uint8_t chosen_a5_n) {} int bsc_compl_l3(struct gsm_lchan *lchan, struct msgb *msg, uint16_t chosen_channel) { return 0; } void bsc_dtap(struct gsm_subscriber_connection *conn, uint8_t link_id, struct msgb *msg) {} -- 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: 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-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log