Change in osmo-bsc[master]: MSC pooling: add rate counters
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18875 ) Change subject: MSC pooling: add rate counters .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18875/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/18875/1//COMMIT_MSG@9 PS1, Line 9: Tests for these counters are added in I2006f1def5352b4b73d0159bfcaa2da9c64bfe3f (well, for *some* of these counters, at least) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18875 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2ded757958dfa62b502efbab765203bcadf899e2 Gerrit-Change-Number: 18875 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Wed, 17 Jun 2020 03:13:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add MSC pooling tests
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 ) Change subject: bsc: add MSC pooling tests .. Patch Set 7: ok, now everything is back in order here. sorry about that. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 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: I21cbab193cd0de2e5692665442eae113d5f61904 Gerrit-Change-Number: 18763 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Jun 2020 03:09:43 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add MSC pooling tests
Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 to look at the new patch set (#7). Change subject: bsc: add MSC pooling tests .. bsc: add MSC pooling tests The MSC pooling feature is implemented in osmo-bsc Ifbdea197b26e88751a391c8a80c41f04e7d5e047. A VTY command ('mscpool roundrobin next') that allows deterministic testing is added in I2155d906505a26744966f442ffb1e87a6a9b494c. osmo-bsc.cfg changes needed for these tests to succeed are in docker-playground I1986e4ef43beee161c82193694421b56136c1afe The new tests will fail until the above have been merged. Change-Id: I21cbab193cd0de2e5692665442eae113d5f61904 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/L3_Templates.ttcn 3 files changed, 732 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/18763/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 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: I21cbab193cd0de2e5692665442eae113d5f61904 Gerrit-Change-Number: 18763 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-ttcn3-hacks[master]: bsc: MSC pooling: also test rate counters
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18876 ) Change subject: bsc: MSC pooling: also test rate counters .. bsc: MSC pooling: also test rate counters Add some generic ways of checking rate counters in bulk, and use that to verify the MSC pool rate counters. This nicely also verifies the intended effect of each test in detail. Depends: I2ded757958dfa62b502efbab765203bcadf899e2 (osmo-bsc) Change-Id: I2006f1def5352b4b73d0159bfcaa2da9c64bfe3f --- M bsc/BSC_Tests.ttcn 1 file changed, 191 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/76/18876/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index 78fc8ec..0980e1f 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -75,6 +75,31 @@ IPA_Client rsl } +/* One counter value, e.g. { "name", 23 } */ +type record CounterNameVal { + charstring name, + integer val +} + +/* List of one instance's counters, + * e.g. { {"foo",23}, {"bar",42} } + */ +type record of CounterNameVal CounterNameVals; + +/* List of numerous instances' counters, + * e.g. { { {"foo",23}, {"bar",42} }, + *{ {"foo",23}, {"bar",42} } } */ +type record of CounterNameVals CounterNameValsList; + +/* Default list of counters for an 'msc' entity. */ +const CounterNameVals counternames_msc_mscpool := { + { "mscpool:subscr:new", 0 }, + { "mscpool:subscr:known", 0 }, + { "mscpool:subscr:reattach", 0 }, + { "mscpool:subscr:attach_lost", 0 }, + { "mscpool:subscr:paged", 0 } +}; + type component test_CT extends CTRL_Adapter_CT { /* Array of per-BTS state */ var BTS_State bts[NUM_BTS]; @@ -107,6 +132,7 @@ /* global test case guard timer */ timer T_guard := 30.0; + var CounterNameValsList g_ctr_msc; } modulepar { @@ -179,6 +205,105 @@ return pars; } +/* Retrieve and verify rate counter values in bulk */ + +private function f_counter_name_vals_add(CounterNameVals vals, charstring countername, integer val := 1) return CounterNameVals{ + for (var integer i := 0; i < lengthof(vals); i := i + 1) { + if (vals[i].name == countername) { + vals[i].val := vals[i].val + val; + return vals; + } + } + /* name not found, append */ + vals[lengthof(vals)] := { + name := countername, + val := val + } + return vals; +} + +private function f_counter_name_vals_list_add(CounterNameValsList vals, integer idx, charstring countername, integer val := 1) return CounterNameValsList { + vals[idx] := f_counter_name_vals_add(vals[idx], countername, val); + return vals; +} + +private function f_counter_name_vals_get(charstring instance_name, integer instance_nr, CounterNameVals counternames := counternames_msc_mscpool) runs on test_CT return CounterNameVals { + var CounterNameVals vals; + for (var integer i := 0; i < lengthof(counternames); i := i + 1) { + vals[i] := { + name := counternames[i].name, + val := f_ctrl_get_ratectr_abs(IPA_CTRL, instance_name, instance_nr, counternames[i].name) + }; + } + return vals; +} + +private function f_counter_name_vals_get_n(charstring instance_name := "msc", integer instance_count := NUM_MSC, CounterNameVals counternames := counternames_msc_mscpool) runs on test_CT return CounterNameValsList { + var CounterNameValsList valslist; + for (var integer instance_nr := 0; instance_nr < instance_count; instance_nr := instance_nr + 1) { + valslist[instance_nr] := f_counter_name_vals_get(instance_name, instance_nr, counternames); + } + log("retrieved rate counters: ", valslist); + return valslist; +} + +private function f_counter_name_vals_expect(charstring instance_name, integer instance_nr, CounterNameVals vals) runs on test_CT { + var CounterNameVals now := f_counter_name_vals_get(instance_name, instance_nr, vals); + for (var integer i := 0; i < lengthof(vals); i := i + 1) { + if (now[i].name != vals[i].name) { + setverdict(fail, "Internal error"); + } + if (now[i].val != vals[i].val) { + setverdict(fail, "Rate counter mismatch: ", instance_name, " ", instance_nr, " ", vals[i].name, " is at ", now[i].val, " but expected ", vals[i].val); + } + } + setverdict(pass); +} + +private function f_counter_name_vals_expect_n(charstring instance_name, CounterNameValsList valslist) runs on test_CT { + for (var integer instance_nr := 0; instance_nr < lengthof(valslist); instance_nr := instance_nr + 1) { + f_counter_name_vals_expect(instance_name, instance_nr,
Change in osmo-ttcn3-hacks[master]: bsc: add MSC pooling tests
neels has removed a vote from this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 ) Change subject: bsc: add MSC pooling tests .. Removed Code-Review-2 by neels -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 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: I21cbab193cd0de2e5692665442eae113d5f61904 Gerrit-Change-Number: 18763 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: deleteVote
Change in osmo-ttcn3-hacks[master]: bsc: add MSC pooling tests
Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 to look at the new patch set (#6). Change subject: bsc: add MSC pooling tests .. bsc: add MSC pooling tests The MSC pooling feature is implemented in osmo-bsc Ifbdea197b26e88751a391c8a80c41f04e7d5e047. A VTY command ('mscpool roundrobin next') that allows deterministic testing is added in I2155d906505a26744966f442ffb1e87a6a9b494c. osmo-bsc.cfg changes needed for these tests to succeed are in docker-playground I1986e4ef43beee161c82193694421b56136c1afe The new tests will fail until the above have been merged. Change-Id: I21cbab193cd0de2e5692665442eae113d5f61904 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn M library/L3_Templates.ttcn 3 files changed, 732 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/63/18763/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 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: I21cbab193cd0de2e5692665442eae113d5f61904 Gerrit-Change-Number: 18763 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: MSC pooling: add rate counters
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18875 ) Change subject: MSC pooling: add rate counters .. MSC pooling: add rate counters Tests for these counters are added in I2006f1def5352b4b73d0159bfcaa2da9c64bfe3f (osmo-ttcn3-hacks). Change-Id: I2ded757958dfa62b502efbab765203bcadf899e2 --- M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/gsm_08_08.c M src/osmo-bsc/osmo_bsc_msc.c 4 files changed, 67 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/75/18875/1 diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h index f19b9a0..b1fe14d 100644 --- a/include/osmocom/bsc/bsc_msc_data.h +++ b/include/osmocom/bsc/bsc_msc_data.h @@ -96,6 +96,13 @@ MSC_CTR_BSSMAP_TX_DT1_HANDOVER_COMPLETE, MSC_CTR_BSSMAP_TX_DT1_HANDOVER_FAILURE, MSC_CTR_BSSMAP_TX_DT1_DTAP, + + MSC_CTR_MSCPOOL_SUBSCR_NEW, + MSC_CTR_MSCPOOL_SUBSCR_REATTACH, + MSC_CTR_MSCPOOL_SUBSCR_KNOWN, + MSC_CTR_MSCPOOL_SUBSCR_PAGED, + MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST, + MSC_CTR_MSCPOOL_EMERG_FORWARDED, }; /* Constants for the MSC stats */ diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 38047d2..9874706 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -1558,6 +1558,9 @@ BSC_CTR_PAGING_RESPONDED, BSC_CTR_PAGING_NO_ACTIVE_PAGING, BSC_CTR_UNKNOWN_UNIT_ID, + BSC_CTR_MSCPOOL_SUBSCR_NO_MSC, + BSC_CTR_MSCPOOL_EMERG_FORWARDED, + BSC_CTR_MSCPOOL_EMERG_LOST, }; static const struct rate_ctr_desc bsc_ctr_description[] = { @@ -1604,6 +1607,13 @@ [BSC_CTR_PAGING_NO_ACTIVE_PAGING] = {"paging:no_active_paging", "Paging response without an active paging request (arrived after paging expiration?)."}, [BSC_CTR_UNKNOWN_UNIT_ID] = {"abis:unknown_unit_id", "Connection attempts from unknown IPA CCM Unit ID."}, + + [BSC_CTR_MSCPOOL_SUBSCR_NO_MSC] = {"mscpool:subscr:no_msc", +"Complete Layer 3 requests lost because no connected MSC is found available."}, + [BSC_CTR_MSCPOOL_EMERG_FORWARDED] = {"mscpool:emerg:forwarded", +"Emergency call requests forwarded to an MSC (see also per-MSC counters)"}, + [BSC_CTR_MSCPOOL_EMERG_LOST] = {"mscpool:emerg:lost", +"Emergency call requests lost because no MSC was found available."}, }; diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 32363eb..3703c76 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -228,6 +228,7 @@ if (is_msc_usable(msc_target, is_emerg)) { LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG, "%s matches earlier Paging from msc %d\n", osmo_mobile_identity_to_str_c(OTC_SELECT, ), msc_target->nr); + rate_ctr_inc(_target->msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_PAGED]); return msc_target; } else { LOG_COMPL_L3(pdisc, mtype, LOGL_DEBUG, @@ -268,9 +269,11 @@ bool nri_matches_msc = (nri_v >= 0 && osmo_nri_v_matches_ranges(nri_v, msc->nri_ranges)); if (!is_msc_usable(msc, is_emerg)) { - if (nri_matches_msc) + if (nri_matches_msc) { LOG_NRI(LOGL_DEBUG, "matches msc %d, but this MSC is currently not connected\n", msc->nr); + rate_ctr_inc(>msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_ATTACH_LOST]); + } continue; } @@ -281,6 +284,11 @@ msc->nr); } else { LOG_NRI(LOGL_DEBUG, "matches msc %d\n", msc->nr); + rate_ctr_inc(>msc_ctrs->ctr[MSC_CTR_MSCPOOL_SUBSCR_KNOWN]); + if (is_emerg) { + rate_ctr_inc(>msc_ctrs->ctr[MSC_CTR_MSCPOOL_EMERG_FORWARDED]); + rate_ctr_inc(_gsmnet->bsc_ctrs->ctr[BSC_CTR_MSCPOOL_EMERG_FORWARDED]); + } return msc; } } @@ -316,12 +324,25 @@ if (!msc_target) { LOG_COMPL_L3(pdisc, mtype, LOGL_ERROR, "%s%s: No suitable MSC for this Complete Layer 3 request found\n", osmo_mobile_identity_to_str_c(OTC_SELECT, ), is_emerg ? " FOR EMERGENCY CALL" : "");
Build failure of network:osmocom:nightly/open5gs in Debian_10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/Debian_10/i586 Package network:osmocom:nightly/open5gs failed to build in Debian_10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: eturn-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr@sta/sbi-path.c.o' -MF 'src/udr/e340f29@@udr@sta/sbi-path.c.o.d' -o 'src/udr/e340f29@@udr@sta/sbi-path.c.o' -c ../src/udr/sbi-path.c [ 178s] [1923/2112] cc -Isrc/udr/e340f29@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/e340f29@@udr@sta/nf-sm.c.o' -MF 'src/udr/e340f29@@udr@sta/nf-sm.c.o.d' -o 'src/udr/e340f29@@udr@sta/nf-sm.c.o' -c ../src/udr/nf-sm.c [ 178s] [1924/2112] cc -o src/nrf/open5gs-nrfd 'src/nrf/f570ec2@@open5gs-nrfd@exe/app.c.o' 'src/nrf/f570ec2@@open5gs-nrfd@exe/.._main.c.o' -Wl,--no-undefined -Wl,--as-needed -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wl,-z,relro -Wl,-z,now -Wl,--start-group src/nrf/libnrf.a lib/ipfw/libogsipfw.so.1.2.5 lib/app/libogsapp.so.1.2.5 lib/core/libogscore.so.1.2.5 lib/dbi/libogsdbi.so.1.2.5 lib/crypt/libogscrypt.so.1.2.5 lib/sbi/libogssbi.so.1.2.5 lib/sbi/openapi/libogssbi-openapi.so.1.2.5 /usr/lib/i386-linux-gnu/libyaml.so /usr/lib/gcc/i686-linux-gnu/8/../../../i386-linux-gnu/libmongoc-1.0.so /usr/lib/gcc/i686-linux-gnu/8/../../../i386-linux-gnu/libbson-1.0.so -lgnutls /usr/lib/i386-linux-gnu/libmicrohttpd.so /usr/lib/i386-linux-gnu/libcurl.so -lgnutls -Wl,--end-group -pthread '-Wl,-rpath,$ORIGIN/:$ORIGIN/../../lib/ipfw:$ORIGIN/../../lib/app:$ORIGIN/../../lib/core:$ORIGIN/../../lib/dbi:$ORIGIN/../../lib/crypt:$ORIGIN/../../lib/sbi:$ORIGIN/../../lib/sbi/openapi' -Wl,-rpath-link,/usr/src/packages/BUILD/obj-i686-linux-gnu/src/nrf:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/ipfw:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/app:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/core:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/dbi:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/crypt:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/sbi:/usr/src/packages/BUILD/obj-i686-linux-gnu/lib/sbi/openapi [ 178s] [1925/2112] cc -Isrc/udm/3eca12a@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time
Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.04/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.04/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.04/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: [ 166s] [1938/2112] rm -f src/pcrf/libpcrf.a && gcc-ar csrD src/pcrf/libpcrf.a 'src/pcrf/pcrf@sta/pcrf-init.c.o' 'src/pcrf/pcrf@sta/pcrf-context.c.o' 'src/pcrf/pcrf@sta/pcrf-fd-path.c.o' 'src/pcrf/pcrf@sta/pcrf-gx-path.c.o' 'src/pcrf/pcrf@sta/pcrf-rx-path.c.o' [ 166s] [1939/2112] cc -Isrc/udm/udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/udm@sta/context.c.o' -MF 'src/udm/udm@sta/context.c.o.d' -o 'src/udm/udm@sta/context.c.o' -c ../src/udm/context.c [ 166s] FAILED: src/udm/udm@sta/context.c.o [ 166s] cc -Isrc/udm/udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udm/udm@sta/context.c.o' -MF 'src/udm/udm@sta/context.c.o.d' -o 'src/udm/udm@sta/context.c.o' -c ../src/udm/context.c [ 166s] ../src/udm/context.c: In function ‘udm_ue_add’: [ 166s] ../src/udm/context.c:129:38: error: format ‘%ld’ expects argument of type ‘long int’, but argument 2 has type ‘int’ [-Werror=format=] [ 166s] udm_ue->ctx_id = ogs_msprintf("%ld", ogs_pool_index(_ue_pool, udm_ue)); [ 166s] ~~^ [ 166s] %d [ 166s] cc1: some warnings being treated as errors [ 166s] [1940/2112] cc -Isrc/udm/udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=.
Build failure of network:osmocom:nightly/open5gs in xUbuntu_18.10/i586
Visit https://build.opensuse.org/package/live_build_log/network:osmocom:nightly/open5gs/xUbuntu_18.10/i586 Package network:osmocom:nightly/open5gs failed to build in xUbuntu_18.10/i586 Check out the package for editing: osc checkout network:osmocom:nightly open5gs Last lines of build log: oat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/src@udr@@udr@sta/nf-sm.c.o' -MF 'src/udr/src@udr@@udr@sta/nf-sm.c.o.d' -o 'src/udr/src@udr@@udr@sta/nf-sm.c.o' -c ../src/udr/nf-sm.c [ 177s] [1922/2112] cc -Isrc/udr/src@udr@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/src@udr@@udr@sta/timer.c.o' -MF 'src/udr/src@udr@@udr@sta/timer.c.o.d' -o 'src/udr/src@udr@@udr@sta/timer.c.o' -c ../src/udr/timer.c [ 177s] [1923/2112] cc -Isrc/udr/src@udr@@udr@sta -Isrc/udr -I../src/udr -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/dbi -I../lib/dbi -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/libmongoc-1.0 -I/usr/include/libbson-1.0 -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls -Wimplicit-fallthrough=5 -Wendif-labels -Wstrict-aliasing=3 -Wwrite-strings -Werror=overflow -Werror=shift-count-overflow -Werror=shift-overflow=2 -Wdate-time -Wnested-externs -Wunused -Wduplicated-branches -Wmisleading-indentation -Wno-sign-compare -Wno-unused-parameter -ffast-math -fdiagnostics-show-option -fstack-protector -fstack-protector-strong --param=ssp-buffer-size=4 -ffunction-sections -fdata-sections -g -O2 -fdebug-prefix-map=/usr/src/packages/BUILD=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -pthread -MD -MQ 'src/udr/src@udr@@udr@sta/context.c.o' -MF 'src/udr/src@udr@@udr@sta/context.c.o.d' -o 'src/udr/src@udr@@udr@sta/context.c.o' -c ../src/udr/context.c [ 177s] [1924/2112] cc -Isrc/udm/src@udm@@udm@sta -Isrc/udm -I../src/udm -Ilib/app -I../lib/app -Ilib -I../lib -Ilib/core -I../lib/core -Ilib/crypt -I../lib/crypt -Ilib/sbi -I../lib/sbi -Ilib/sbi/openapi -I../lib/sbi/openapi -I/usr/include/p11-kit-1 -I/usr/include/i386-linux-gnu -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -std=gnu89 -Wextra -Wlogical-op -Werror=missing-include-dirs -Werror=pointer-arith -Werror=init-self -Wfloat-equal -Wsuggest-attribute=noreturn -Werror=missing-prototypes -Werror=missing-declarations -Werror=implicit-function-declaration -Werror=return-type -Werror=incompatible-pointer-types -Werror=format=2 -Wstrict-prototypes -Wredundant-decls
Change in osmo-ttcn3-hacks[master]: bsc: add MSC pooling tests
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 ) Change subject: bsc: add MSC pooling tests .. Patch Set 5: Code-Review-2 Oof, I lost a lot of important changes after patch set 2, must have gotten mixed up with my branch across the two machines... -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/18763 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: I21cbab193cd0de2e5692665442eae113d5f61904 Gerrit-Change-Number: 18763 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 17 Jun 2020 01:09:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Use libosmocore's TDMA frame number API (constatns & arithmetic)
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18874 ) Change subject: Use libosmocore's TDMA frame number API (constatns & arithmetic) .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18874/3/src/osmo-bts-trx/scheduler_trx.c File src/osmo-bts-trx/scheduler_trx.c: https://gerrit.osmocom.org/c/osmo-bts/+/18874/3/src/osmo-bts-trx/scheduler_trx.c@a130 PS3, Line 130: 135774 Does anyone know the meaning/origin of this magic number BTW? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I61c97a62bd5dbbb4a984921ebdfc10ad6ed00f2a Gerrit-Change-Number: 18874 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 22:22:31 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: Use libosmocore's TDMA frame number API (constatns & arithmetic)
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18874 to look at the new patch set (#3). Change subject: Use libosmocore's TDMA frame number API (constatns & arithmetic) .. Use libosmocore's TDMA frame number API (constatns & arithmetic) Depends: (libosmocore) Ic291fd3644f34964374227a191c7045d79d77e0d Change-Id: I61c97a62bd5dbbb4a984921ebdfc10ad6ed00f2a --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 6 files changed, 31 insertions(+), 52 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/18874/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I61c97a62bd5dbbb4a984921ebdfc10ad6ed00f2a Gerrit-Change-Number: 18874 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: Use libosmocore's TDMA frame number API (constatns & arithmetic)
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18874 to look at the new patch set (#2). Change subject: Use libosmocore's TDMA frame number API (constatns & arithmetic) .. Use libosmocore's TDMA frame number API (constatns & arithmetic) Depends: (libosmocore) Ic291fd3644f34964374227a191c7045d79d77e0d Change-Id: I61c97a62bd5dbbb4a984921ebdfc10ad6ed00f2a --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 6 files changed, 31 insertions(+), 51 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/18874/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18874 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I61c97a62bd5dbbb4a984921ebdfc10ad6ed00f2a Gerrit-Change-Number: 18874 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: MSC pooling: make NRI mappings VTY configurable
Hello dexter, pespin, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 to look at the new patch set (#6). Change subject: MSC pooling: make NRI mappings VTY configurable .. MSC pooling: make NRI mappings VTY configurable Use the osmo_nri_ranges API to manage each MSC's NRI ranges by VTY configuration. Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 --- M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_vty.c A tests/nri_cfg.vty 7 files changed, 367 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/18765/6 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 Gerrit-Change-Number: 18765 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: MSC pooling: make NRI mappings VTY configurable
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18765 ) Change subject: MSC pooling: make NRI mappings VTY configurable .. Patch Set 5: note that the osmo_nri_ranges_vty_add/del() implementations still accept hex arguments, but that doesn't matter really. It's up to the DEFUN to define the actual cmd arguments. We could drop the hex parsing from the libosmocore impl, but that's already merged, so ... whatever. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 Gerrit-Change-Number: 18765 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 22:07:20 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-msc[master]: add rudimentary NRI support for MSC pooling
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/18770 to look at the new patch set (#5). Change subject: add rudimentary NRI support for MSC pooling .. add rudimentary NRI support for MSC pooling This patch served for a manual testing counterpart for osmo-bsc to implement MSC pooling. This enables a basic MSC pooling setup, but for a production setup, osmo-msc would still lack various features related to unloading subscribers to another MSC as explained in 3GPP TS 23.236. Change-Id: Iafe0878a0a2c8669080d757b34a398ea75fced36 --- M include/osmocom/msc/vlr.h M src/libmsc/msc_vty.c M src/libvlr/vlr.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_hlr_reject.err M tests/msc_vlr/msc_vlr_test_hlr_timeout.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err M tests/msc_vlr/msc_vlr_tests.c M tests/test_nodes.vty 17 files changed, 217 insertions(+), 122 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/18770/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18770 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Iafe0878a0a2c8669080d757b34a398ea75fced36 Gerrit-Change-Number: 18770 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: vty: hide 'mscpool roundrobin next'
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18873 ) Change subject: vty: hide 'mscpool roundrobin next' .. Patch Set 1: Code-Review-1 Hiding this command was requested by code review. But I think it could be handy to sysadmins to test their setups, and knowing that it exists is not a bad thing. Leaving this up to CR whether we should merge this and hide the command, or not merge it and just leave the command in plain sight. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie8799b61b74cfb34acd5aa4aeb1fb69ae7d216e2 Gerrit-Change-Number: 18873 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: neels Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 16 Jun 2020 22:04:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: Use libosmocore's TDMA frame number API (constatns & arithmetic)
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18874 ) Change subject: Use libosmocore's TDMA frame number API (constatns & arithmetic) .. Use libosmocore's TDMA frame number API (constatns & arithmetic) Depends: (libosmocore) Ic291fd3644f34964374227a191c7045d79d77e0d Change-Id: I61c97a62bd5dbbb4a984921ebdfc10ad6ed00f2a --- M include/osmo-bts/gsm_data.h M src/common/l1sap.c M src/common/scheduler.c M src/osmo-bts-trx/scheduler_trx.c M src/osmo-bts-trx/trx_if.c M src/osmo-bts-virtual/scheduler_virtbts.c 6 files changed, 30 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/74/18874/1 diff --git a/include/osmo-bts/gsm_data.h b/include/osmo-bts/gsm_data.h index 1de5edd..155cd9b 100644 --- a/include/osmo-bts/gsm_data.h +++ b/include/osmo-bts/gsm_data.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include @@ -16,9 +17,6 @@ #define GSM_HR_BYTES 14 /* TS 101318 Chapter 5.2: 112 bits, no sig */ #define GSM_EFR_BYTES 31 /* TS 101318 Chapter 5.3: 244 bits + 4bit sig */ -#define GSM_SUPERFRAME (26*51) /* 1326 TDMA frames */ -#define GSM_HYPERFRAME (2048*GSM_SUPERFRAME) /* GSM_HYPERFRAME frames */ - #define GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DEFAULT 41 #define GSM_BTS_AGCH_QUEUE_THRESH_LEVEL_DISABLE 99 #define GSM_BTS_AGCH_QUEUE_LOW_LEVEL_DEFAULT 41 diff --git a/src/common/l1sap.c b/src/common/l1sap.c index dad1b49..17a6c5d 100644 --- a/src/common/l1sap.c +++ b/src/common/l1sap.c @@ -621,7 +621,7 @@ /* increment number of RACH slots that have passed by since the * last time indication */ for (i = 0; i < frames_expired; i++) { - uint32_t fn = (info_time_ind->fn + GSM_HYPERFRAME - i) % GSM_HYPERFRAME; + uint32_t fn = GSM_TDMA_FN_SUB(info_time_ind->fn, i); bts->load.rach.total += calc_exprd_rach_frames(bts, fn); } @@ -891,7 +891,7 @@ static void l1sap_update_fnstats(struct gsm_bts *bts, uint32_t rts_fn) { - int32_t delta = (rts_fn + GSM_HYPERFRAME - bts->gsm_time.fn) % GSM_HYPERFRAME; + int32_t delta = GSM_TDMA_FN_SUB(rts_fn, bts->gsm_time.fn); if (delta < bts->fn_stats.min) bts->fn_stats.min = delta; diff --git a/src/common/scheduler.c b/src/common/scheduler.c index ed7d412..93b0526 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -661,7 +661,7 @@ LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n"); goto free_msg; } - prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); + prim_fn = GSM_TDMA_FN_SUB(l1sap_fn, fn); if (prim_fn > 100) { /* l1sap_fn < fn */ LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, "Prim %u is out of range (%u vs exp %u), or channel %s with " @@ -1225,12 +1225,6 @@ } } -#define TDMA_FN_SUM(a, b) \ - ((a + GSM_HYPERFRAME + b) % GSM_HYPERFRAME) - -#define TDMA_FN_SUB(a, b) \ - ((a + GSM_HYPERFRAME - b) % GSM_HYPERFRAME) - static int trx_sched_calc_frame_loss(struct l1sched_trx *l1t, struct l1sched_chan_state *l1cs, uint8_t tn, uint32_t fn) { @@ -1268,7 +1262,7 @@ } /* How many frames elapsed since the last one? */ - elapsed_fs = TDMA_FN_SUB(fn, l1cs->last_tdma_fn); + elapsed_fs = GSM_TDMA_FN_SUB(fn, l1cs->last_tdma_fn); if (elapsed_fs > l1ts->mf_period) { /* Too many! */ LOGL1S(DL1P, LOGL_ERROR, l1t, tn, frame_head->ul_chan, fn, "Too many (>%u) contiguous TDMA frames=%u elapsed " @@ -1287,7 +1281,7 @@ * Start counting from the last_fn + 1. */ for (i = 1; i < elapsed_fs; i++) { - fn_i = TDMA_FN_SUM(l1cs->last_tdma_fn, i); + fn_i = GSM_TDMA_FN_SUM(l1cs->last_tdma_fn, i); offset = fn_i % l1ts->mf_period; frame = l1ts->mf_frames + offset; @@ -1320,7 +1314,7 @@ }; for (i = 1; i < elapsed_fs; i++) { - fn_i = TDMA_FN_SUM(l1cs->last_tdma_fn, i); + fn_i = GSM_TDMA_FN_SUM(l1cs->last_tdma_fn, i); offset = fn_i % l1ts->mf_period; frame = l1ts->mf_frames + offset; func = trx_chan_desc[frame->ul_chan].ul_fn; diff --git a/src/osmo-bts-trx/scheduler_trx.c b/src/osmo-bts-trx/scheduler_trx.c index d4a38b6..233c0b9 100644 --- a/src/osmo-bts-trx/scheduler_trx.c +++ b/src/osmo-bts-trx/scheduler_trx.c @@ -74,7 +74,7 @@ /* advance frame number, so the transceiver has more * time until it must be transmitted. */ - fn = (fn + plink->u.osmotrx.clock_advance) % GSM_HYPERFRAME; + fn =
Change in osmo-bsc[master]: tweak log category for Compl L3 error
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18764 ) Change subject: tweak log category for Compl L3 error .. tweak log category for Compl L3 error At this time, no MSC has been selected for handling this subscriber, so DMSC is clearly the wrong logging category. Change-Id: I9c6373e5f28c9c69a0609889188ef28ade11da3d --- M src/osmo-bsc/gsm_08_08.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c index 7f54fe6..a5f7493 100644 --- a/src/osmo-bsc/gsm_08_08.c +++ b/src/osmo-bsc/gsm_08_08.c @@ -154,7 +154,7 @@ bool is_emerg = false; if (msgb_l3len(msg) < sizeof(*gh)) { - LOGP(DMSC, LOGL_ERROR, "There is no GSM48 header here.\n"); + LOGP(DRSL, LOGL_ERROR, "There is no GSM48 header here.\n"); return NULL; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18764 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I9c6373e5f28c9c69a0609889188ef28ade11da3d Gerrit-Change-Number: 18764 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: vty: hide 'mscpool roundrobin next'
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18873 ) Change subject: vty: hide 'mscpool roundrobin next' .. vty: hide 'mscpool roundrobin next' The 'mscpool roundrobin next' command is intended for use only by ttcn3 tests. Hide it. Change-Id: Ie8799b61b74cfb34acd5aa4aeb1fb69ae7d216e2 --- M src/osmo-bsc/osmo_bsc_vty.c 1 file changed, 8 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/73/18873/1 diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c index 71dff1b..2c43fd2 100644 --- a/src/osmo-bsc/osmo_bsc_vty.c +++ b/src/osmo-bsc/osmo_bsc_vty.c @@ -939,13 +939,14 @@ return CMD_SUCCESS; } -DEFUN(mscpool_roundrobin_next, mscpool_roundrobin_next_cmd, - "mscpool roundrobin next " MSC_NR_RANGE, - "MSC pooling: load balancing across multiple MSCs.\n" - "Adjust current state of the MSC round-robin algorithm (for testing).\n" - "Set the MSC nr to direct the next new subscriber to (for testing).\n" - "MSC number, as in the config file; if the number does not exist," - " the round-robin continues to the next valid number.\n") +/* Hidden since it exists only for use by ttcn3 tests */ +DEFUN_HIDDEN(mscpool_roundrobin_next, mscpool_roundrobin_next_cmd, +"mscpool roundrobin next " MSC_NR_RANGE, +"MSC pooling: load balancing across multiple MSCs.\n" +"Adjust current state of the MSC round-robin algorithm (for testing).\n" +"Set the MSC nr to direct the next new subscriber to (for testing).\n" +"MSC number, as in the config file; if the number does not exist," +" the round-robin continues to the next valid number.\n") { bsc_gsmnet->mscs_round_robin_next_nr = atoi(argv[0]); return CMD_SUCCESS; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18873 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie8799b61b74cfb34acd5aa4aeb1fb69ae7d216e2 Gerrit-Change-Number: 18873 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in osmo-bsc[master]: use osmo_mobile_identity API everywhere
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18713 ) Change subject: use osmo_mobile_identity API everywhere .. use osmo_mobile_identity API everywhere Depends: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 (libosmocore) Change-Id: I71c3b4c65dbfdfa51409e09d4868aea83225338a --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/paging.c M src/osmo-bsc/pcu_sock.c 7 files changed, 64 insertions(+), 53 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/include/osmocom/bsc/abis_rsl.h b/include/osmocom/bsc/abis_rsl.h index b43e3ae..2611a3d 100644 --- a/include/osmocom/bsc/abis_rsl.h +++ b/include/osmocom/bsc/abis_rsl.h @@ -43,8 +43,9 @@ int rsl_tx_chan_activ(struct gsm_lchan *lchan, uint8_t act_type, uint8_t ho_ref); int rsl_chan_mode_modify_req(struct gsm_lchan *ts); int rsl_encryption_cmd(struct msgb *msg); -int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, uint8_t len, - uint8_t *ms_ident, uint8_t chan_needed, bool is_gprs); +int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, + const struct osmo_mobile_identity *mi, + uint8_t chan_needed, bool is_gprs); int rsl_imm_assign_cmd(struct gsm_bts *bts, uint8_t len, uint8_t *val); int rsl_tx_imm_assignment(struct gsm_lchan *lchan); int rsl_tx_imm_ass_rej(struct gsm_bts *bts, struct gsm48_req_ref *rqd_ref); diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index d34e695..8821251 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -39,7 +39,6 @@ enum gsm48_reject_value value); struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value); -int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_t *mi_type); struct msgb *gsm48_create_loc_upd_rej(uint8_t cause); struct msgb *gsm48_create_rr_status(uint8_t cause); diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 705e759..2fb1a22 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -664,18 +664,29 @@ return abis_rsl_sendmsg(msg); } -int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, uint8_t len, - uint8_t *ms_ident, uint8_t chan_needed, bool is_gprs) +int rsl_paging_cmd(struct gsm_bts *bts, uint8_t paging_group, + const struct osmo_mobile_identity *mi, + uint8_t chan_needed, bool is_gprs) { struct abis_rsl_dchan_hdr *dh; struct msgb *msg = rsl_msgb_alloc(); + uint8_t *l; + int rc; dh = (struct abis_rsl_dchan_hdr *) msgb_put(msg, sizeof(*dh)); init_dchan_hdr(dh, RSL_MT_PAGING_CMD); dh->chan_nr = RSL_CHAN_PCH_AGCH; msgb_tv_put(msg, RSL_IE_PAGING_GROUP, paging_group); - msgb_tlv_put(msg, RSL_IE_MS_IDENTITY, len-2, ms_ident+2); + + l = msgb_tl_put(msg, RSL_IE_MS_IDENTITY); + rc = osmo_mobile_identity_encode_msgb(msg, mi, false); + if (rc < 0) { + msgb_free(msg); + return -EINVAL; + } + *l = rc; + msgb_tv_put(msg, RSL_IE_CHAN_NEEDED, chan_needed); /* Ericsson wants to have this IE in case a paging message diff --git a/src/osmo-bsc/gsm_04_08_rr.c b/src/osmo-bsc/gsm_04_08_rr.c index 4630b47..8a74aab 100644 --- a/src/osmo-bsc/gsm_04_08_rr.c +++ b/src/osmo-bsc/gsm_04_08_rr.c @@ -828,20 +828,6 @@ return msg; } -int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_t *mi_type) -{ - /* Check the size for the classmark */ - if (length < 1 + *classmark2_lv) - return -1; - - uint8_t *mi_lv = classmark2_lv + *classmark2_lv + 1; - if (length < 2 + *classmark2_lv + mi_lv[0]) - return -2; - - *mi_type = mi_lv[1] & GSM_MI_TYPE_MASK; - return gsm48_mi_to_string(mi_string, GSM48_MI_SIZE, mi_lv+1, *mi_lv); -} - /* As per TS 03.03 Section 2.2, the IMSI has 'not more than 15 digits' */ uint64_t str_to_imsi(const char *imsi_str) { diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 864d96d..6b225e4 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -293,7 +293,7 @@ struct msgb *msg, unsigned int payload_length) { struct tlv_parsed tp; - char mi_string[GSM48_MI_SIZE]; + struct osmo_mobile_identity mi_imsi; uint32_t tmsi = GSM_RESERVED_TMSI; uint8_t data_length; int remain; @@ -332,8 +332,11 @@ /* * parse the IMSI */ - gsm48_mi_to_string(mi_string, sizeof(mi_string), - TLVP_VAL(, GSM0808_IE_IMSI), TLVP_LEN(,
Change in osmo-bsc[master]: remove extract_sub(), add bsc_subscr_find_or_create_by_mi()
neels has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18712 ) Change subject: remove extract_sub(), add bsc_subscr_find_or_create_by_mi() .. remove extract_sub(), add bsc_subscr_find_or_create_by_mi() Use the new osmo_mobile_identity API to shed some code dup and simplify. gsm48_paging_extract_mi() is now unused, drop. (More refactoring to use osmo_mobile_identity follows in subsequent patch.) Depends: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 (libosmocore) Change-Id: Id6cccaac64392b737b3bba8f3a22a88009adb23b --- M TODO-RELEASE M include/osmocom/bsc/bsc_subscriber.h M include/osmocom/bsc/gsm_04_08_rr.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscriber.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c 7 files changed, 55 insertions(+), 58 deletions(-) Approvals: Jenkins Builder: Verified neels: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index e2fa427..b822f8a 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,5 @@ libosmocorestruct gsm0808_diagnostics Depends on libosmocore > 1.3.0 libosmocoregsm0808_diagnostics_octet_location_str()Depends on libosmocore > 1.3.0 libosmocoregsm0808_diagnostics_bit_location_str() Depends on libosmocore > 1.3.0 +libosmocoreosmo_mobile_identityDepends on libosmocore > 1.3.0 +osmo-bsc Mobile Identity Coding OsmoBSC is stricter in rejecting invalid coding of Mobile Identity IEs diff --git a/include/osmocom/bsc/bsc_subscriber.h b/include/osmocom/bsc/bsc_subscriber.h index 93b3539..53fa7be 100644 --- a/include/osmocom/bsc/bsc_subscriber.h +++ b/include/osmocom/bsc/bsc_subscriber.h @@ -6,6 +6,7 @@ #include #include +#include struct log_target; @@ -25,11 +26,13 @@ const char *imsi); struct bsc_subscr *bsc_subscr_find_or_create_by_tmsi(struct llist_head *list, uint32_t tmsi); +struct bsc_subscr *bsc_subscr_find_or_create_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi); struct bsc_subscr *bsc_subscr_find_by_imsi(struct llist_head *list, const char *imsi); struct bsc_subscr *bsc_subscr_find_by_tmsi(struct llist_head *list, uint32_t tmsi); +struct bsc_subscr *bsc_subscr_find_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi); void bsc_subscr_set_imsi(struct bsc_subscr *bsub, const char *imsi); diff --git a/include/osmocom/bsc/gsm_04_08_rr.h b/include/osmocom/bsc/gsm_04_08_rr.h index 06cefa9..d34e695 100644 --- a/include/osmocom/bsc/gsm_04_08_rr.h +++ b/include/osmocom/bsc/gsm_04_08_rr.h @@ -40,8 +40,6 @@ struct msgb *gsm48_create_mm_serv_rej(enum gsm48_reject_value value); int gsm48_extract_mi(uint8_t *classmark2_lv, int length, char *mi_string, uint8_t *mi_type); -int gsm48_paging_extract_mi(struct gsm48_pag_resp *resp, int length, - char *mi_string, uint8_t *mi_type); struct msgb *gsm48_create_loc_upd_rej(uint8_t cause); struct msgb *gsm48_create_rr_status(uint8_t cause); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index be7c575..bc4c017 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -52,8 +52,6 @@ #define OBSC_LINKID_CB(__msgb) (__msgb)->cb[3] -#define tmsi_from_string(str) strtoul(str, NULL, 10) - /* 3-bit long values */ #define EARFCN_PRIO_INVALID 8 #define EARFCN_MEAS_BW_INVALID 8 diff --git a/src/osmo-bsc/bsc_subscriber.c b/src/osmo-bsc/bsc_subscriber.c index 38b532a..9ddfcaa 100644 --- a/src/osmo-bsc/bsc_subscriber.c +++ b/src/osmo-bsc/bsc_subscriber.c @@ -75,6 +75,20 @@ return NULL; } +struct bsc_subscr *bsc_subscr_find_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi) +{ + if (!mi) + return NULL; + switch (mi->type) { + case GSM_MI_TYPE_IMSI: + return bsc_subscr_find_by_imsi(list, mi->imsi); + case GSM_MI_TYPE_TMSI: + return bsc_subscr_find_by_tmsi(list, mi->tmsi); + default: + return NULL; + } +} + void bsc_subscr_set_imsi(struct bsc_subscr *bsub, const char *imsi) { if (!bsub) @@ -110,6 +124,20 @@ return bsc_subscr_get(bsub); } +struct bsc_subscr *bsc_subscr_find_or_create_by_mi(struct llist_head *list, const struct osmo_mobile_identity *mi) +{ + if (!mi) + return NULL; + switch (mi->type) { + case GSM_MI_TYPE_IMSI: + return bsc_subscr_find_or_create_by_imsi(list, mi->imsi); + case GSM_MI_TYPE_TMSI: + return bsc_subscr_find_or_create_by_tmsi(list, mi->tmsi); + default: + return NULL; + } +} + const char *bsc_subscr_name(struct bsc_subscr *bsub) { static char buf[32]; diff --git
Change in osmo-bsc[master]: vty: add 'mscpool roundrobin next' for ttcn3 tests
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18767 ) Change subject: vty: add 'mscpool roundrobin next' for ttcn3 tests .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18767/6/src/osmo-bsc/osmo_bsc_vty.c File src/osmo-bsc/osmo_bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/18767/6/src/osmo-bsc/osmo_bsc_vty.c@942 PS6, Line 942: DEFUN(mscpool_roundrobin_next, mscpool_roundrobin_next_cmd, > Then again, if sysadmins would like to test a specific MSC, maybe it is > useful to know that this com […] placing the change in a separate patch so we can decide later -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2155d906505a26744966f442ffb1e87a6a9b494c Gerrit-Change-Number: 18767 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 22:00:37 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bsc[master]: mscpool: add user manual chapter
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18779 ) Change subject: mscpool: add user manual chapter .. Patch Set 5: Code-Review+2 combining 2x +1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia60afc8a91189c9de0d8e8065781ed463bf18d7e Gerrit-Change-Number: 18779 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 21:49:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: vty: add 'mscpool roundrobin next' for ttcn3 tests
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18767 ) Change subject: vty: add 'mscpool roundrobin next' for ttcn3 tests .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18767/6/src/osmo-bsc/osmo_bsc_vty.c File src/osmo-bsc/osmo_bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/18767/6/src/osmo-bsc/osmo_bsc_vty.c@942 PS6, Line 942: DEFUN(mscpool_roundrobin_next, mscpool_roundrobin_next_cmd, > maybe make that a hidden command with DEFUN_HIDDEN ? It's not something a > normal user should ever us […] Then again, if sysadmins would like to test a specific MSC, maybe it is useful to know that this command exists? (I've got the 'HIDDEN' patch set ready to submit, but now reconsidering) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2155d906505a26744966f442ffb1e87a6a9b494c Gerrit-Change-Number: 18767 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 21:54:12 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bsc[master]: MSC pooling: make NRI mappings VTY configurable
Hello dexter, pespin, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 to look at the new patch set (#5). Change subject: MSC pooling: make NRI mappings VTY configurable .. MSC pooling: make NRI mappings VTY configurable Use the osmo_nri_ranges API to manage each MSC's NRI ranges by VTY configuration. Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 --- M include/osmocom/bsc/bsc_msc_data.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_vty.c M src/osmo-bsc/net_init.c M src/osmo-bsc/osmo_bsc_msc.c M src/osmo-bsc/osmo_bsc_vty.c A tests/nri_cfg.vty 7 files changed, 368 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/65/18765/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 Gerrit-Change-Number: 18765 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmocom-bb[master]: trxcon/scheduler: cosmetic: use enumerated type instead of uint8_t
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18870 ) Change subject: trxcon/scheduler: cosmetic: use enumerated type instead of uint8_t .. trxcon/scheduler: cosmetic: use enumerated type instead of uint8_t Change-Id: Idde328d176b4cbd89c62712e4a247095dd596105 --- M src/host/trxcon/scheduler.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/70/18870/1 diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index 36c64e5..3a97e9d 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -33,7 +33,7 @@ /*! \brief One scheduler instance */ struct trx_sched { /*! \brief Clock state */ - uint8_t state; + enum tdma_sched_clck_state state; /*! \brief Local clock source */ struct timespec clock; /*! \brief Count of processed frames */ -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/18870 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idde328d176b4cbd89c62712e4a247095dd596105 Gerrit-Change-Number: 18870 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmocom-bb[master]: trxcon/scheduler: cosmetic: clarify lost frame counter description
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18871 ) Change subject: trxcon/scheduler: cosmetic: clarify lost frame counter description .. trxcon/scheduler: cosmetic: clarify lost frame counter description Change-Id: Ied5ea8524f2ec6c324e9fd37256111d099c23e6c --- M src/host/trxcon/scheduler.h 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/71/18871/1 diff --git a/src/host/trxcon/scheduler.h b/src/host/trxcon/scheduler.h index 3a97e9d..e3c0cb0 100644 --- a/src/host/trxcon/scheduler.h +++ b/src/host/trxcon/scheduler.h @@ -40,7 +40,7 @@ uint32_t fn_counter_proc; /*! \brief Local frame counter advance */ uint32_t fn_counter_advance; - /*! \brief Frame counter */ + /*! \brief Count of lost frames */ uint32_t fn_counter_lost; /*! \brief Frame callback timer */ struct osmo_timer_list clock_timer; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/18871 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ied5ea8524f2ec6c324e9fd37256111d099c23e6c Gerrit-Change-Number: 18871 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmocom-bb[master]: trxcon: use libosmocore's TDMA frame number API
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/18872 ) Change subject: trxcon: use libosmocore's TDMA frame number API .. trxcon: use libosmocore's TDMA frame number API Depends: (libosmocore) Ic291fd3644f34964374227a191c7045d79d77e0d Change-Id: I49a043d8483e116cf2d91820edb511846175173f --- M src/host/trxcon/l1ctl.c M src/host/trxcon/sched_clck.c M src/host/trxcon/sched_lchan_tchh.c M src/host/trxcon/sched_trx.c M src/host/trxcon/scheduler.h 5 files changed, 22 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/72/18872/1 diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c index 192cdd1..aec304f 100644 --- a/src/host/trxcon/l1ctl.c +++ b/src/host/trxcon/l1ctl.c @@ -370,9 +370,9 @@ /* Start FBSB expire timer */ l1l->fbsb_timer.data = l1l; l1l->fbsb_timer.cb = fbsb_timer_cb; - LOGP(DL1C, LOGL_INFO, "Starting FBSB timer %u ms\n", timeout * FRAME_DURATION_uS / 1000); + LOGP(DL1C, LOGL_INFO, "Starting FBSB timer %u ms\n", timeout * GSM_TDMA_FN_DURATION_uS / 1000); osmo_timer_schedule(>fbsb_timer, 0, - timeout * FRAME_DURATION_uS); + timeout * GSM_TDMA_FN_DURATION_uS); exit: msgb_free(msg); diff --git a/src/host/trxcon/sched_clck.c b/src/host/trxcon/sched_clck.c index 7c814dc..9476ccd 100644 --- a/src/host/trxcon/sched_clck.c +++ b/src/host/trxcon/sched_clck.c @@ -50,7 +50,7 @@ struct trx_sched *sched = (struct trx_sched *) data; struct timespec tv_now, *tv_clock, elapsed; int64_t elapsed_us; - const struct timespec frame_duration = { .tv_sec = 0, .tv_nsec = FRAME_DURATION_uS * 1000 }; + const struct timespec frame_duration = { .tv_sec = 0, .tv_nsec = GSM_TDMA_FN_DURATION_nS }; /* Check if transceiver is still alive */ if (sched->fn_counter_lost++ == TRX_LOSS_FRAMES) { @@ -68,7 +68,7 @@ elapsed_us = (elapsed.tv_sec * 100) + (elapsed.tv_nsec / 1000); /* If someone played with clock, or if the process stalled */ - if (elapsed_us > FRAME_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { + if (elapsed_us > GSM_TDMA_FN_DURATION_uS * MAX_FN_SKEW || elapsed_us < 0) { LOGP(DSCH, LOGL_NOTICE, "PC clock skew: " "elapsed uS %" PRId64 "\n", elapsed_us); @@ -78,11 +78,11 @@ } /* Schedule next FN clock */ - while (elapsed_us > FRAME_DURATION_uS / 2) { + while (elapsed_us > GSM_TDMA_FN_DURATION_uS / 2) { timespecadd(tv_clock, _duration, tv_clock); - elapsed_us -= FRAME_DURATION_uS; + elapsed_us -= GSM_TDMA_FN_DURATION_uS; - TDMA_FN_INC(>fn_counter_proc); + GSM_TDMA_FN_INC(sched->fn_counter_proc); /* Call frame callback */ if (sched->clock_cb) @@ -90,7 +90,7 @@ } osmo_timer_schedule(>clock_timer, 0, - FRAME_DURATION_uS - elapsed_us); + GSM_TDMA_FN_DURATION_uS - elapsed_us); } static void sched_clck_correct(struct trx_sched *sched, @@ -108,7 +108,7 @@ sched->clock_timer.cb = sched_clck_tick; sched->clock_timer.data = sched; - osmo_timer_schedule(>clock_timer, 0, FRAME_DURATION_uS); + osmo_timer_schedule(>clock_timer, 0, GSM_TDMA_FN_DURATION_uS); } int sched_clck_handle(struct trx_sched *sched, uint32_t fn) @@ -140,10 +140,10 @@ /* Calculate elapsed time / frames since last processed fn */ timespecsub(_now, tv_clock, ); elapsed_us = (elapsed.tv_sec * 100) + (elapsed.tv_nsec / 1000); - elapsed_fn = TDMA_FN_SUB(fn, sched->fn_counter_proc); + elapsed_fn = GSM_TDMA_FN_SUB(fn, sched->fn_counter_proc); if (elapsed_fn >= 135774) - elapsed_fn -= GSM_HYPERFRAME; + elapsed_fn -= GSM_TDMA_HYPERFRAME; /* Check for max clock skew */ if (elapsed_fn > MAX_FN_SKEW || elapsed_fn < -MAX_FN_SKEW) { @@ -155,7 +155,7 @@ } LOGP(DSCH, LOGL_INFO, "GSM clock jitter: %" PRId64 "\n", - elapsed_fn * FRAME_DURATION_uS - elapsed_us); + elapsed_fn * GSM_TDMA_FN_DURATION_uS - elapsed_us); /* Too many frames have been processed already */ if (elapsed_fn < 0) { @@ -164,21 +164,21 @@ * Set clock to the time or last FN should * have been transmitted */ - duration.tv_nsec = (0 - elapsed_fn) * FRAME_DURATION_uS * 1000; + duration.tv_nsec = (0 - elapsed_fn) * GSM_TDMA_FN_DURATION_nS; duration.tv_sec = duration.tv_nsec / 10; duration.tv_nsec = duration.tv_nsec % 10; timespecadd(_now, , tv_clock); /* Set time to the time our next FN has to be transmitted */
Change in libosmocore[master]: gsm0502: add TDMA frame number constants and modular arithmetic
Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/18869 to look at the new patch set (#2). Change subject: gsm0502: add TDMA frame number constants and modular arithmetic .. gsm0502: add TDMA frame number constants and modular arithmetic These TDMA constatns and modular arithmetic operations are used in a number of osmo-* projects, so it makes sense to have them all in a single header file, with minimalistic documentation. Change-Id: Ic291fd3644f34964374227a191c7045d79d77e0d --- M include/osmocom/gsm/gsm0502.h 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/18869/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic291fd3644f34964374227a191c7045d79d77e0d Gerrit-Change-Number: 18869 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: MSC pooling: make NRI mappings VTY configurable
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18765 ) Change subject: MSC pooling: make NRI mappings VTY configurable .. Patch Set 4: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18765/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/18765/3/src/osmo-bsc/bsc_vty.c@2094 PS3, Line 2094: FIRST [LAST] > I'm not sure if this FIRST / LAST (generic variables that accept any kind of > string) is the best her […] I thought allowing hex is a neat idea, because you're dividing a number of MSC across a range of bits. So I thought one would assign 0-0x0ff and 0x100-0x2ff and so on. But of course dividing the range isn't always by a power of two, and writing those back in integer is a quirk. Yet this case is not like common vty range checking because the nri-bitlen is configurable: even if the vty says <0-32767> we will normally have only <0-1023> allowed (nri-bitlen == 10). I'm a bit undecided... what is more clear? nri add <0-32767> <0-32767> NRI_STR "add\n" "First value of NRI range, should be a number within nri-bitlen\n" "Last...\n" or nri add FIRST LAST I notice that the current patch also fails to explain the ranges... ...well, yeah, best remove ambiguity of hex vs decimal, it's a non-feature -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 Gerrit-Change-Number: 18765 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 21:27:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge Gerrit-MessageType: comment
Change in osmo-bsc[master]: use osmo_mobile_identity API everywhere
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18713 ) Change subject: use osmo_mobile_identity API everywhere .. Patch Set 5: Code-Review+2 re-apply +2: only diff is the 'Depends:' change-id in commit log -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71c3b4c65dbfdfa51409e09d4868aea83225338a Gerrit-Change-Number: 18713 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 21:15:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: remove extract_sub(), add bsc_subscr_find_or_create_by_mi()
neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18712 ) Change subject: remove extract_sub(), add bsc_subscr_find_or_create_by_mi() .. Patch Set 4: Code-Review+2 re-apply +2: only diff in new patch set is the Depends in the commit log and an added entry in TODO-RELEASE -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6cccaac64392b737b3bba8f3a22a88009adb23b Gerrit-Change-Number: 18712 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 21:14:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm0502: add TDMA frame number constants and modular arithmetic
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/18869 ) Change subject: gsm0502: add TDMA frame number constants and modular arithmetic .. gsm0502: add TDMA frame number constants and modular arithmetic These TDMA constatns and modular arithmetic operations are used in a number of osmo-* projects, so it makes sense to have them all in a single header file, with minimalistic documentation. Change-Id: Ic291fd3644f34964374227a191c7045d79d77e0d --- M include/osmocom/gsm/gsm0502.h 1 file changed, 24 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/69/18869/1 diff --git a/include/osmocom/gsm/gsm0502.h b/include/osmocom/gsm/gsm0502.h index cb993dc..189eab0 100644 --- a/include/osmocom/gsm/gsm0502.h +++ b/include/osmocom/gsm/gsm0502.h @@ -7,6 +7,30 @@ #include #include +/* 4.3.3 TDMA frame number : constants and modular arithmetic */ +#define GSM_TDMA_FN_DURATION_nS4615384 /* in 1e−9 seconds (approx) */ +#define GSM_TDMA_FN_DURATION_uS4615/* in 1e-6 seconds (approx) */ + +#define GSM_TDMA_SUPERFRAME(26 * 51) +#define GSM_TDMA_HYPERFRAME(2048 * GSM_TDMA_SUPERFRAME) + +/*! Return the sum of two specified TDMA frame numbers (summation) */ +#define GSM_TDMA_FN_SUM(a, b) \ + ((a + b) % GSM_TDMA_HYPERFRAME) +/*! Return the difference of two specified TDMA frame numbers (subtraction) */ +#define GSM_TDMA_FN_SUB(a, b) \ + ((a + GSM_TDMA_HYPERFRAME - b) % GSM_TDMA_HYPERFRAME) +/*! Return the *minimum* difference of two specified TDMA frame numbers (distance) */ +#define GSM_TDMA_FN_DIFF(a, b) \ + OSMO_MIN(GSM_TDMA_FN_SUB(a, b), GSM_TDMA_FN_SUB(b, a)) + +/*! Increment the given TDMA frame number by 1 and return the result (like ++fn) */ +#define GSM_TDMA_FN_INC(fn) \ + (fn = GSM_TDMA_FN_SUM(fn, 1)) +/*! Decrement the given TDMA frame number by 1 and return the result (like --fn) */ +#define GSM_TDMA_FN_DEC(fn) \ + (fn = GSM_TDMA_FN_SUB(fn, 1)) + /* Table 5 Clause 7 TS 05.02 */ static inline unsigned int gsm0502_get_n_pag_blocks(struct gsm48_control_channel_descr *chan_desc) -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18869 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic291fd3644f34964374227a191c7045d79d77e0d Gerrit-Change-Number: 18869 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-sgsn[master]: use new osmo_mobile_identity API everywhere
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/18716 ) Change subject: use new osmo_mobile_identity API everywhere .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/18716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4cacb10bac419633ca0c14f244f9903f7f517b49 Gerrit-Change-Number: 18716 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 19:50:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-msc[master]: msc_vlr_test_gsm_ciph.c: fix IMEISV MI: even number of digits, clear ...
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/18714 ) Change subject: msc_vlr_test_gsm_ciph.c: fix IMEISV MI: even number of digits, clear odd bit .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18714 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ib1d54c59acc8b716de471ca275f54f9d22da3574 Gerrit-Change-Number: 18714 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 19:46:20 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm0408_test: allow deprecated API
laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18859 ) Change subject: gsm0408_test: allow deprecated API .. gsm0408_test: allow deprecated API This test knowingly calls deprecated functions -- allow that to squelch these warnings: warning: ‘gsm48_generate_lai’ is deprecated: Use gsm48_generate_lai2() instead, to not lose leading zeros in the MNC [-Wdeprecated-declarations] warning: ‘gsm48_decode_lai’ is deprecated: Use gsm48_decode_lai2() instead, to not lose leading zeros in the MNC [-Wdeprecated-declarations] Change-Id: Ifd618c1b9befa9c9ef0a338ab4aae2b0f796f4c2 --- M tests/gsm0408/gsm0408_test.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 6fef186..d2ae6f6 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -18,6 +18,8 @@ * */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include #include #include -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd618c1b9befa9c9ef0a338ab4aae2b0f796f4c2 Gerrit-Change-Number: 18859 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in libosmocore[master]: gsm0408_test: allow deprecated API
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18859 ) Change subject: gsm0408_test: allow deprecated API .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd618c1b9befa9c9ef0a338ab4aae2b0f796f4c2 Gerrit-Change-Number: 18859 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 19:44:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: epc: add option to enable dedicated bearers
srs_andre has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 ) Change subject: epc: add option to enable dedicated bearers .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865/1/sysmocom/defaults.conf File sysmocom/defaults.conf: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865/1/sysmocom/defaults.conf@101 PS1, Line 101: add_dedicated_bearer: false > afaict this is Amarisoft specific so it should go into amarisoftepc? true, we will add support to srsENB but not srsEPC. Not sure how your nextEPC plans are but it I think they also support dedicated bearer. -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If45cb7e15c8595164b8f537a390507927492c660 Gerrit-Change-Number: 18865 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 19:27:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: Change default for clock_advance to 2
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17766 ) Change subject: osmo-bts-trx: Change default for clock_advance to 2 .. Patch Set 2: Maybe we should also make sure that the new defaults are good enough for embedded setups based on e.g. Raspberry Pi? AFAIU, this patch was only tested on relatively powerful x86-64 so far. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7da3d0948f38e12342fb714b29f8edc5e9d0933d Gerrit-Change-Number: 17766 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 19:21:23 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about Dl block not found
Hello fixeria, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18863 to look at the new patch set (#2). Change subject: scheduler: Add rate_ctr informing about Dl block not found .. scheduler: Add rate_ctr informing about Dl block not found Together with previous counter L1SCHED_TS_CTR_DL_LATE, it allows understanding which dl blocks are really lost (never queued) and which were simply queued too late. Change-Id: I456d0cfbef1e03b147ce7d968a3ec42dd728fe74 --- M src/common/scheduler.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/18863/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I456d0cfbef1e03b147ce7d968a3ec42dd728fe74 Gerrit-Change-Number: 18863 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about too low rts-advance
Hello fixeria, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/18862 to look at the new patch set (#2). Change subject: scheduler: Add rate_ctr informing about too low rts-advance .. scheduler: Add rate_ctr informing about too low rts-advance Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/18862/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05 Gerrit-Change-Number: 18862 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor goto paths
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18860 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor goto paths .. Patch Set 1: Code-Review+2 +1+1=+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 Gerrit-Change-Number: 18860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 18:41:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor goto paths
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18860 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor goto paths .. scheduler: _sched_dequeue_prim(): Refactor goto paths Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 --- M src/common/scheduler.c 1 file changed, 9 insertions(+), 7 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 86978eb..ed7d412 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -643,13 +643,8 @@ llist_for_each_entry_safe(msg, msg2, >dl_prims, list) { l1sap = msgb_l1sap_prim(msg); if (l1sap->oph.operation != PRIM_OP_REQUEST) { -wrong_type: LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n"); -free_msg: - /* unlink and free message */ - llist_del(>list); - msgb_free(msg); - return NULL; + goto free_msg; } switch (l1sap->oph.primitive) { case PRIM_PH_DATA: @@ -663,7 +658,8 @@ l1sap_fn = l1sap->u.tch.fn; break; default: - goto wrong_type; + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n"); + goto free_msg; } prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); if (prim_fn > 100) { /* l1sap_fn < fn */ @@ -700,6 +696,12 @@ /* unlink and return message */ llist_del(>list); return msg; + +free_msg: + /* unlink and free message */ + llist_del(>list); + msgb_free(msg); + return NULL; } int _sched_compose_ph_data_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 Gerrit-Change-Number: 18860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor goto paths
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18860 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor goto paths .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18860/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/18860/1/src/common/scheduler.c@647 PS1, Line 647: goto free_msg; > Using OTC_SELECT would allow us not to care about message de-allocation on > every possible error. Let's avoid OTC_SELECT at least in osmo-pcu, osmo-bts and osmo-trx, that's my opinion :) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 Gerrit-Change-Number: 18860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 18:38:45 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about not Dl block not found
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18863 ) Change subject: scheduler: Add rate_ctr informing about not Dl block not found .. Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/18863/1//COMMIT_MSG Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/18863/1//COMMIT_MSG@7 PS1, Line 7: not Dl block not found no no no, double negation is in Russian, but not in English! ;) Maybe rather "... no DL block found"? P.S. In Russian it's normal to say "I have not found nothing", and this means "I found nothing". https://gerrit.osmocom.org/c/osmo-bts/+/18863/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/18863/1/src/common/scheduler.c@575 PS1, Line 575: Downlink frame not found while scheduling Maybe "No Downlink frame found for scheduling"? https://gerrit.osmocom.org/c/osmo-bts/+/18863/1/src/common/scheduler.c@704 PS1, Line 704: goto not_found; Just do 'break' here, rather than making the code even more "assemblish". -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I456d0cfbef1e03b147ce7d968a3ec42dd728fe74 Gerrit-Change-Number: 18863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 18:37:05 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18861 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path .. Patch Set 1: Code-Review+1 > fixeria is restructuring large parts of the osmo-bts-trx code ... I was planning to refactor a lot, and already submitted some changes, but when I finally wrapped my head around the concept of baseband frequency hopping and got the first results, I realized that we can keep the same code structure / hierarchy. So feel free to merge it, this patch is not breaking anything for me ;) Thanks for considering potential merge/rebase conflicts anyway! -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5 Gerrit-Change-Number: 18861 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 18:28:27 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about too low rts-advance
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18862 ) Change subject: scheduler: Add rate_ctr informing about too low rts-advance .. Patch Set 1: (3 comments) https://gerrit.osmocom.org/c/osmo-bts/+/18862/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/18862/1/src/common/scheduler.c@573 PS1, Line 573: prepared This sounds confusing. Maybe rather "... arrived too late"? https://gerrit.osmocom.org/c/osmo-bts/+/18862/1/src/common/scheduler.c@603 PS1, Line 603: 100 It can be just 10, because a single transceiver cannot have more than 8 timeslots. Not critical. https://gerrit.osmocom.org/c/osmo-bts/+/18862/1/src/common/scheduler.c@695 PS1, Line 695: rate_ctr_inc2 Wrong spacing. Please do <<. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05 Gerrit-Change-Number: 18862 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 18:23:49 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor goto paths
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18860 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor goto paths .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-bts/+/18860/1/src/common/scheduler.c File src/common/scheduler.c: https://gerrit.osmocom.org/c/osmo-bts/+/18860/1/src/common/scheduler.c@647 PS1, Line 647: goto free_msg; Using OTC_SELECT would allow us not to care about message de-allocation on every possible error. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 Gerrit-Change-Number: 18860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 18:11:17 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: sgsn_libgtp: Improve ps-paging logging
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/18868 ) Change subject: sgsn_libgtp: Improve ps-paging logging .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/c/osmo-sgsn/+/18868/1/src/sgsn/sgsn_libgtp.c File src/sgsn/sgsn_libgtp.c: https://gerrit.osmocom.org/c/osmo-sgsn/+/18868/1/src/sgsn/sgsn_libgtp.c@671 PS1, Line 671: gb.mm_state_fsm Hmm, there is also 'iu.mm_state_fsm'. I am wondering why it's not handled here... -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/18868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0c3d48d54295824c3ba5b0fa9e3c035983556326 Gerrit-Change-Number: 18868 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 16 Jun 2020 18:06:48 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: gsm0408_test: allow deprecated API
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18859 ) Change subject: gsm0408_test: allow deprecated API .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd618c1b9befa9c9ef0a338ab4aae2b0f796f4c2 Gerrit-Change-Number: 18859 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 17:53:32 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-sgsn[master]: sgsn_libgtp: Improve ps-paging logging
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/18868 ) Change subject: sgsn_libgtp: Improve ps-paging logging .. sgsn_libgtp: Improve ps-paging logging Change-Id: I0c3d48d54295824c3ba5b0fa9e3c035983556326 --- M src/sgsn/sgsn_libgtp.c 1 file changed, 7 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/68/18868/1 diff --git a/src/sgsn/sgsn_libgtp.c b/src/sgsn/sgsn_libgtp.c index 7b46476..717df4a 100644 --- a/src/sgsn/sgsn_libgtp.c +++ b/src/sgsn/sgsn_libgtp.c @@ -661,13 +661,19 @@ switch (mm->gmm_fsm->state) { case ST_GMM_REGISTERED_SUSPENDED: /* initiate PS PAGING procedure */ + LOGMMCTXP(LOGL_INFO, mm, "Paging MS in GMM state %s\n", + osmo_fsm_inst_state_name(mm->gmm_fsm)); gprs_gb_page_ps_ra(mm); /* FIXME: queue the packet we received from GTP */ break; case ST_GMM_REGISTERED_NORMAL: OSMO_ASSERT(mm->gb.mm_state_fsm->state != ST_MM_IDLE); - if (mm->gb.mm_state_fsm->state == ST_MM_STANDBY) + if (mm->gb.mm_state_fsm->state == ST_MM_STANDBY) { + LOGMMCTXP(LOGL_INFO, mm, "Paging MS in GMM state %s, MM state %s\n", + osmo_fsm_inst_state_name(mm->gmm_fsm), + osmo_fsm_inst_state_name(mm->gb.mm_state_fsm)); gprs_gb_page_ps_ra(mm); + } /* FIXME: queue the packet we received from GTP */ break; -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/18868 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I0c3d48d54295824c3ba5b0fa9e3c035983556326 Gerrit-Change-Number: 18868 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-trx: Change default for clock_advance to 2
pespin has uploaded a new patch set (#2) to the change originally created by daniel. ( https://gerrit.osmocom.org/c/osmo-bts/+/17766 ) Change subject: osmo-bts-trx: Change default for clock_advance to 2 .. osmo-bts-trx: Change default for clock_advance to 2 osmotrx fn-advance (which is the clock_advance variable here) and osmotrx rtx-advance together make up the minimum delay the BTS can react to a channel request, etc. The default of 25 are around 115ms which is clearly too much. With modern hardware and using SCHED_RR a lower value should not be an issue. Fixes: OS#4487 Fixes: SYS#4885 Change-Id: I7da3d0948f38e12342fb714b29f8edc5e9d0933d Related: SYS#4881 --- M doc/manuals/chapters/bts-models.adoc M src/osmo-bts-trx/main.c 2 files changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/66/17766/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7da3d0948f38e12342fb714b29f8edc5e9d0933d Gerrit-Change-Number: 17766 Gerrit-PatchSet: 2 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18857 ) Change subject: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases .. scheduler: Early return in _sched_dequeue_prim() and clarify FN cases We should always expect the msgb queue to be ordered by FN, so there's no use in continue traversing the queue after we found a later primitive than the one at current time, since next onews will be even more in the future. Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d --- M src/common/scheduler.c 1 file changed, 4 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e1e7c95..86978eb 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -666,7 +666,7 @@ goto wrong_type; } prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); - if (prim_fn > 100) { + if (prim_fn > 100) { /* l1sap_fn < fn */ LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, "Prim %u is out of range (%u vs exp %u), or channel %s with " "type %s is already disabled. If this happens in " @@ -679,9 +679,10 @@ msgb_free(msg); continue; } - if (prim_fn > 0) - continue; + if (prim_fn > 0) /* l1sap_fn > fn */ + return NULL; + /* l1sap_fn == fn */ goto found_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d Gerrit-Change-Number: 18857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18861 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path .. Patch Set 1: > Patch Set 1: > > I'm not against those patches, but I'm wondering why there they are leading > and why they are done while it is known that fixeria is restructuring large > parts of the osmo-bts-trx code to support baseband frequency hopping They lead towards: * Making function more understandable and avoig hoping up and down * Making more rational return paths... * ... which helps in adding rate counters... * ... which helps in understanding timing issues with regards to fn-advance and rts-advance. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5 Gerrit-Change-Number: 18861 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:43:45 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: Change default for clock_advance to 3
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17766 ) Change subject: osmo-bts-trx: Change default for clock_advance to 3 .. Patch Set 1: The PDCH situation improved by using SCHED_RR on osmo-pcu (it's the only one I was not using with realtime prio), and as well using a less verbose logging level (I had specially RLCMAC really verbose and compute intensive logging enabled). So all in all I think decreasing fn-advance to 2 is fine, but I'd leave rts-advance to 5. due to the above mentioned reasons. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7da3d0948f38e12342fb714b29f8edc5e9d0933d Gerrit-Change-Number: 17766 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 16:38:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in libosmocore[master]: add osmo_mobile_identity API
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/18858 ) Change subject: add osmo_mobile_identity API .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 Gerrit-Change-Number: 18858 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:30:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about not Dl block not found
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18863 ) Change subject: scheduler: Add rate_ctr informing about not Dl block not found .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I456d0cfbef1e03b147ce7d968a3ec42dd728fe74 Gerrit-Change-Number: 18863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:27:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18861 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path .. Patch Set 1: I'm not against those patches, but I'm wondering why there they are leading and why they are done while it is known that fixeria is restructuring large parts of the osmo-bts-trx code to support baseband frequency hopping -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5 Gerrit-Change-Number: 18861 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:26:42 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about too low rts-advance
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18862 ) Change subject: scheduler: Add rate_ctr informing about too low rts-advance .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05 Gerrit-Change-Number: 18862 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:27:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor goto paths
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18860 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor goto paths .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 Gerrit-Change-Number: 18860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:25:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18857 ) Change subject: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d Gerrit-Change-Number: 18857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 16:24:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: iperf3: add getter to read the actual run time of an iperf client run
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18866 ) Change subject: iperf3: add getter to read the actual run time of an iperf client run .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I484a0add322ffd269a1e9df72a00cf348950b268 Gerrit-Change-Number: 18866 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 16 Jun 2020 15:04:33 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb: add getter for number of cells of an eNB
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18867 ) Change subject: enb: add getter for number of cells of an eNB .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If641993033eb5dcdc6e2d6afdc8426ed322241ca Gerrit-Change-Number: 18867 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 15:05:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: epc: add option to enable dedicated bearers
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 ) Change subject: epc: add option to enable dedicated bearers .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865/1/sysmocom/defaults.conf File sysmocom/defaults.conf: https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865/1/sysmocom/defaults.conf@101 PS1, Line 101: add_dedicated_bearer: false afaict this is Amarisoft specific so it should go into amarisoftepc? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If45cb7e15c8595164b8f537a390507927492c660 Gerrit-Change-Number: 18865 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 15:03:28 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: epc: add option to enable dedicated bearers
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 ) Change subject: epc: add option to enable dedicated bearers .. Patch Set 1: Why not have it always there? -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If45cb7e15c8595164b8f537a390507927492c660 Gerrit-Change-Number: 18865 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 15:02:58 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: amarisoft_enb.cfg.tmpl: expose log options
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18864 ) Change subject: amarisoft_enb.cfg.tmpl: expose log options .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Iecd24afe6b242fbebc8463c9e1fa1c3b60b27d01 Gerrit-Change-Number: 18864 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 15:01:57 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-gsm-tester[master]: enb: add getter for number of cells of an eNB
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18867 ) Change subject: enb: add getter for number of cells of an eNB .. enb: add getter for number of cells of an eNB In order to set up the channel emulator we need to calculate the total number of RF channels that a eNB has from within a test. Change-Id: If641993033eb5dcdc6e2d6afdc8426ed322241ca --- M src/osmo_gsm_tester/obj/enb.py 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/67/18867/1 diff --git a/src/osmo_gsm_tester/obj/enb.py b/src/osmo_gsm_tester/obj/enb.py index 4a151d7..d9fe1a5 100644 --- a/src/osmo_gsm_tester/obj/enb.py +++ b/src/osmo_gsm_tester/obj/enb.py @@ -130,6 +130,9 @@ return 1 return 2 +def num_cells(self): +return self._num_cells + # PUBLIC - INTERNAL API -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18867 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If641993033eb5dcdc6e2d6afdc8426ed322241ca Gerrit-Change-Number: 18867 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: iperf3: add getter to read the actual run time of an iperf client run
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18866 ) Change subject: iperf3: add getter to read the actual run time of an iperf client run .. iperf3: add getter to read the actual run time of an iperf client run this is helpful to run some action for the exact run time of an iperf3 session. note that if no time spec is given when calling "prepare_test_proc()", a modifier could set the runtime of an DL experiment to an arbitrary value so we need to have a mechanism to read the actual time from within a test Change-Id: I484a0add322ffd269a1e9df72a00cf348950b268 --- M src/osmo_gsm_tester/obj/iperf3.py 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/66/18866/1 diff --git a/src/osmo_gsm_tester/obj/iperf3.py b/src/osmo_gsm_tester/obj/iperf3.py index 13fd455..b1e3349 100644 --- a/src/osmo_gsm_tester/obj/iperf3.py +++ b/src/osmo_gsm_tester/obj/iperf3.py @@ -209,6 +209,7 @@ self.server = iperf3srv self.testenv = testenv self._proto = None +self._time_sec = None self.log_file = None self.rem_host = None self.remote_log_file = None @@ -237,6 +238,7 @@ else: time_sec = int(time_sec_str) assert(time_sec) +self._time_sec = time_sec if proto is None: proto = values.get('protocol', IPerf3Client.PROTO_TCP) @@ -329,6 +331,9 @@ def proto(self): return self._proto +def time_sec(self): +return self._time_sec + def __str__(self): # FIXME: somehow differentiate between several clients connected to same server? return "%s:%u" %(self.server.addr(), self.server.port()) -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18866 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: I484a0add322ffd269a1e9df72a00cf348950b268 Gerrit-Change-Number: 18866 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: epc: add option to enable dedicated bearers
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 ) Change subject: epc: add option to enable dedicated bearers .. epc: add option to enable dedicated bearers add boolean option to epc class and extend the Amarisoft MME config template to use it Change-Id: If45cb7e15c8595164b8f537a390507927492c660 --- M src/osmo_gsm_tester/obj/epc.py M src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl M sysmocom/defaults.conf 3 files changed, 54 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/65/18865/1 diff --git a/src/osmo_gsm_tester/obj/epc.py b/src/osmo_gsm_tester/obj/epc.py index 6f056fc..7ae6dcd 100644 --- a/src/osmo_gsm_tester/obj/epc.py +++ b/src/osmo_gsm_tester/obj/epc.py @@ -25,6 +25,7 @@ config_schema = { 'type': schema.STR, 'qci': schema.UINT, +'add_dedicated_bearer': schema.BOOL_STR, } schema.register_config_schema('epc', config_schema) diff --git a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl index ce7200f..9361972 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_ltemme.cfg.tmpl @@ -68,6 +68,58 @@ pre_emption_capability: "shall_not_trigger_pre_emption", pre_emption_vulnerability: "not_pre_emptable", }, +% if epc.add_dedicated_bearer: +{ + qci: 1, + priority_level: 1, + pre_emption_capability: "shall_not_trigger_pre_emption", + pre_emption_vulnerability: "not_pre_emptable", + setup_type: "automatic", + filters: [ +{ + direction: "both", + id: 1, + precedence: 0, + components: [ +{ + type_of_service: 0xb8, + mask: 255 +} + ] +} + ], + on_demand_timeout: 1, + on_demand_ul_trigger: true, + transaction_identifier: 20, + radio_priority: 1, + packet_flow_identifier: 20 +}, +{ + qci: 2, + priority_level: 1, + pre_emption_capability: "shall_not_trigger_pre_emption", + pre_emption_vulnerability: "not_pre_emptable", + setup_type: "automatic", + filters: [ +{ + direction: "both", + id: 2, + precedence: 1, + components: [ +{ + type_of_service: 0x60, + mask: 255 +} + ] +} + ], + on_demand_timeout: 1, + on_demand_ul_trigger: true, + transaction_identifier: 21, + radio_priority: 1, + packet_flow_identifier: 21 +}, +%endif ], }, ], diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index b113545..6d6cb53 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -98,6 +98,7 @@ mcc: 901 mnc: 70 qci: 9 + add_dedicated_bearer: false srsepc: enable_pcap: false -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18865 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: If45cb7e15c8595164b8f537a390507927492c660 Gerrit-Change-Number: 18865 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-gsm-tester[master]: amarisoft_enb.cfg.tmpl: expose log options
srs_andre has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18864 ) Change subject: amarisoft_enb.cfg.tmpl: expose log options .. amarisoft_enb.cfg.tmpl: expose log options this allows to alter the log options through a modifier Change-Id: Iecd24afe6b242fbebc8463c9e1fa1c3b60b27d01 --- M src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl M sysmocom/defaults.conf 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/64/18864/1 diff --git a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl index 5690da9..c02192c 100644 --- a/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl +++ b/src/osmo_gsm_tester/templates/amarisoft_enb.cfg.tmpl @@ -29,8 +29,7 @@ - 'max_size': set the maximum size of the hex dump. 0 means no hex dump. -1 means no limit. */ - //log_options: "all.level=debug,all.max_size=32", - log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1", + log_options: "${enb.log_options}", log_filename: "${enb.log_filename}", /* Enable remote API and Web interface */ diff --git a/sysmocom/defaults.conf b/sysmocom/defaults.conf index 6694652..b113545 100644 --- a/sysmocom/defaults.conf +++ b/sysmocom/defaults.conf @@ -149,6 +149,7 @@ enable_pcap: false tx_gain: 89 rx_gain: 60 + log_options: all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1 srsue: enable_pcap: false -- To view, visit https://gerrit.osmocom.org/c/osmo-gsm-tester/+/18864 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-gsm-tester Gerrit-Branch: master Gerrit-Change-Id: Iecd24afe6b242fbebc8463c9e1fa1c3b60b27d01 Gerrit-Change-Number: 18864 Gerrit-PatchSet: 1 Gerrit-Owner: srs_andre Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18861 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor found_msg goto path .. scheduler: _sched_dequeue_prim(): Refactor found_msg goto path Change-Id: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5 --- M src/common/scheduler.c 1 file changed, 11 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/61/18861/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index ed7d412..c1bd19f 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -679,24 +679,21 @@ return NULL; /* l1sap_fn == fn */ - goto found_msg; + if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn)) +|| ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) { + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, " + "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id, + trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id); + goto free_msg; + } + + /* unlink and return message */ + llist_del(>list); + return msg; } return NULL; -found_msg: - if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn)) -|| ((link_id & 0xc0) ^ trx_chan_desc[chan].link_id)) { - LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong chan_nr=0x%02x link_id=%02x, " - "expecting chan_nr=0x%02x link_id=%02x.\n", chan_nr, link_id, - trx_chan_desc[chan].chan_nr | tn, trx_chan_desc[chan].link_id); - goto free_msg; - } - - /* unlink and return message */ - llist_del(>list); - return msg; - free_msg: /* unlink and free message */ llist_del(>list); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18861 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf7414d9fb17bbc3eb384329f587b3042ba0fcd5 Gerrit-Change-Number: 18861 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about not Dl block not found
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18863 ) Change subject: scheduler: Add rate_ctr informing about not Dl block not found .. scheduler: Add rate_ctr informing about not Dl block not found Together with previous counter L1SCHED_TS_CTR_DL_LATE, it allows understanding which dl blocks are really lost (never queued) and which were simply queued too late. Change-Id: I456d0cfbef1e03b147ce7d968a3ec42dd728fe74 --- M src/common/scheduler.c 1 file changed, 5 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/63/18863/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 6d9e132..635562f 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -566,11 +566,13 @@ enum { L1SCHED_TS_CTR_DL_LATE, + L1SCHED_TS_CTR_DL_NOT_FOUND, }; static const struct rate_ctr_desc l1sched_ts_ctr_desc[] = { [L1SCHED_TS_CTR_DL_LATE] = {"l1sched_ts:dl_late", "Downlink frames prepared too late to submit to lower layers"}, + [L1SCHED_TS_CTR_DL_NOT_FOUND] = {"l1sched_ts:dl_not_found", "Downlink frame not found while scheduling"}, }; static const struct rate_ctr_group_desc l1sched_ts_ctrg_desc = { "l1sched_ts", @@ -699,7 +701,7 @@ continue; } if (prim_fn > 0) /* l1sap_fn > fn */ - return NULL; + goto not_found; /* l1sap_fn == fn */ if ((chan_nr ^ (trx_chan_desc[chan].chan_nr | tn)) @@ -715,6 +717,8 @@ return msg; } +not_found: + rate_ctr_inc2(l1ts->ctrs, L1SCHED_TS_CTR_DL_NOT_FOUND); return NULL; free_msg: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18863 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I456d0cfbef1e03b147ce7d968a3ec42dd728fe74 Gerrit-Change-Number: 18863 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: _sched_dequeue_prim(): Refactor goto paths
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18860 ) Change subject: scheduler: _sched_dequeue_prim(): Refactor goto paths .. scheduler: _sched_dequeue_prim(): Refactor goto paths Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 --- M src/common/scheduler.c 1 file changed, 9 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/60/18860/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index 86978eb..ed7d412 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -643,13 +643,8 @@ llist_for_each_entry_safe(msg, msg2, >dl_prims, list) { l1sap = msgb_l1sap_prim(msg); if (l1sap->oph.operation != PRIM_OP_REQUEST) { -wrong_type: LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n"); -free_msg: - /* unlink and free message */ - llist_del(>list); - msgb_free(msg); - return NULL; + goto free_msg; } switch (l1sap->oph.primitive) { case PRIM_PH_DATA: @@ -663,7 +658,8 @@ l1sap_fn = l1sap->u.tch.fn; break; default: - goto wrong_type; + LOGL1S(DL1P, LOGL_ERROR, l1t, tn, chan, fn, "Prim has wrong type.\n"); + goto free_msg; } prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); if (prim_fn > 100) { /* l1sap_fn < fn */ @@ -700,6 +696,12 @@ /* unlink and return message */ llist_del(>list); return msg; + +free_msg: + /* unlink and free message */ + llist_del(>list); + msgb_free(msg); + return NULL; } int _sched_compose_ph_data_ind(struct l1sched_trx *l1t, uint8_t tn, uint32_t fn, -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18860 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ia0b1674ac3dfbe89c9eb0e6d6426848ec64320d9 Gerrit-Change-Number: 18860 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: Add rate_ctr informing about too low rts-advance
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18862 ) Change subject: scheduler: Add rate_ctr informing about too low rts-advance .. scheduler: Add rate_ctr informing about too low rts-advance Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05 --- M include/osmo-bts/scheduler.h M src/common/scheduler.c 2 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/62/18862/1 diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index f5f346e..e65665f 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -2,6 +2,7 @@ #define TRX_SCHEDULER_H #include +#include #include @@ -142,6 +143,8 @@ struct llist_head dl_prims; /* Queue primitives for TX */ + struct rate_ctr_group *ctrs; /* rate counters */ + /* Channel states for all logical channels */ struct l1sched_chan_state chan_state[_TRX_CHAN_MAX]; }; diff --git a/src/common/scheduler.c b/src/common/scheduler.c index c1bd19f..6d9e132 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -30,6 +30,8 @@ #include #include #include +#include +#include #include #include @@ -562,6 +564,22 @@ }, }; +enum { + L1SCHED_TS_CTR_DL_LATE, +}; + + +static const struct rate_ctr_desc l1sched_ts_ctr_desc[] = { + [L1SCHED_TS_CTR_DL_LATE] = {"l1sched_ts:dl_late", "Downlink frames prepared too late to submit to lower layers"}, +}; +static const struct rate_ctr_group_desc l1sched_ts_ctrg_desc = { + "l1sched_ts", + "L1 scheduler timeslot", + OSMO_STATS_CLASS_GLOBAL, + ARRAY_SIZE(l1sched_ts_ctr_desc), + l1sched_ts_ctr_desc +}; + /* * init / exit */ @@ -582,7 +600,9 @@ struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); l1ts->mf_index = 0; + l1ts->ctrs = rate_ctr_group_alloc(trx, _ts_ctrg_desc, (trx->nr + 1) * 100 + tn); INIT_LLIST_HEAD(>dl_prims); + for (i = 0; i < ARRAY_SIZE(l1ts->chan_state); i++) { struct l1sched_chan_state *chan_state; chan_state = >chan_state[i]; @@ -604,6 +624,8 @@ for (tn = 0; tn < ARRAY_SIZE(l1t->ts); tn++) { struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); msgb_queue_flush(>dl_prims); + rate_ctr_group_free(l1ts->ctrs); + l1ts->ctrs = NULL; for (i = 0; i < _TRX_CHAN_MAX; i++) { struct l1sched_chan_state *chan_state; chan_state = >chan_state[i]; @@ -670,6 +692,7 @@ prim_fn, l1sap_fn, fn, get_lchan_by_chan_nr(l1t->trx, chan_nr)->name, trx_chan_desc[chan].name); +rate_ctr_inc2(l1ts->ctrs, L1SCHED_TS_CTR_DL_LATE); /* unlink and free message */ llist_del(>list); msgb_free(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18862 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I76c3dd4020c6d74192b03b1d42413ae536da5f05 Gerrit-Change-Number: 18862 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: Improve logging about prim being out of range
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18856 ) Change subject: scheduler: Improve logging about prim being out of range .. scheduler: Improve logging about prim being out of range Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b --- M src/common/scheduler.c 1 file changed, 7 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e55b3a4..e1e7c95 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -635,7 +635,7 @@ { struct msgb *msg, *msg2; struct osmo_phsap_prim *l1sap; - uint32_t prim_fn; + uint32_t prim_fn, l1sap_fn; uint8_t chan_nr, link_id; struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); @@ -655,22 +655,24 @@ case PRIM_PH_DATA: chan_nr = l1sap->u.data.chan_nr; link_id = l1sap->u.data.link_id; - prim_fn = ((l1sap->u.data.fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); + l1sap_fn = l1sap->u.data.fn; break; case PRIM_TCH: chan_nr = l1sap->u.tch.chan_nr; link_id = 0; - prim_fn = ((l1sap->u.tch.fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); + l1sap_fn = l1sap->u.tch.fn; break; default: goto wrong_type; } + prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); if (prim_fn > 100) { LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, -"Prim %u is out of range (100), or channel %s with " +"Prim %u is out of range (%u vs exp %u), or channel %s with " "type %s is already disabled. If this happens in " "conjunction with PCU, increase 'rts-advance' by 5.\n", -prim_fn, get_lchan_by_chan_nr(l1t->trx, chan_nr)->name, +prim_fn, l1sap_fn, fn, +get_lchan_by_chan_nr(l1t->trx, chan_nr)->name, trx_chan_desc[chan].name); /* unlink and free message */ llist_del(>list); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b Gerrit-Change-Number: 18856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bsc[master]: debug: log about matching Paging Response to earlier Paging
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18769 ) Change subject: debug: log about matching Paging Response to earlier Paging .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18769 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I277d3236686dd5a5a21113ef2ddfd29341190086 Gerrit-Change-Number: 18769 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 13:29:28 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: vty: add 'mscpool roundrobin next' for ttcn3 tests
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18767 ) Change subject: vty: add 'mscpool roundrobin next' for ttcn3 tests .. Patch Set 6: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18767/6/src/osmo-bsc/osmo_bsc_vty.c File src/osmo-bsc/osmo_bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/18767/6/src/osmo-bsc/osmo_bsc_vty.c@942 PS6, Line 942: DEFUN(mscpool_roundrobin_next, mscpool_roundrobin_next_cmd, maybe make that a hidden command with DEFUN_HIDDEN ? It's not something a normal user should ever use. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18767 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I2155d906505a26744966f442ffb1e87a6a9b494c Gerrit-Change-Number: 18767 Gerrit-PatchSet: 6 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 13:28:39 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: log: add MSC number to bsc_subscr_conn_fsm id
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18768 ) Change subject: log: add MSC number to bsc_subscr_conn_fsm id .. Patch Set 7: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18768 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iae232d0616d6c0009e3abe2dcfcb9c51ddfc761e Gerrit-Change-Number: 18768 Gerrit-PatchSet: 7 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 13:29:07 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: mscpool: add user manual chapter
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18779 ) Change subject: mscpool: add user manual chapter .. Patch Set 5: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia60afc8a91189c9de0d8e8065781ed463bf18d7e Gerrit-Change-Number: 18779 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 13:26:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: MSC pooling: add 'no allow-attach' for MSC off-loading
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18778 ) Change subject: MSC pooling: add 'no allow-attach' for MSC off-loading .. Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18778 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6249201c15d0f6565aca643c21d2375c9ca58584 Gerrit-Change-Number: 18778 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 13:25:21 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: MSC pooling: LU: ignore TMSI NRI from a different PLMN
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18783 ) Change subject: MSC pooling: LU: ignore TMSI NRI from a different PLMN .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18783 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Iac1158cff022b6365ce22bb70feaaff93e39172a Gerrit-Change-Number: 18783 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 13:24:36 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in libosmocore[master]: add osmo_mobile_identity API
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/18858 to look at the new patch set (#2). Change subject: add osmo_mobile_identity API .. add osmo_mobile_identity API Implement better API around 3GPP TS 24.008 Mobile Identity coding. struct osmo_mobile_identity is a decoded representation of the raw Mobile Identity, with a string representation as well as dedicated raw uint32_t TMSI. The aim is to remove all uncertainty about decoded buffer sizes / data types. I have patches ready for current osmo CNI programs, replacing the Mobile Identity coding with this new API. Deprecate the old MI API. osmo-bsc: I71c3b4c65dbfdfa51409e09d4868aea83225338a osmo-msc: Ic3f969e739654c1e8c387aedeeba5cce07fe2307 osmo-sgsn: I4cacb10bac419633ca0c14f244f9903f7f517b49 Note that some GPRS and SGs related coding is done here in libosmocore and hence currently remains using the old implementation (see previous version of this patch: Ic3f969e739654c1e8c387aedeeba5cce07fe2307). New API functions provide properly size-checking implementations of: - decoding a raw MI from a bunch of MI octets; - locating and decoding MI from a full 3GPP TS 24.008 Complete Layer 3 msgb; - encoding to a buffer; - encoding to the end of a msgb. Other than the old gsm48_generate_mid(), omit a TLV tag and length from encoding. Many callers manually stripped the tag and value after calling gsm48_generate_mid(). The aim is to leave writing a TL to the caller entirely, especially since some callers need to use a TvL, i.e. support a variable-size length of 8 or 16 bit. New validity checks so far not implemented anywhere else: - stricter validation of number of digits of IMSI, IMEI, IMEI-SV MI. - stricter on filler nibbles to be 0xf. As a result, applications using osmo_mobile_identity will be stricter in rejecting coding mistakes (some of which we currently have in our test suites, and which we'll need to fix). Rationale: While implementing osmo-bsc's MSC pooling feature in osmo-bsc, this API will be used to reduce the number of times a Mobile Identity is extracted from a raw RSL message. Extracting the Mobile Identity from messages has numerous duplicate implementations across our code with various levels of specialization. https://xkcd.com/927/ To name a few: - libosmocore: gsm48_mi_to_string(), osmo_mi_name_buf() - osmo-bsc: extract_sub() - osmo-msc: mm_rx_loc_upd_req(), cm_serv_reuse_conn(), gsm48_rx_mm_serv_req(), vlr_proc_acc_req() We have existing functions to produce a human readable string from a Mobile Identity, more or less awkward: - gsm48_mi_to_string() decodes a TMSI as a decimal number. These days we use hexadecimal TMSI everywhere. - osmo_mi_name_buf() decodes the BCD digits from a raw MI every time, so we'd need to pass around the raw message bytes. Also, osmo_mi_name_buf() has the wrong signature, it should return a length like snprintf(). - osmo-bsc's extract_sub() first uses gsm48_mi_to_string() which encodes the raw uint32_t TMSI to a string, and then calls strtoul() via tmsi_from_string() to code those back to a raw uint32_t. Each of the above implementations employ their own size overflow checks, each invoke osmo_bcd2str() and implement their own TMSI osmo_load32be() handling. Too much code dup, let's hope that each and every one is correct. In osmo-bsc, I am now implementing MSC pooling, and need to extract NRI bits from a TMSI Mobile Identity. Since none of the above functions are general enough to be re-used, I found myself again copy-pasting Mobile Identity code: locating the MI in a 24.008 message with proper size checks, decoding MI octets. This time I would like it to become a generally re-usable API. This patch was first merged as Ic3f969e739654c1e8c387aedeeba5cce07fe2307 and caused test fallout, because it re-implemented old API with the new stricter decoding. In this patch version, old API remains 1:1 unchanged to avoid such fallout. Applications will soon switch to the new osmo_mobile_identity API and become stricter on MI coding when that happens, not implicitly by a new libosmocore version. Change-Id: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 --- M include/osmocom/core/utils.h M include/osmocom/gsm/gsm48.h M src/gsm/gsm48.c M src/gsm/libosmogsm.map M src/utils.c M tests/gsm0408/gsm0408_test.c M tests/gsm0408/gsm0408_test.ok M tests/utils/utils_test.c M tests/utils/utils_test.ok 9 files changed, 1,011 insertions(+), 15 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/58/18858/2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18858 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 Gerrit-Change-Number: 18858 Gerrit-PatchSet: 2 Gerrit-Owner: neels
Change in osmo-msc[master]: use new osmo_mobile_identity API everywhere
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/18715 to look at the new patch set (#5). Change subject: use new osmo_mobile_identity API everywhere .. use new osmo_mobile_identity API everywhere Depends: Ic3f969e739654c1e8c387aedeeba5cce07fe2307 (libosmocore) Change-Id: Idfc8e576e10756aeaacf5569f6178068313eb7ea --- M TODO-RELEASE M include/osmocom/msc/gsm_04_08.h M include/osmocom/msc/msub.h M include/osmocom/msc/vlr.h M src/libmsc/gsm_04_08.c M src/libmsc/msc_a.c M src/libmsc/msub.c M src/libmsc/ran_msg_a.c M src/libmsc/sgs_iface.c M src/libvlr/vlr.c M src/libvlr/vlr_access_req_fsm.c M tests/msc_vlr/msc_vlr_test_authen_reuse.err M tests/msc_vlr/msc_vlr_test_call.err M tests/msc_vlr/msc_vlr_test_gsm_authen.err M tests/msc_vlr/msc_vlr_test_gsm_ciph.err M tests/msc_vlr/msc_vlr_test_ms_timeout.err M tests/msc_vlr/msc_vlr_test_no_authen.err M tests/msc_vlr/msc_vlr_test_reject_concurrency.err M tests/msc_vlr/msc_vlr_test_rest.err M tests/msc_vlr/msc_vlr_test_ss.err M tests/msc_vlr/msc_vlr_test_umts_authen.err 21 files changed, 233 insertions(+), 255 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/18715/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/18715 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Idfc8e576e10756aeaacf5569f6178068313eb7ea Gerrit-Change-Number: 18715 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in osmo-sgsn[master]: use new osmo_mobile_identity API everywhere
Hello pespin, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-sgsn/+/18716 to look at the new patch set (#3). Change subject: use new osmo_mobile_identity API everywhere .. use new osmo_mobile_identity API everywhere Depends: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 (libosmocore) Change-Id: I4cacb10bac419633ca0c14f244f9903f7f517b49 --- M TODO-RELEASE M src/gbproxy/gb_proxy_patch.c M src/gbproxy/gb_proxy_tlli.c M src/gbproxy/gb_proxy_vty.c M src/gprs/gprs_gb_parse.c M src/sgsn/gprs_gmm.c M tests/gbproxy/gbproxy_test.c 7 files changed, 137 insertions(+), 120 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/16/18716/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/18716 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I4cacb10bac419633ca0c14f244f9903f7f517b49 Gerrit-Change-Number: 18716 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: remove extract_sub(), add bsc_subscr_find_or_create_by_mi()
Hello dexter, daniel, pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/18712 to look at the new patch set (#4). Change subject: remove extract_sub(), add bsc_subscr_find_or_create_by_mi() .. remove extract_sub(), add bsc_subscr_find_or_create_by_mi() Use the new osmo_mobile_identity API to shed some code dup and simplify. gsm48_paging_extract_mi() is now unused, drop. (More refactoring to use osmo_mobile_identity follows in subsequent patch.) Depends: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 (libosmocore) Change-Id: Id6cccaac64392b737b3bba8f3a22a88009adb23b --- M TODO-RELEASE M include/osmocom/bsc/bsc_subscriber.h M include/osmocom/bsc/gsm_04_08_rr.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_subscriber.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/gsm_08_08.c 7 files changed, 55 insertions(+), 58 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/18712/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6cccaac64392b737b3bba8f3a22a88009adb23b Gerrit-Change-Number: 18712 Gerrit-PatchSet: 4 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: mscpool: add user manual chapter
Hello dexter, pespin, daniel, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/18779 to look at the new patch set (#5). Change subject: mscpool: add user manual chapter .. mscpool: add user manual chapter Change-Id: Ia60afc8a91189c9de0d8e8065781ed463bf18d7e --- A doc/manuals/chapters/mscpool.adoc M doc/manuals/osmobsc-usermanual.adoc 2 files changed, 215 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/79/18779/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18779 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ia60afc8a91189c9de0d8e8065781ed463bf18d7e Gerrit-Change-Number: 18779 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in osmo-bsc[master]: use osmo_mobile_identity API everywhere
Hello pespin, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bsc/+/18713 to look at the new patch set (#5). Change subject: use osmo_mobile_identity API everywhere .. use osmo_mobile_identity API everywhere Depends: If4f7be606e54cfa1c59084cf169785b1cbda5cf5 (libosmocore) Change-Id: I71c3b4c65dbfdfa51409e09d4868aea83225338a --- M include/osmocom/bsc/abis_rsl.h M include/osmocom/bsc/gsm_04_08_rr.h M src/osmo-bsc/abis_rsl.c M src/osmo-bsc/gsm_04_08_rr.c M src/osmo-bsc/osmo_bsc_bssap.c M src/osmo-bsc/paging.c M src/osmo-bsc/pcu_sock.c 7 files changed, 64 insertions(+), 53 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/18713/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18713 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I71c3b4c65dbfdfa51409e09d4868aea83225338a Gerrit-Change-Number: 18713 Gerrit-PatchSet: 5 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in libosmocore[master]: gsm0408_test: allow deprecated API
neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/18859 ) Change subject: gsm0408_test: allow deprecated API .. gsm0408_test: allow deprecated API This test knowingly calls deprecated functions -- allow that to squelch these warnings: warning: ‘gsm48_generate_lai’ is deprecated: Use gsm48_generate_lai2() instead, to not lose leading zeros in the MNC [-Wdeprecated-declarations] warning: ‘gsm48_decode_lai’ is deprecated: Use gsm48_decode_lai2() instead, to not lose leading zeros in the MNC [-Wdeprecated-declarations] Change-Id: Ifd618c1b9befa9c9ef0a338ab4aae2b0f796f4c2 --- M tests/gsm0408/gsm0408_test.c 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/59/18859/1 diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c index 6cd3381..8567aa8 100644 --- a/tests/gsm0408/gsm0408_test.c +++ b/tests/gsm0408/gsm0408_test.c @@ -18,6 +18,8 @@ * */ +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + #include #include #include -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/18859 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ifd618c1b9befa9c9ef0a338ab4aae2b0f796f4c2 Gerrit-Change-Number: 18859 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18857 ) Change subject: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d Gerrit-Change-Number: 18857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: fixeria Gerrit-CC: Jenkins Builder Gerrit-CC: laforge Gerrit-Comment-Date: Tue, 16 Jun 2020 12:38:11 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18857 ) Change subject: scheduler: Early return in _sched_dequeue_prim() and clarify FN cases .. scheduler: Early return in _sched_dequeue_prim() and clarify FN cases We should always expect the msgb queue to be ordered by FN, so there's no use in continue traversing the queue after we found a later primitive than the one at current time, since next onews will be even more in the future. Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d --- M src/common/scheduler.c 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/57/18857/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e1e7c95..86978eb 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -666,7 +666,7 @@ goto wrong_type; } prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); - if (prim_fn > 100) { + if (prim_fn > 100) { /* l1sap_fn < fn */ LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, "Prim %u is out of range (%u vs exp %u), or channel %s with " "type %s is already disabled. If this happens in " @@ -679,9 +679,10 @@ msgb_free(msg); continue; } - if (prim_fn > 0) - continue; + if (prim_fn > 0) /* l1sap_fn > fn */ + return NULL; + /* l1sap_fn == fn */ goto found_msg; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18857 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If57fc3d89a74e6cbc79fce80dae7bf4f77e9364d Gerrit-Change-Number: 18857 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bts[master]: scheduler: Improve logging about prim being out of range
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18856 ) Change subject: scheduler: Improve logging about prim being out of range .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b Gerrit-Change-Number: 18856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 16 Jun 2020 12:22:23 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Improve logging about prim being out of range
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18856 ) Change subject: scheduler: Improve logging about prim being out of range .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b Gerrit-Change-Number: 18856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 16 Jun 2020 12:20:55 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: Change default for clock_advance to 3
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/17766 ) Change subject: osmo-bts-trx: Change default for clock_advance to 3 .. Patch Set 1: > Patch Set 1: > > Using with osmo-trx-uhd B200 with multi-arfcn (2TRX) as requested by Daniel: > osmotrx fn-advance 2 > osmotrx rts-advance 3 > > I see lots of issues in osmo-bts-trx like this: > 20200609163224911 DL1P <0007> scheduler.c:669 1027203/774/21/12/27 > (bts=0,trx=1,ts=7) PDTCH: Prim 2715644 is out of range (100), or channel > (bts=0,trx=1,ts=7,ss=0) with type PDTCH is already disabled. If this happens > in conjunction with PCU, increase 'rts-advance' by 5. > > No issue shows up in osmo-trx. I improved a bit the related log, since I'm getting similar warnings with current default values in master when there's heavy traffic in the MS (like loading a web page): https://paste.debian.net/1152330/ I have the feeling the prim_fn calculation in there may be wrong. Notice how fns stored in the queue are lower than the one we are at. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/17766 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7da3d0948f38e12342fb714b29f8edc5e9d0933d Gerrit-Change-Number: 17766 Gerrit-PatchSet: 1 Gerrit-Owner: daniel Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 12:09:47 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: doc: Fix typos in bts-models.adoc
pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18855 ) Change subject: doc: Fix typos in bts-models.adoc .. doc: Fix typos in bts-models.adoc Change-Id: I05c9eb9b0edda528363a16d27dbf683994d9ab62 --- M doc/manuals/chapters/bts-models.adoc 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/doc/manuals/chapters/bts-models.adoc b/doc/manuals/chapters/bts-models.adoc index 4b48d4b..495571f 100644 --- a/doc/manuals/chapters/bts-models.adoc +++ b/doc/manuals/chapters/bts-models.adoc @@ -248,7 +248,7 @@ GSM is a TDMA (time division multiple access) system on the radio interface. OsmoTRX is the "clock master" of that in the Osmocom implementation. It informs OsmoBTS of the current GSM frame -number. However, as there is non-zero delays (UDP packet trnsmission +number. However, as there is non-zero delays (UDP packet transmission delay, operating system scheduler delay on both OsmoTRX and OsmoBTS side, ...), OsmoBTS must compensate for that delay by "advancing" the clock a certain amount of time. @@ -266,8 +266,8 @@ The detailed value will depend on your underlying computer systems, operating system and related tuning parameters. Running OsmoTRX -on a remote host will inevitably require a higher fn-advance then -running it on the same machine, where the UDP packetes are just passed +on a remote host will inevitably require a higher fn-advance than +running it on the same machine, where the UDP packets are just passed over the loopback device. The default value for `fn-advance` is 20 (corresponding to 92 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I05c9eb9b0edda528363a16d27dbf683994d9ab62 Gerrit-Change-Number: 18855 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: merged
Change in osmo-bts[master]: doc: Fix typos in bts-models.adoc
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/18855 ) Change subject: doc: Fix typos in bts-models.adoc .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18855 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I05c9eb9b0edda528363a16d27dbf683994d9ab62 Gerrit-Change-Number: 18855 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 16 Jun 2020 11:57:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: scheduler: Improve logging about prim being out of range
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/18856 ) Change subject: scheduler: Improve logging about prim being out of range .. scheduler: Improve logging about prim being out of range Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b --- M src/common/scheduler.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/56/18856/1 diff --git a/src/common/scheduler.c b/src/common/scheduler.c index e55b3a4..e1e7c95 100644 --- a/src/common/scheduler.c +++ b/src/common/scheduler.c @@ -635,7 +635,7 @@ { struct msgb *msg, *msg2; struct osmo_phsap_prim *l1sap; - uint32_t prim_fn; + uint32_t prim_fn, l1sap_fn; uint8_t chan_nr, link_id; struct l1sched_ts *l1ts = l1sched_trx_get_ts(l1t, tn); @@ -655,22 +655,24 @@ case PRIM_PH_DATA: chan_nr = l1sap->u.data.chan_nr; link_id = l1sap->u.data.link_id; - prim_fn = ((l1sap->u.data.fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); + l1sap_fn = l1sap->u.data.fn; break; case PRIM_TCH: chan_nr = l1sap->u.tch.chan_nr; link_id = 0; - prim_fn = ((l1sap->u.tch.fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); + l1sap_fn = l1sap->u.tch.fn; break; default: goto wrong_type; } + prim_fn = ((l1sap_fn + GSM_HYPERFRAME - fn) % GSM_HYPERFRAME); if (prim_fn > 100) { LOGL1S(DL1P, LOGL_NOTICE, l1t, tn, chan, fn, -"Prim %u is out of range (100), or channel %s with " +"Prim %u is out of range (%u vs exp %u), or channel %s with " "type %s is already disabled. If this happens in " "conjunction with PCU, increase 'rts-advance' by 5.\n", -prim_fn, get_lchan_by_chan_nr(l1t->trx, chan_nr)->name, +prim_fn, l1sap_fn, fn, +get_lchan_by_chan_nr(l1t->trx, chan_nr)->name, trx_chan_desc[chan].name); /* unlink and free message */ llist_del(>list); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/18856 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie7ea210fee1f59ece3abe171b64cdc04670c344b Gerrit-Change-Number: 18856 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-MessageType: newchange
Change in osmo-bsc[master]: MSC pooling: make NRI mappings VTY configurable
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18765 ) Change subject: MSC pooling: make NRI mappings VTY configurable .. Patch Set 3: (1 comment) https://gerrit.osmocom.org/c/osmo-bsc/+/18765/3/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/c/osmo-bsc/+/18765/3/src/osmo-bsc/bsc_vty.c@2094 PS3, Line 2094: FIRST [LAST] I'm not sure if this FIRST / LAST (generic variables that accept any kind of string) is the best here. We typically express numeric values in the VTY syntax so the VTY will already reject any kind of unexpected/unknown value. I guess the rationale here is to be able to specify them as both decimal and hex. But is this really a good idea? Isn't it more confusing if there are multiple options? Especially as I'm sure if you enter it as hex it will be saved as integer (or vice-versa?) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18765 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I6c251f2744d7be26fc4ad74adefc96a6a3fe08b0 Gerrit-Change-Number: 18765 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 11:03:36 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bsc[master]: remove extract_sub(), add bsc_subscr_find_or_create_by_mi()
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/18712 ) Change subject: remove extract_sub(), add bsc_subscr_find_or_create_by_mi() .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18712 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6cccaac64392b737b3bba8f3a22a88009adb23b Gerrit-Change-Number: 18712 Gerrit-PatchSet: 3 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: dexter Gerrit-Reviewer: laforge Gerrit-Reviewer: neels Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 16 Jun 2020 10:59:30 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment