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

Change in osmo-bsc[master]: bts: gsm_bts_alloc(): rework default multi-rate configuration

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27744 ) Change subject: bts: gsm_bts_alloc(): rework default multi-rate configuration ...................................................................... bts: gsm_bts_alloc(): rework default multi-rate configuration This is cosmetic change making the default multi-rate configuration easier to read/understand and modify. Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Related: SYS#5917, OS#4984 --- M src/osmo-bsc/bts.c 1 file changed, 36 insertions(+), 46 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/44/27744/1 diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index 843d711..7855781 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -169,7 +169,6 @@ struct gsm_bts *gsm_bts_alloc(struct gsm_network *net, struct gsm_bts_sm *bts_sm, uint8_t bts_num) { struct gsm_bts *bts = talloc_zero(bts_sm, struct gsm_bts); - struct gsm48_multi_rate_conf mr_cfg; int i; if (!bts) @@ -337,58 +336,49 @@ /* Set reasonable defaults for AMR-FR and AMR-HR rate configuration. * (see also 3GPP TS 28.062, Table 7.11.3.1.3-2) */ - mr_cfg = (struct gsm48_multi_rate_conf) { + static const struct gsm48_multi_rate_conf amr_fr_mr_cfg = { .m4_75 = 1, - .m5_15 = 0, .m5_90 = 1, - .m6_70 = 0, .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, .m12_2 = 1 }; - memcpy(bts->mr_full.gsm48_ie, &mr_cfg, sizeof(bts->mr_full.gsm48_ie)); - bts->mr_full.ms_mode[0].mode = 0; - bts->mr_full.ms_mode[1].mode = 2; - bts->mr_full.ms_mode[2].mode = 4; - bts->mr_full.ms_mode[3].mode = 7; - bts->mr_full.bts_mode[0].mode = 0; - bts->mr_full.bts_mode[1].mode = 2; - bts->mr_full.bts_mode[2].mode = 4; - bts->mr_full.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_full.ms_mode[i].hysteresis = 8; - bts->mr_full.ms_mode[i].threshold = 32; - bts->mr_full.bts_mode[i].hysteresis = 8; - bts->mr_full.bts_mode[i].threshold = 32; - } + static const struct gsm48_multi_rate_conf amr_hr_mr_cfg = { + .m4_75 = 1, + .m5_90 = 1, + .m7_40 = 1, + }; + + memcpy(bts->mr_full.gsm48_ie, &amr_fr_mr_cfg, sizeof(bts->mr_full.gsm48_ie)); + memcpy(bts->mr_half.gsm48_ie, &amr_hr_mr_cfg, sizeof(bts->mr_half.gsm48_ie)); + + static const struct amr_mode amr_ms_bts_mode[] = { + { + .mode = 0, /* 4.75k */ + .threshold = 32, + .hysteresis = 8, + }, + { + .mode = 2, /* 5.90k */ + .threshold = 32, + .hysteresis = 8, + }, + { + .mode = 4, /* 7.40k */ + .threshold = 32, + .hysteresis = 8, + }, + { + .mode = 7, /* 12.2k */ + /* this is the last mode, so no threshold */ + }, + }; + + memcpy(&bts->mr_full.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); + memcpy(&bts->mr_full.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); bts->mr_full.num_modes = 4; - mr_cfg = (struct gsm48_multi_rate_conf) { - .m4_75 = 1, - .m5_15 = 0, - .m5_90 = 1, - .m6_70 = 0, - .m7_40 = 1, - .m7_95 = 0, - .m10_2 = 0, - .m12_2 = 0 - }; - memcpy(bts->mr_half.gsm48_ie, &mr_cfg, sizeof(bts->mr_half.gsm48_ie)); - bts->mr_half.ms_mode[0].mode = 0; - bts->mr_half.ms_mode[1].mode = 2; - bts->mr_half.ms_mode[2].mode = 4; - bts->mr_half.ms_mode[3].mode = 7; - bts->mr_half.bts_mode[0].mode = 0; - bts->mr_half.bts_mode[1].mode = 2; - bts->mr_half.bts_mode[2].mode = 4; - bts->mr_half.bts_mode[3].mode = 7; - for (i = 0; i < 3; i++) { - bts->mr_half.ms_mode[i].hysteresis = 8; - bts->mr_half.ms_mode[i].threshold = 32; - bts->mr_half.bts_mode[i].hysteresis = 8; - bts->mr_half.bts_mode[i].threshold = 32; - } + memcpy(&bts->mr_half.ms_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); + memcpy(&bts->mr_half.bts_mode[0], &amr_ms_bts_mode[0], sizeof(amr_ms_bts_mode)); bts->mr_half.num_modes = 3; bts_init_cbch_state(&bts->cbch_basic, bts); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27744 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d03c2188d007a60a86961a346744400bc81d4e6 Gerrit-Change-Number: 27744 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: make: Allow passing OSMO_UECUPS_BRANCH

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27742 ) Change subject: make: Allow passing OSMO_UECUPS_BRANCH ...................................................................... make: Allow passing OSMO_UECUPS_BRANCH Change-Id: I6060364843b1a3e3547a45d98a1248ead22f3970 --- M make/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/make/Makefile b/make/Makefile index 29a7ac0..6418ca6 100644 --- a/make/Makefile +++ b/make/Makefile @@ -36,6 +36,7 @@ OSMO_SGSN_BRANCH?=master OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master +OSMO_UECUPS_BRANCH?=master OPEN5GS_BRANCH?=main BUILD_ARGS?= RUN_ARGS?=-it @@ -114,6 +115,7 @@ --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ + --build-arg OSMO_UECUPS_BRANCH=$(OSMO_UECUPS_BRANCH) \ --build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \ $(BUILD_ARGS) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6060364843b1a3e3547a45d98a1248ead22f3970 Gerrit-Change-Number: 27742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: make: Allow passing OSMO_UECUPS_BRANCH

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27742 ) Change subject: make: Allow passing OSMO_UECUPS_BRANCH ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6060364843b1a3e3547a45d98a1248ead22f3970 Gerrit-Change-Number: 27742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 09:58:59 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in docker-playground[master]: make: Allow passing OSMO_UECUPS_BRANCH

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/docker-playground/+/27742 ) Change subject: make: Allow passing OSMO_UECUPS_BRANCH ...................................................................... make: Allow passing OSMO_UECUPS_BRANCH Change-Id: I6060364843b1a3e3547a45d98a1248ead22f3970 --- M make/Makefile 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/42/27742/1 diff --git a/make/Makefile b/make/Makefile index 29a7ac0..6418ca6 100644 --- a/make/Makefile +++ b/make/Makefile @@ -36,6 +36,7 @@ OSMO_SGSN_BRANCH?=master OSMO_SIP_BRANCH?=master OSMO_STP_BRANCH?=master +OSMO_UECUPS_BRANCH?=master OPEN5GS_BRANCH?=main BUILD_ARGS?= RUN_ARGS?=-it @@ -114,6 +115,7 @@ --build-arg OSMO_SGSN_BRANCH=$(OSMO_SGSN_BRANCH) \ --build-arg OSMO_SIP_BRANCH=$(OSMO_SIP_BRANCH) \ --build-arg OSMO_STP_BRANCH=$(OSMO_STP_BRANCH) \ + --build-arg OSMO_UECUPS_BRANCH=$(OSMO_UECUPS_BRANCH) \ --build-arg OPEN5GS_BRANCH=$(OPEN5GS_BRANCH) \ $(BUILD_ARGS) -t $(IMAGE):latest . @DOCKER_MAJOR=$(shell docker -v | sed -e 's/.*version //' -e 's/,.*//' | cut -d\. -f1) ; \ -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27742 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6060364843b1a3e3547a45d98a1248ead22f3970 Gerrit-Change-Number: 27742 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Increase reset_all_stats timeout

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 ) Change subject: GTPv2_Emulation: Increase reset_all_stats timeout ...................................................................... GTPv2_Emulation: Increase reset_all_stats timeout Release of 256 tuns + threads takes quite a reasonable amount of time. Let's increase the timeout since reset_all_state can take around 10 seconds sometimes. Related: OS#5523 Change-Id: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb --- M library/GTPv2_Emulation.ttcn 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: daniel: Looks good to me, but someone else must approve fixeria: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/library/GTPv2_Emulation.ttcn b/library/GTPv2_Emulation.ttcn index f07afcb..5bb3b1e 100644 --- a/library/GTPv2_Emulation.ttcn +++ b/library/GTPv2_Emulation.ttcn @@ -353,9 +353,9 @@ } private function f_uecups_xceive(template (value) PDU_UECUPS tx, - template PDU_UECUPS rx_t := ?) + template PDU_UECUPS rx_t := ?, float time_out := 10.0) runs on GTPv2_Emulation_CT return PDU_UECUPS { - timer T := 10.0; + timer T := time_out; var UECUPS_RecvFrom mrf; UECUPS.send(t_UECUPS_Send(g_uecups_conn_id, tx)); @@ -399,7 +399,7 @@ g_uecups_conn_id := res.connId; /* clear all tunnel state in the daemon at start */ - f_uecups_xceive({reset_all_state := {}}, {reset_all_state_res:=?}); + f_uecups_xceive({reset_all_state := {}}, {reset_all_state_res:=?}, 30.0); } /* make sure we always pass incoming UECUPS indications whenever receiving fom the UECUPS port */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 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: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb Gerrit-Change-Number: 27740 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Increase reset_all_stats timeout

