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

Change in libosmocore[master]: clean-up pkg-config files: Make use of "Requires" as documented

by pespin

Attention is currently required from: laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27521 ) Change subject: clean-up pkg-config files: Make use of "Requires" as documented ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b Gerrit-Change-Number: 27521 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: Wed, 16 Mar 2022 13:44:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: clean-up pkg-config files: Make use of "Requires" as documented

by laforge

laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27521 ) Change subject: clean-up pkg-config files: Make use of "Requires" as documented ...................................................................... Patch Set 1: (1 comment) Patchset: PS1: I built this change on Centos8, Debian9 and debian unstable, and subsequently I was still able to build osmocom applications via autoconf/pkg-config without any regression. That doesn't mean it might not cause buildfailures somewhere, but fundamentally this is the right kind of change to do. I am hoping this will also resolve some build failures I'm seeing on OpenWRT with current osmo* master. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b Gerrit-Change-Number: 27521 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 16 Mar 2022 13:37:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

Change in libosmocore[master]: clean-up pkg-config files: Make use of "Requires" as documented

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/27521 ) Change subject: clean-up pkg-config files: Make use of "Requires" as documented ...................................................................... clean-up pkg-config files: Make use of "Requires" as documented According to the pkg-config manual, "Libs" should not contain flags for _required_ packages. Instead, they should be expressed via "Requires". Let's do that Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b --- M libosmocodec.pc.in M libosmocoding.pc.in M libosmocore.pc.in M libosmoctrl.pc.in M libosmogb.pc.in M libosmogsm.pc.in M libosmosim.pc.in M libosmousb.pc.in M libosmovty.pc.in 9 files changed, 22 insertions(+), 21 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/21/27521/1 diff --git a/libosmocodec.pc.in b/libosmocodec.pc.in index 9e058ef..0c4de8d 100644 --- a/libosmocodec.pc.in +++ b/libosmocodec.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Codec related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocodec -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ - +Requires: talloc, libosmocore +Libs: -L${libdir} -losmocodec +Cflags: -I${includedir}/ diff --git a/libosmocoding.pc.in b/libosmocoding.pc.in index d1d03c4..5b91a60 100644 --- a/libosmocoding.pc.in +++ b/libosmocoding.pc.in @@ -6,6 +6,6 @@ Name: Osmocom L1 transcoding Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocoding -losmocodec -losmogsm -losmocore -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ - +Requires: talloc, libosmocore, libosmogsm, libosmocodec +Libs: -L${libdir} -losmocoding +Cflags: -I${includedir}/ diff --git a/libosmocore.pc.in b/libosmocore.pc.in index 80f17c8..3bb9b9a 100644 --- a/libosmocore.pc.in +++ b/libosmocore.pc.in @@ -6,6 +6,7 @@ Name: Osmocom Core Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmocore -Libs.private: @PTHREAD_LIBS@ @LIBSCTP_LIBS@ -Cflags: -I${includedir}/ @TALLOC_CFLAGS@ @PTHREAD_CFLAGS@ +Requires: talloc, libsctp +Libs: -L${libdir} -losmocore +Libs.private: @PTHREAD_LIBS@ +Cflags: -I${includedir}/ @PTHREAD_CFLAGS@ diff --git a/libosmoctrl.pc.in b/libosmoctrl.pc.in index 4676b31..e9947dc 100644 --- a/libosmoctrl.pc.in +++ b/libosmoctrl.pc.in @@ -6,6 +6,6 @@ Name: Osmocom Control Interface Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmoctrl -losmogsm -losmocore +Requires: talloc, libosmocore, libosmogsm +Libs: -L${libdir} -losmoctrl Cflags: -I${includedir}/ - diff --git a/libosmogb.pc.in b/libosmogb.pc.in index a163cc4..d545ce2 100644 --- a/libosmogb.pc.in +++ b/libosmogb.pc.in @@ -6,6 +6,6 @@ Name: Osmocom GPRS Gb Library Description: Osmocom GPRS Gb Interface (NS/BSSGP) Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmogb -losmovty -losmocore +Requires: libosmocore, libosmovty +Libs: -L${libdir} -losmogb Cflags: -I${includedir}/ -fno-strict-aliasing - diff --git a/libosmogsm.pc.in b/libosmogsm.pc.in index 0160be8..0aaf51e 100644 --- a/libosmogsm.pc.in +++ b/libosmogsm.pc.in @@ -6,6 +6,6 @@ Name: Osmocom GSM Core Library Description: GSM Core Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmogsm -losmocore +Requires: talloc, libosmocore +Libs: -L${libdir} -losmogsm Cflags: -I${includedir}/ - diff --git a/libosmosim.pc.in b/libosmosim.pc.in index 83777c3..a8f50d6 100644 --- a/libosmosim.pc.in +++ b/libosmosim.pc.in @@ -6,6 +6,6 @@ Name: Osmocom SIM card related utilities Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmosim -losmocore +Requires: talloc, libosmocore +Libs: -L${libdir} -losmosim Cflags: -I${includedir}/ - diff --git a/libosmousb.pc.in b/libosmousb.pc.in index ce6d271..dbedb0e 100644 --- a/libosmousb.pc.in +++ b/libosmousb.pc.in @@ -6,6 +6,6 @@ Name: Osmocom libusb (USB) integration Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmousb -losmocore +Requires: talloc, libusb-1.0, libosmocore +Libs: -L${libdir} -losmousb Cflags: -I${includedir}/ - diff --git a/libosmovty.pc.in b/libosmovty.pc.in index 6204e45..9a907e0 100644 --- a/libosmovty.pc.in +++ b/libosmovty.pc.in @@ -6,6 +6,6 @@ Name: Osmocom VTY Interface Library Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} @TALLOC_LIBS@ -losmovty -losmocore +Requires: libosmocore +Libs: -L${libdir} -losmovty Cflags: -I${includedir}/ - -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/27521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I2ab1fe8e4bbfc120b471d6c9f2312a89dbc7d42b Gerrit-Change-Number: 27521 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