by fixeria

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 ) Change subject: GTPv2_Emulation: Increase reset_all_stats timeout ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740/comment/0ebea6ab_01a9… PS1, Line 402: 30 > around 10 seconds means ofc it can also take more than 10 seconds. […] Ack -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 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: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb Gerrit-Change-Number: 27740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 09:44:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Increase reset_all_stats timeout

by pespin

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 ) Change subject: GTPv2_Emulation: Increase reset_all_stats timeout ...................................................................... Patch Set 1: (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740/comment/8eaa9cc5_cd10… PS1, Line 402: 30 > In the commit message you're saying "can take around 10 seconds", but using 30 here? Did you mean "c […] around 10 seconds means ofc it can also take more than 10 seconds. In the order of 10 seconds, so yeah, let's increase the timeout to make sure we don't run into this kind of problems. Having the timer a lot higher also makes it easier to debug if an issue happens, to discard some strange behavior due to jumping to next test while osmo-uecups is reseting the state. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 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: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb Gerrit-Change-Number: 27740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 09:41:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Increase reset_all_stats timeout

by daniel

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 ) Change subject: GTPv2_Emulation: Increase reset_all_stats timeout ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 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: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb Gerrit-Change-Number: 27740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 09:40:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Increase reset_all_stats timeout

by fixeria

Attention is currently required from: pespin, daniel. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 ) Change subject: GTPv2_Emulation: Increase reset_all_stats timeout ...................................................................... Patch Set 1: (1 comment) File library/GTPv2_Emulation.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740/comment/8852f8a8_3f36… PS1, Line 402: 30 In the commit message you're saying "can take around 10 seconds", but using 30 here? Did you mean "can take more than 10 seconds" maybe? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 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: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb Gerrit-Change-Number: 27740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 09:34:08 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: GTPv2_Emulation: Increase reset_all_stats timeout

by osmith

Attention is currently required from: pespin, fixeria, daniel. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 ) Change subject: GTPv2_Emulation: Increase reset_all_stats timeout ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27740 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: Ie01e07bd698cb5c386f757f4ec315f4892ad61cb Gerrit-Change-Number: 27740 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 12 Apr 2022 09:31:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 2 months

1
0
0 0

2025

2024

2023

2022

gerrit-log April 2022