3 years, 3 months

1
0
0 0

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

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27515 ) Change subject: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE ...................................................................... gsm48_make_ho_cmd(): optionally add Synchronization Indication IE Related: SYS#5838 Change-Id: I4e5b1163a71443d706f14ce4bfd5c2294c320432 (cherry picked from commit 53d05951a5ae0344101fccb58f89c4c1c4d2f8aa) --- 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 pespin: Looks good to me, but someone else must approve 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 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 3a915af..569b498 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 gsm_bts *bts = new_lchan->ts->trx->bts; struct gsm48_system_information_type_1 *si1; @@ -565,7 +578,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 9aa6578..edb50fc 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1199,7 +1199,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/+/27515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I4e5b1163a71443d706f14ce4bfd5c2294c320432 Gerrit-Change-Number: 27515 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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[2021q4]: fixup: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27516 ) Change subject: fixup: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE ...................................................................... fixup: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE This was overlooked during the code review. GCC does not complain because internally both 'enum handover_scope' and 'bool' are interpreted as 'int'. Found this while running my WIP testcase TC_srvcc_eutran_to_geran_a5_3. This change makes it pass. Related: SYS#5838 Fixes: I4e5b1163a71443d706f14ce4bfd5c2294c320432 Change-Id: I807fd4a0e700e54c67ca3547d9c0c1b442dd1c54 (cherry picked from commit 7c14a12a786b4a297e79a6cf4a84d84393344b54) --- M src/osmo-bsc/handover_fsm.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c index edb50fc..8240c38 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1199,7 +1199,7 @@ struct handover *ho = &conn->ho; struct msgb *rr_ho_cmd = gsm48_make_ho_cmd(ho->new_lchan, - ho->async, ho->scope, + ho->scope, ho->async, ho->new_lchan->ms_power, ho->ho_ref); if (!rr_ho_cmd) { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I807fd4a0e700e54c67ca3547d9c0c1b442dd1c54 Gerrit-Change-Number: 27516 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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[2021q4]: 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/+/27512 ) Change subject: gsm48_send_ho_cmd(): this function is not used, remove it ...................................................................... gsm48_send_ho_cmd(): this function is not used, remove it Related: SYS#5838 Change-Id: I9771d7e1f2073ebf6d900c067885485e54790bca (cherry picked from commit 0a01573bc1259c1b2dfefbe8eb16a507c8756902) --- 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: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified 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/+/27512 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I9771d7e1f2073ebf6d900c067885485e54790bca Gerrit-Change-Number: 27512 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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[2021q4]: gsm48_make_ho_cmd(): make 'struct gsm_lchan' pointer const

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27513 ) Change subject: gsm48_make_ho_cmd(): make 'struct gsm_lchan' pointer const ...................................................................... gsm48_make_ho_cmd(): make 'struct gsm_lchan' pointer const Related: SYS#5838 Change-Id: I731179bf7f5d711ca114e36af661faccf0caa19f (cherry picked from commit 798a71eb300dfeb4c76e8c3d2973173ae81e1602) --- 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: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified 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 472e81f..673a1a4 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/+/27513 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I731179bf7f5d711ca114e36af661faccf0caa19f Gerrit-Change-Number: 27513 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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[2021q4]: gsm48_make_ho_cmd(): optionally add Cipher Mode Setting IE

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27514 ) 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. Related: SYS#5838 Change-Id: I1d270e82d0a9b12897fc94dae4e8999aa132a22f (cherry picked from commit 2902d91d69d2583bc7dd835fe6b389bc1a78dd27) --- 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: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified 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 673a1a4..3a915af 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"); @@ -575,6 +576,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 487135b..9aa6578 100644 --- a/src/osmo-bsc/handover_fsm.c +++ b/src/osmo-bsc/handover_fsm.c @@ -1199,6 +1199,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/+/27514 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I1d270e82d0a9b12897fc94dae4e8999aa132a22f Gerrit-Change-Number: 27514 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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[2021q4]: fixup: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27516 ) Change subject: fixup: gsm48_make_ho_cmd(): optionally add Synchronization Indication IE ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27516 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I807fd4a0e700e54c67ca3547d9c0c1b442dd1c54 Gerrit-Change-Number: 27516 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Mar 2022 12:58:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

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

by fixeria

fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27515 ) 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/+/27515 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: 2021q4 Gerrit-Change-Id: I4e5b1163a71443d706f14ce4bfd5c2294c320432 Gerrit-Change-Number: 27515 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 16 Mar 2022 12:58:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 3 months

1
0
0 0

2025

2024

2023

2022

gerrit-log March 2022