Change in ...osmo-ttcn3-hacks[master]: lapdm: Rename 'dummy_CT' to more reasonable 'lapdm_test_CT'
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14326 ) Change subject: lapdm: Rename 'dummy_CT' to more reasonable 'lapdm_test_CT' .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14326 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: If72542f665a814bcda7c41120675a57ccf3407f4 Gerrit-Change-Number: 14326 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 02 Jun 2019 10:55:50 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmocom-bb[master]: trxcon/l1ctl.c: properly handle handover RACH request
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/14274 ) Change subject: trxcon/l1ctl.c: properly handle handover RACH request .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14274 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ia967820a536c99966ba2c60b63d2ea9edb093f46 Gerrit-Change-Number: 14274 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 02 Jun 2019 11:16:19 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmocom-bb[master]: trxcon/l1ctl.c: properly handle handover RACH request
fixeria has submitted this change and it was merged. (
https://gerrit.osmocom.org/c/osmocom-bb/+/14274 )
Change subject: trxcon/l1ctl.c: properly handle handover RACH request
..
trxcon/l1ctl.c: properly handle handover RACH request
During the handover the MS needs to release the existing dedicated
channel(s), establish the new one(s) as indicated by the network,
and then, depending on the synchronisation state, send one or more
HANDOVER ACCESS messages carried by Access Bursts.
In order to implement this, trxcon needs to be able to transmit
Access Bursts on any TDMA timeslot regardless of the logical
channel type and the associated handler, i.e. != TRXC_RACH.
The controlling side on L1CTL (layer23 or TTCN-3) needs to send
one or more L1CTL_RACH_REQ message(s) with properly populated
UL info header. Otherwise a regular RACH on TS0 is assumed.
Change-Id: Ia967820a536c99966ba2c60b63d2ea9edb093f46
---
M src/host/trxcon/l1ctl.c
M src/host/trxcon/sched_lchan_rach.c
M src/host/trxcon/sched_trx.c
3 files changed, 20 insertions(+), 15 deletions(-)
Approvals:
fixeria: Looks good to me, approved; Verified
Jenkins Builder: Verified
diff --git a/src/host/trxcon/l1ctl.c b/src/host/trxcon/l1ctl.c
index 30f43d0..e722624 100644
--- a/src/host/trxcon/l1ctl.c
+++ b/src/host/trxcon/l1ctl.c
@@ -512,7 +512,6 @@
struct l1ctl_rach_req *req;
struct l1ctl_info_ul *ul;
struct trx_ts_prim *prim;
- uint8_t chan_nr, link_id;
size_t len;
int rc;
@@ -537,25 +536,24 @@
"(offset=%u, ra=0x%02x)\n", req->offset, req->ra);
}
- /**
-* FIXME: l1ctl_info_ul doesn't provide channel description
-* FIXME: Can we use other than TS0?
-*/
- chan_nr = RSL_CHAN_RACH;
- link_id = 0x00;
+ /* The controlling L1CTL side always does include the UL info header,
+* but may leave it empty. We assume RACH is on TS0 in this case. */
+ if (ul->chan_nr == 0x00) {
+ LOGP(DL1C, LOGL_NOTICE, "The UL info header is empty, "
+ "assuming RACH is on TS0\n");
+ ul->chan_nr = RSL_CHAN_RACH;
+ }
/* Init a new primitive */
- rc = sched_prim_init(l1l->trx, &prim, len, chan_nr, link_id);
+ rc = sched_prim_init(l1l->trx, &prim, len, ul->chan_nr, ul->link_id);
if (rc)
goto exit;
/**
-* Push this primitive to transmit queue
-*
-* FIXME: what if requested TS is not configured?
-* Or what if one (such as TCH) has no TRXC_RACH slots?
+* Push this primitive to the transmit queue.
+* Indicated timeslot needs to be configured.
*/
- rc = sched_prim_push(l1l->trx, prim, chan_nr);
+ rc = sched_prim_push(l1l->trx, prim, ul->chan_nr);
if (rc) {
talloc_free(prim);
goto exit;
diff --git a/src/host/trxcon/sched_lchan_rach.c
b/src/host/trxcon/sched_lchan_rach.c
index 7d202b8..e96a0e6 100644
--- a/src/host/trxcon/sched_lchan_rach.c
+++ b/src/host/trxcon/sched_lchan_rach.c
@@ -155,9 +155,10 @@
/* BN85-156: tail bits & extended guard period */
memset(burst_ptr, 0, burst + GSM_BURST_LEN - burst_ptr);
- LOGP(DSCHD, LOGL_DEBUG, "Transmitting %s RACH (%s) fn=%u\n",
+ LOGP(DSCHD, LOGL_NOTICE, "Transmitting %s RACH (%s) on fn=%u, tn=%u,
lchan=%s\n",
PRIM_IS_RACH11(lchan->prim) ? "extended (11-bit)" : "regular
(8-bit)",
- get_value_string(rach_synch_seq_names, synch_seq), fn);
+ get_value_string(rach_synch_seq_names, synch_seq), fn,
+ ts->index, trx_lchan_desc[lchan->type].name);
/* Forward burst to scheduler */
rc = sched_trx_handle_tx_burst(trx, ts, lchan, fn, burst);
diff --git a/src/host/trxcon/sched_trx.c b/src/host/trxcon/sched_trx.c
index 62fe870..37d1acf 100644
--- a/src/host/trxcon/sched_trx.c
+++ b/src/host/trxcon/sched_trx.c
@@ -35,6 +35,7 @@
#include
#include
+#include "l1ctl_proto.h"
#include "scheduler.h"
#include "sched_trx.h"
#include "trx_if.h"
@@ -116,6 +117,11 @@
if (lchan->prim == NULL)
continue;
+ /* Handover RACH needs to be handled regardless of the
+* current channel type and the associated handler. */
+ if (PRIM_IS_RACH(lchan->prim) && lchan->prim->chan != TRXC_RACH)
+ handler = trx_lchan_desc[TRXC_RACH].tx_fn;
+
/* Poke lchan handler */
handler(trx, ts, lchan, fn, bid);
}
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/14274
To unsubscribe, or for help writing mail filters
Change in ...osmo-bts[master]: common/bts.c: bts_supports_cm(): take care about GSM48_CMODE_SIGN
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14335
Change subject: common/bts.c: bts_supports_cm(): take care about
GSM48_CMODE_SIGN
..
common/bts.c: bts_supports_cm(): take care about GSM48_CMODE_SIGN
At the moment, bts_supports_cm() is only called on reception of
RSL Channel MODE MODIFY from the BSC. The idea is to check whether
the indicated RSL channel mode is supported by a BTS model.
RSL Channel MODE MODIFY message may indicate a channel in signalling
mode, i.e. GSM48_CMODE_SIGN, which has always been rejected so far.
Let's assume that signalling is always supported, as there is
no special BTS_FEAT_* definition to check that.
This change should make BTS_Tests.TC_rsl_modify_encr pass.
Change-Id: I8ea98a3eb9dc15a04f665596ee276883eb824b9a
---
M src/common/bts.c
1 file changed, 5 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/35/14335/1
diff --git a/src/common/bts.c b/src/common/bts.c
index 97e7a8b..596e5e0 100644
--- a/src/common/bts.c
+++ b/src/common/bts.c
@@ -744,6 +744,11 @@
{
enum gsm_bts_features feature = _NUM_BTS_FEAT;
+ /* We assume that signalling support is mandatory,
+* there is no BTS_FEAT_* definition to check that. */
+ if (cm == GSM48_CMODE_SIGN)
+ return 1;
+
/* Before the requested pchan/cm combination can be checked, we need to
* convert it to a feature identifier we can check */
switch (pchan) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14335
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I8ea98a3eb9dc15a04f665596ee276883eb824b9a
Gerrit-Change-Number: 14335
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: trx: Update documentation for fn-advance and rts-advance
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14334 ) Change subject: trx: Update documentation for fn-advance and rts-advance .. Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/14334/1/doc/manuals/chapters/bts-models.adoc File doc/manuals/chapters/bts-models.adoc: https://gerrit.osmocom.org/#/c/14334/1/doc/manuals/chapters/bts-models.adoc@254 PS1, Line 254: clock Looks a bit confusing. OsmoBTS actually does send DL bursts in advance, that's the purpose of 'fn-advance'. https://gerrit.osmocom.org/#/c/14334/1/doc/manuals/chapters/bts-models.adoc@256 PS1, Line 256: J typo https://gerrit.osmocom.org/#/c/14334/1/doc/manuals/chapters/bts-models.adoc@258 PS1, Line 258: `N + fn-advance` That would be too late, 'fn-advance' is actually being subtracted. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I83eff296bfb7acff9d8560b5346bd9791fe6e7d9 Gerrit-Change-Number: 14334 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 02 Jun 2019 19:21:44 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: trx: Update documentation for fn-advance and rts-advance
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14334 ) Change subject: trx: Update documentation for fn-advance and rts-advance .. Patch Set 1: Code-Review+1 Oh, I am sorry. Nevermind. I was confused. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14334 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I83eff296bfb7acff9d8560b5346bd9791fe6e7d9 Gerrit-Change-Number: 14334 Gerrit-PatchSet: 1 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Sun, 02 Jun 2019 19:26:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: libosmovty: deprecate vty_init(), add vty_init[_app]_ctx()
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/13973 ) Change subject: libosmovty: deprecate vty_init(), add vty_init[_app]_ctx() .. Abandoned Thanks Harald! Your explanation makes a lot of sense, I am agree. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/13973 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I65d71f8fc943e103b53b784f690ed56a6e373e3f Gerrit-Change-Number: 13973 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: abandon
Change in ...osmo-msc[master]: tests: share stubs.h from msc_vlr_test as stubs.c
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-msc/+/14352
Change subject: tests: share stubs.h from msc_vlr_test as stubs.c
..
tests: share stubs.h from msc_vlr_test as stubs.c
Change-Id: I8846c940f2695fd33e1007fecac83e73f508bb34
---
M tests/msc_vlr/Makefile.am
M tests/msc_vlr/msc_vlr_test_authen_reuse.c
M tests/msc_vlr/msc_vlr_test_call.c
M tests/msc_vlr/msc_vlr_test_gsm_authen.c
M tests/msc_vlr/msc_vlr_test_gsm_ciph.c
M tests/msc_vlr/msc_vlr_test_hlr_reject.c
M tests/msc_vlr/msc_vlr_test_hlr_timeout.c
M tests/msc_vlr/msc_vlr_test_ms_timeout.c
M tests/msc_vlr/msc_vlr_test_no_authen.c
M tests/msc_vlr/msc_vlr_test_reject_concurrency.c
M tests/msc_vlr/msc_vlr_test_rest.c
M tests/msc_vlr/msc_vlr_test_ss.c
M tests/msc_vlr/msc_vlr_test_umts_authen.c
R tests/stubs.c
14 files changed, 16 insertions(+), 13 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/52/14352/1
diff --git a/tests/msc_vlr/Makefile.am b/tests/msc_vlr/Makefile.am
index f9a9224..ac53f0f 100644
--- a/tests/msc_vlr/Makefile.am
+++ b/tests/msc_vlr/Makefile.am
@@ -46,7 +46,6 @@
noinst_HEADERS = \
msc_vlr_tests.h \
- stubs.h \
$(NULL)
EXTRA_DIST = \
@@ -94,61 +93,73 @@
msc_vlr_test_no_authen_SOURCES = \
msc_vlr_test_no_authen.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_gsm_authen_SOURCES = \
msc_vlr_test_gsm_authen.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_gsm_ciph_SOURCES = \
msc_vlr_test_gsm_ciph.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_umts_authen_SOURCES = \
msc_vlr_test_umts_authen.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_authen_reuse_SOURCES = \
msc_vlr_test_authen_reuse.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_hlr_reject_SOURCES = \
msc_vlr_test_hlr_reject.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_hlr_timeout_SOURCES = \
msc_vlr_test_hlr_timeout.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_ms_timeout_SOURCES = \
msc_vlr_test_ms_timeout.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_reject_concurrency_SOURCES = \
msc_vlr_test_reject_concurrency.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_call_SOURCES = \
msc_vlr_test_call.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_rest_SOURCES = \
msc_vlr_test_rest.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
msc_vlr_test_ss_SOURCES = \
msc_vlr_test_ss.c \
msc_vlr_tests.c \
+ $(srcdir)/../stubs.c \
$(NULL)
.PHONY: update_exp
diff --git a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
index 9eadec7..d73a5f8 100644
--- a/tests/msc_vlr/msc_vlr_test_authen_reuse.c
+++ b/tests/msc_vlr/msc_vlr_test_authen_reuse.c
@@ -24,7 +24,6 @@
/* NOTE that further auth re-use tests exist in msc_vlr_test_hlr_reject.c */
#include "msc_vlr_tests.h"
-#include "stubs.h"
static void _test_auth_reuse(enum osmo_rat_type via_ran,
int set_max_reuse_count,
diff --git a/tests/msc_vlr/msc_vlr_test_call.c
b/tests/msc_vlr/msc_vlr_test_call.c
index b31239e..6805f1a 100644
--- a/tests/msc_vlr/msc_vlr_test_call.c
+++ b/tests/msc_vlr/msc_vlr_test_call.c
@@ -22,7 +22,6 @@
*/
#include "msc_vlr_tests.h"
-#include "stubs.h"
#include
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
index 805ae64..8776e03 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_authen.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_authen.c
@@ -22,7 +22,6 @@
*/
#include "msc_vlr_tests.h"
-#include "stubs.h"
static void test_gsm_authen()
{
diff --git a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
index ceb17a5..c76cba4 100644
--- a/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
+++ b/tests/msc_vlr/msc_vlr_test_gsm_ciph.c
@@ -22,7 +22,6 @@
*/
#include "msc_vlr_tests.h"
-#include "stubs.h"
static const struct osmo_gsm48_classmark classmark = {
// TODO
diff --git a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
index 1134d89..45aaa8c 100644
--- a/tests/msc_vlr/msc_vlr_test_hlr_reject.c
+++ b/tests/msc_vlr/msc_vlr_test_hlr_reject.c
@@ -22,7 +22,6 @@
*/
#include "msc_vlr_tests.h"
-#include "stubs.h"
static void test_hlr_rej_auth_info_unknown_imsi()
{
diff --git a/tests/msc_vlr/msc_vlr_test
Change in ...osmo-msc[master]: Introduce initial unit test for db_sms_* API
Hello pespin, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13629 to look at the new patch set (#4). Change subject: Introduce initial unit test for db_sms_* API .. Introduce initial unit test for db_sms_* API Since OsmoMSC has built-in SMSC, it needs to store the messages somewhere. Currently we use libdbi and SQLite3 back-end for that. For a long time, the db_sms_* API remained uncovered by unit tests. This change aims to fix that, and does cover the following calls: - db_sms_store(), - db_sms_get(), - db_sms_get_next_unsent(), - db_sms_mark_delivered(), - db_sms_delete_sent_message_by_id(), - db_sms_delete_by_msisdn(), - db_sms_delete_oldest_expired_message(). Due to performance reasons, the test database is initialized in RAM using the magic filename ':memory:'. This is a feature of SQLite3 (and not libdbi), see: https://www.sqlite.org/inmemorydb.html Of course, this unit test helped to discover some problems: 1) Storing an SMS with empty TP-User-Data (TP-UDL=0) causes buffer overruns in both db_sms_store() and db_sms_get(). 2) TP-User-Data-Length is always being interpreted in octets, regardless of DCS (Data Coding Scheme). This results in storing garbage in the database if the default 7-bit encoding is used. Fortunately, the 'user_data' buffer in structure 'gsm_sms' is large emough, so we don't experience buffer overruns. 3) db_sms_delete_oldest_expired_message() doesn't work as expected. Instead of removing the *oldest* expired message, it tries to remove the *newest* one. The current test expectations do reflect these problems. All of them will be fixed in the follow-up patches. Change-Id: Id94ad35b6f78f839137db2e17010fbf9b40111a3 --- M configure.ac M src/libmsc/db.c M tests/Makefile.am A tests/db_sms/Makefile.am A tests/db_sms/db_sms_test.c A tests/db_sms/db_sms_test.err A tests/db_sms/db_sms_test.ok M tests/testsuite.at 8 files changed, 711 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/13629/4 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id94ad35b6f78f839137db2e17010fbf9b40111a3 Gerrit-Change-Number: 13629 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Max Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: Introduce initial unit test for db_sms_* API
Hello pespin, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13629 to look at the new patch set (#5). Change subject: Introduce initial unit test for db_sms_* API .. Introduce initial unit test for db_sms_* API Since OsmoMSC has built-in SMSC, it needs to store the messages somewhere. Currently we use libdbi and SQLite3 back-end for that. For a long time, the db_sms_* API remained uncovered by unit tests. This change aims to fix that, and does cover the following calls: - db_sms_store(), - db_sms_get(), - db_sms_get_next_unsent(), - db_sms_mark_delivered(), - db_sms_delete_sent_message_by_id(), - db_sms_delete_by_msisdn(), - db_sms_delete_oldest_expired_message(). Due to performance reasons, the test database is initialized in RAM using the magic filename ':memory:'. This is a feature of SQLite3 (and not libdbi), see: https://www.sqlite.org/inmemorydb.html Of course, this unit test helped to discover some problems: 1) Storing an SMS with empty TP-User-Data (TP-UDL=0) causes buffer overruns in both db_sms_store() and db_sms_get(). 2) TP-User-Data-Length is always being interpreted in octets, regardless of DCS (Data Coding Scheme). This results in storing garbage in the database if the default 7-bit encoding is used. Fortunately, the 'user_data' buffer in structure 'gsm_sms' is large emough, so we don't experience buffer overruns. 3) db_sms_delete_oldest_expired_message() doesn't work as expected. Instead of removing the *oldest* expired message, it tries to remove the *newest* one. The current test expectations do reflect these problems. All of them will be fixed in the follow-up patches. Change-Id: Id94ad35b6f78f839137db2e17010fbf9b40111a3 --- M configure.ac M src/libmsc/db.c M tests/Makefile.am A tests/db_sms/Makefile.am A tests/db_sms/db_sms_test.c A tests/db_sms/db_sms_test.err A tests/db_sms/db_sms_test.ok M tests/testsuite.at 8 files changed, 714 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/29/13629/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13629 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Id94ad35b6f78f839137db2e17010fbf9b40111a3 Gerrit-Change-Number: 13629 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Max Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: tests: share stubs.h from msc_vlr_test as stubs.c
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14352 ) Change subject: tests: share stubs.h from msc_vlr_test as stubs.c .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14352 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I8846c940f2695fd33e1007fecac83e73f508bb34 Gerrit-Change-Number: 14352 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Mon, 03 Jun 2019 11:00:16 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: db: Fix call to mempcy with NULL src ptr
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14355 ) Change subject: db: Fix call to mempcy with NULL src ptr .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14355 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I545967464c406348b8505d1729213cfb4afcd3e2 Gerrit-Change-Number: 14355 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Mon, 03 Jun 2019 17:05:04 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: vty: adjust config name for unit-id
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14359 ) Change subject: vty: adjust config name for unit-id .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/14359/1/src/common/vty.c File src/common/vty.c: https://gerrit.osmocom.org/#/c/14359/1/src/common/vty.c@425 PS1, Line 425: unit_id Maybe we should rather keep dash? Most commands here use it, so this would be more consistent. This way OsmoBSC would need a similar patch. https://gerrit.osmocom.org/#/c/14359/1/src/common/vty.c@446 PS1, Line 446: ws -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14359 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ief6f23cc891a528d4295f7b0b85ff49bce299e8b Gerrit-Change-Number: 14359 Gerrit-PatchSet: 1 Gerrit-Owner: Eric Wild Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 03 Jun 2019 18:34:16 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: db_sms_test: Remove libdbi expected driver load errors
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14356 ) Change subject: db_sms_test: Remove libdbi expected driver load errors .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14356/1/tests/testsuite.at File tests/testsuite.at: https://gerrit.osmocom.org/#/c/14356/1/tests/testsuite.at@23 PS1, Line 23: 2>&1 I found this solution: https://stackoverflow.com/a/15936384/10668583, that would allow us to avoid swapping / mixing both stdin and stderr. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14356 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I06dfdc5a7415a4d3b34a3b25f11c8abda1a63f92 Gerrit-Change-Number: 14356 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 03 Jun 2019 19:39:10 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: db_sms_test: Do not print exact memcmp result
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14357 ) Change subject: db_sms_test: Do not print exact memcmp result .. Patch Set 1: (2 comments) https://gerrit.osmocom.org/#/c/14357/1/tests/db_sms/db_sms_test.c File tests/db_sms/db_sms_test.c: https://gerrit.osmocom.org/#/c/14357/1/tests/db_sms/db_sms_test.c@360 PS1, Line 360: (diff=%d/%zu) Ok, so now it does not make sense to print this part. Feel free to remove it completely. https://gerrit.osmocom.org/#/c/14357/1/tests/db_sms/db_sms_test.ok File tests/db_sms/db_sms_test.ok: https://gerrit.osmocom.org/#/c/14357/1/tests/db_sms/db_sms_test.ok@21 PS1, Line 21: (diff=-1/256) That's why: it looks more confusing than informative. -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6 Gerrit-Change-Number: 14357 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Mon, 03 Jun 2019 19:42:18 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: db_sms_test: Do not print exact memcmp result
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/14357 ) Change subject: db_sms_test: Do not print exact memcmp result .. Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14357 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I771fb8f4fc56f337b16561d005ff1803a386d1c6 Gerrit-Change-Number: 14357 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 09:50:22 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bts[master]: common/scheduler.c: refactor description of TRXC_* lchans
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/14322 ) Change subject: common/scheduler.c: refactor description of TRXC_* lchans .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14322 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I9d5d49ec569f133d37b8164b22607d4700474315 Gerrit-Change-Number: 14322 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Tue, 04 Jun 2019 10:44:20 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: db_hlr: zero-initialize "struct tm"
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14364 ) Change subject: db_hlr: zero-initialize "struct tm" .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14364 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: Iebbbe42fc5cd43324206d9433ede67b39251389c Gerrit-Change-Number: 14364 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 10:49:10 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: lapdm: Allow user to specify T200 values; Use correct N200 values
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14339 ) Change subject: lapdm: Allow user to specify T200 values; Use correct N200 values .. Patch Set 3: (5 comments) https://gerrit.osmocom.org/#/c/14339/3/src/gsm/lapdm.c File src/gsm/lapdm.c: https://gerrit.osmocom.org/#/c/14339/3/src/gsm/lapdm.c@163 PS3, Line 163: int i = 0; Doesn't this cause compiler warnings like "... only allowed in C99 mode"? https://gerrit.osmocom.org/#/c/14339/3/src/gsm/lapdm.c@171 PS3, Line 171: \ref Let's avoid such references in the new code. https://gerrit.osmocom.org/#/c/14339/3/src/gsm/lapdm.c@218 PS3, Line 218: \ref same https://gerrit.osmocom.org/#/c/14339/3/src/gsm/lapdm.c@219 PS3, Line 219: \ref same https://gerrit.osmocom.org/#/c/14339/3/src/gsm/lapdm.c@227 PS3, Line 227: get_n200_dcch Should we at least print some warning if the result would be -1? Or is this value expected by subsequent calls? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I90fdc4dd4720d4e02213197c894eb0a55a39158c Gerrit-Change-Number: 14339 Gerrit-PatchSet: 3 Gerrit-Owner: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 11:08:01 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: vty: adjust config name for unit-id
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14365 ) Change subject: vty: adjust config name for unit-id .. Patch Set 1: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/14365/1/src/osmo-bsc/bsc_vty.c File src/osmo-bsc/bsc_vty.c: https://gerrit.osmocom.org/#/c/14365/1/src/osmo-bsc/bsc_vty.c@900 PS1, Line 900: unit_id This change still doesn't solve the problem of inconsistency. OsmoBTS is using 'ipa unit-id', while here it's 'ipa unit_id'. Let's stick to 'ipa unit-id', so there would be no need to change OsmoBTS. https://gerrit.osmocom.org/#/c/14365/1/src/osmo-bsc/bsc_vty.c@905 PS1, Line 905: ip.access rsl-ip Since we are moving to 'ipa', let's do it here too. https://gerrit.osmocom.org/#/c/14365/1/src/osmo-bsc/bsc_vty.c@908 PS1, Line 908: ip.access stream_id Most likely, same here. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac Gerrit-Change-Number: 14365 Gerrit-PatchSet: 1 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 11:54:15 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-bsc[master]: vty: adjust config name for unit-id
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/14365 ) Change subject: vty: adjust config name for unit-id .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/14365 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ide5ceb5db7403a70313405752579e30d7bb94eac Gerrit-Change-Number: 14365 Gerrit-PatchSet: 2 Gerrit-Owner: Hoernchen Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Tue, 04 Jun 2019 12:50:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371
Change subject: BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
..
BTS_Tests.ttcn: fix name of f_trx_fake_toffs256()
Change-Id: I83a1d68ffbfc4d588e143fecc62517baac9b31af
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/71/14371/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index b9091cc..406b749 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -488,7 +488,7 @@
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_RSSI(rssi)));
}
-private function f_trx_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
+private function f_trxc_fake_toffs256(int16_t toffs256) runs on ConnHdlr {
var TrxcMessage ret;
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_TIMING(toffs256)));
}
@@ -1860,7 +1860,7 @@
if (mp_bts_trxc_port != -1) {
f_trxc_fake_rssi(rxlev2dbm(mp_ul_rxlev_exp));
- f_trx_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);
+ f_trxc_fake_toffs256(g_pars.l1_pars.timing_offset_256syms);
}
f_est_dchan();
@@ -2028,7 +2028,7 @@
RSL.clear;
/* tell fake_trx to use a given timing offset for all bursts */
- f_trx_fake_toffs256(ta_to_test*256);
+ f_trxc_fake_toffs256(ta_to_test*256);
f_est_dchan(more_ies :={valueof(t_RSL_IE(RSL_IE_TIMING_ADVANCE,
RSL_IE_Body:{timing_adv := ta_to_test}))} );
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14371
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: I83a1d68ffbfc4d588e143fecc62517baac9b31af
Gerrit-Change-Number: 14371
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372
Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of
messages
..
library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9
---
M library/TRXC_CodecPort.ttcn
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/72/14372/1
diff --git a/library/TRXC_CodecPort.ttcn b/library/TRXC_CodecPort.ttcn
index 09b2977..7dee369 100644
--- a/library/TRXC_CodecPort.ttcn
+++ b/library/TRXC_CodecPort.ttcn
@@ -28,6 +28,7 @@
}
private function IPL4_to_TRXC_RecvFrom(in ASP_RecvFrom pin, out TRXC_RecvFrom
pout) {
+ log("Rx TRXC message: ", oct2char(pin.msg));
pout.connId := pin.connId;
pout.remName := pin.remName;
pout.remPort := pin.remPort;
@@ -73,6 +74,7 @@
}
};
}
+ log("Tx TRXC message: ", tx);
pt.send(ts_TRXC_Send(conn_id, tx));
T.start;
alt {
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372
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: I04af0043c67c5904d034b60b39ddce44aa4beba9
Gerrit-Change-Number: 14372
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: correct error messages about TRXC connection
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369
Change subject: BTS_Tests.ttcn: correct error messages about TRXC connection
..
BTS_Tests.ttcn: correct error messages about TRXC connection
Change-Id: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3
---
M bts/BTS_Tests.ttcn
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/69/14369/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index e48c05a..ba67889 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -465,7 +465,9 @@
res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC,
mp_bts_trxc_ip, mp_bts_trxc_port,
"", -1, -1, {udp:={}},
{});
if (not ispresent(res.connId)) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not
connect to trx-control interface of trxcon, check your configuration");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
}
g_bts_trxc_conn_id := res.connId;
}
@@ -1436,7 +1438,9 @@
res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(BTS_TRXC,
mp_bts_trxc_ip, mp_bts_trxc_port,
"", -1, -1, {udp:={}},
{});
if (not ispresent(res.connId)) {
- Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Could not
connect to trx-control interface of trxcon, check your configuration");
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
}
g_bts_trxc_conn_id := res.connId;
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14369
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: Ie3dbe925b8840c0c8d8047ee5878fcdaa1395ab3
Gerrit-Change-Number: 14369
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370
Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and
ConnHdlr
..
BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Before this patch, sending special TRXC commands to FakeTRX, such as
FAKE_TOA and FAKE_RSSI, from ConnHdlr resulted in a receive timeout
waiting for the response.
As it turned out, both the test_CT and the ConnHdlr have a TRXC port,
as depending on the test one would want to globally control it
from test_CT or from within a ConnHdlr.
However, only one of the two should be active (connected) at any given
point in time. Otherwise we'll have two UDP sockets on the same bind
port, and it's more or less random on which of them it ends up.
Let's add an optional parameter 'trxc_comp', which would indicate
whether we need to control TRXC from ConnHdlr or not.
Let's get rid of both f_trxc_connect() and f_main_trxc_connect(),
which basically do the same, but run on different components.
Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1
Closes: OS#4039
---
M bts/BTS_Tests.ttcn
1 file changed, 35 insertions(+), 37 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/70/14370/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index ba67889..b9091cc 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -117,7 +117,7 @@
/* L1CTL port (for classic tests) */
port L1CTL_PT L1CTL;
- /* TRXC port (for classic tests) */
+ /* Optional TRXC connection to FakeTRX (BTS side) */
port TRXC_CODEC_PT BTS_TRXC;
var integer g_bts_trxc_conn_id;
@@ -160,6 +160,7 @@
type component ConnHdlr extends RSL_DchanHdlr, lapdm_test_CT {
port L1CTL_PT L1CTL;
+ /* Optional TRXC connection to FakeTRX (BTS side) */
port TRXC_CODEC_PT BTS_TRXC;
var integer g_bts_trxc_conn_id;
@@ -333,6 +334,22 @@
}
}
+private function f_init_trxc(TRXC_CODEC_PT pt, charstring id,
+out integer trxc_conn_id) {
+ var Result res;
+
+ map(self:BTS_TRXC, system:BTS_TRXC);
+
+ res := TRXC_CodecPort_CtrlFunct.f_IPL4_connect(pt, mp_bts_trxc_ip,
mp_bts_trxc_port,
+ "", -1, -1, { udp := {}
}, {});
+ if (not ispresent(res.connId)) {
+ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail,
+ "Could not connect to the control
(TRXC) interface " &
+ "of FakeTRX, check your configuration");
+ }
+ trxc_conn_id := res.connId;
+}
+
/* global init function */
function f_init() runs on test_CT {
var charstring id := testcasename();
@@ -399,7 +416,7 @@
if (mp_bts_trxc_port != -1) {
var TrxcMessage ret;
/* start with a default moderate timing offset equalling TA=2 */
- f_main_trxc_connect();
+ f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id);
ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id,
valueof(ts_TRXC_FAKE_TIMING(2*256)));
}
@@ -417,7 +434,9 @@
type function void_fn(charstring id) runs on ConnHdlr;
/* create a new test component */
-function f_start_handler(void_fn fn, ConnHdlrPars pars, boolean pcu_comp :=
false)
+function f_start_handler(void_fn fn, ConnHdlrPars pars,
+boolean pcu_comp := false,
+boolean trxc_comp := false)
runs on test_CT return ConnHdlr {
var charstring id := testcasename();
var ConnHdlr vc_conn;
@@ -426,13 +445,18 @@
/* connect to RSL Emulation main component */
connect(vc_conn:RSL, vc_RSL:CLIENT_PT);
connect(vc_conn:RSL_PROC, vc_RSL:RSL_PROC);
+
+ /* The ConnHdlr component may want to talk to some ports directly,
+* so we disconnect it from the test_CT and connect it to the component.
+* This obviously only works for one component, i.e. no concurrency. */
if (pcu_comp) {
- /* the ConnHdlr component wants to talk directly to the PCU, so
disconnect
-* it from the test_CT and connect it to the component. This
obviously only
-* works for one component, i.e. no concurrency */
unmap(self:PCU, system:PCU);
map(vc_conn:PCU, system:PCU);
}
+ if (trxc_comp) {
+ unmap(self:BTS_TRXC, system:BTS_TRXC);
+ map(vc_conn:BTS_TRXC, system:BTS_TRXC);
+ }
vc_conn.start(f_handler_init(fn, id, pars));
return vc_conn;
@@ -459,19 +483,6 @@
f_L1CTL_FBSB(L1CTL, { false, mp_trx0_arfcn }, ccch_mode, mp_rxlev_exp);
}
-private function f_trxc_connect() runs on ConnHdlr {
- map(self
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 to look at the new patch set (#2). Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages .. library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages Change-Id: I04af0043c67c5904d034b60b39ddce44aa4beba9 --- M library/TRXC_CodecPort.ttcn 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/72/14372/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 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: I04af0043c67c5904d034b60b39ddce44aa4beba9 Gerrit-Change-Number: 14372 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. start-testsuite.sh: do not override LD_LIBRARY_PATH The Eclipse titan.core may not only be installed to hard-coded '/usr/lib/titan' patch, but to any other location too. In the later case, one would have to make sure that the custom path is in $LD_LIBRARY_PATH. So we shall not override it. Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c --- M start-testsuite.sh 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/74/14374/1 diff --git a/start-testsuite.sh b/start-testsuite.sh index 5740d3d..31bc891 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -21,7 +21,8 @@ TEST=$3 fi -LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE $CFG $TEST +TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 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: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 to look at the new patch set (#2). Change subject: BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr .. BTS_Tests.ttcn: fix TRXC port mapping between test_CT and ConnHdlr Before this patch, sending special TRXC commands to FakeTRX, such as FAKE_TOA and FAKE_RSSI, from ConnHdlr resulted in a receive timeout waiting for the response. As it turned out, both the test_CT and the ConnHdlr have a TRXC port, as depending on the test one would want to globally control it from test_CT or from within a ConnHdlr. However, only one of the two should be active (connected) at any given point in time. Otherwise we'll have two UDP sockets on the same bind port, and it's more or less random on which of them it ends up. Let's add an optional parameter 'trxc_comp', which would indicate whether we need to control TRXC from ConnHdlr or not. Let's get rid of both f_trxc_connect() and f_main_trxc_connect(), which basically do the same, but run on different components. Change-Id: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1 Closes: OS#4039 --- M bts/BTS_Tests.ttcn 1 file changed, 37 insertions(+), 37 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/70/14370/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14370 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: Ie7d311bf8f03bf9b1d29b5bb28ffad793f215fd1 Gerrit-Change-Number: 14370 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-ttcn3-hacks[master]: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 Change subject: BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX .. BTS_Tests.ttcn: indicate default RSSI=-60 to FakeTRX Change-Id: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 --- M bts/BTS_Tests.ttcn 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/75/14375/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 50aaee7..98d439a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -418,8 +418,9 @@ map(self:BTS_TRXC, system:BTS_TRXC); f_init_trxc(BTS_TRXC, id, g_bts_trxc_conn_id); - /* start with a default moderate timing offset equalling TA=2 */ + /* Start with a default moderate timing offset equalling TA=2, and RSSI=-60 */ ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_TIMING(2*256))); + ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, valueof(ts_TRXC_FAKE_RSSI(-60))); } /* Wait some extra time to make sure the BTS emits a stable carrier. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14375 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: Ib13e3f8d9fbcd2722c6522a1bb5c513e34adfb18 Gerrit-Change-Number: 14375 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-ttcn3-hacks[master]: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 ) Change subject: library/TRXC_CodecPort.ttcn: add debug print on Rx / Tx of messages .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14372 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: I04af0043c67c5904d034b60b39ddce44aa4beba9 Gerrit-Change-Number: 14372 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-CC: Harald Welte Gerrit-MessageType: abandon
Change in ...osmo-sgsn[master]: doc/manuals/vty: regenerate sgsn_vty_reference.xml
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 Change subject: doc/manuals/vty: regenerate sgsn_vty_reference.xml .. doc/manuals/vty: regenerate sgsn_vty_reference.xml Change-Id: I3dfe3598055457cc9724a371590e676f1920652b --- M doc/manuals/vty/sgsn_vty_reference.xml 1 file changed, 21 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/77/14377/1 diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml index 52d4213..7619215 100644 --- a/doc/manuals/vty/sgsn_vty_reference.xml +++ b/doc/manuals/vty/sgsn_vty_reference.xml @@ -187,7 +187,7 @@ - + @@ -222,6 +222,7 @@ + @@ -733,7 +734,7 @@ - + @@ -768,6 +769,7 @@ + @@ -1488,7 +1490,8 @@ - + + @@ -1518,7 +1521,7 @@ - + @@ -1553,6 +1556,7 @@ + @@ -1696,10 +1700,11 @@ - + + @@ -1762,7 +1767,7 @@ - + @@ -1772,6 +1777,7 @@ + @@ -2234,6 +2240,13 @@ + + + + + + + @@ -2325,7 +2338,8 @@ - + + -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14377 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I3dfe3598055457cc9724a371590e676f1920652b Gerrit-Change-Number: 14377 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-sgsn[master]: osmo-sgsn: add VTY parameter to toggle authentication
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 ) Change subject: osmo-sgsn: add VTY parameter to toggle authentication .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: I9909145e7e0af587c28827e16301a61b13eedaa9 Gerrit-Change-Number: 14194 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: lynxis lazus Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 18:50:41 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: start-testsuite.sh: do not override LD_LIBRARY_PATH
fixeria has submitted this change and it was merged. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 ) Change subject: start-testsuite.sh: do not override LD_LIBRARY_PATH .. start-testsuite.sh: do not override LD_LIBRARY_PATH The Eclipse titan.core may not only be installed to hard-coded '/usr/lib/titan' patch, but to any other location too. In the later case, one would have to make sure that the custom path is in $LD_LIBRARY_PATH. So we shall not override it. Change-Id: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c --- M start-testsuite.sh 1 file changed, 2 insertions(+), 1 deletion(-) Approvals: Harald Welte: Looks good to me, approved Jenkins Builder: Verified diff --git a/start-testsuite.sh b/start-testsuite.sh index 5740d3d..31bc891 100755 --- a/start-testsuite.sh +++ b/start-testsuite.sh @@ -21,7 +21,8 @@ TEST=$3 fi -LD_LIBRARY_PATH="$SUITE_DIR:/usr/lib/titan:/usr/ttcn3/lib" ttcn3_start $SUITE $CFG $TEST +TITAN_LIBRARY_PATH="/usr/lib/titan:/usr/ttcn3/lib" +LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$SUITE_DIR:$TITAN_LIBRARY_PATH" ttcn3_start $SUITE $CFG $TEST expected="$SUITE_DIR/expected-results.xml" if [ ! -f "$expected" ]; then -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14374 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: I1ec28e8c3081d5de1bea90a7451791ac8cbbd27c Gerrit-Change-Number: 14374 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-MessageType: merged
Change in ...osmo-msc[master]: libmsc/db.c: fix potential integer overflow
Hello pespin, Neels Hofmeyr, Harald Welte, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13470 to look at the new patch set (#9). Change subject: libmsc/db.c: fix potential integer overflow .. libmsc/db.c: fix potential integer overflow The value of 'sms->user_data_len' is fetched from the database: sms->user_data_len = dbi_result_get_field_length(result, "user_data"); and this is where the problem is. As per the libdbi's documentation (see 3.5.3), dbi_result_get_field_length() returns the length in bytes of the value stored in the specified field: unsigned int dbi_result_get_field_length(dbi_result Result, const char *fieldname) so 'unsigned int' is assigned to 'uint8_t', what could lead to an integer overflow if the value is grather than 0xff. As a result, if the database for some reason does contain such odd TP-UD, the truncation of 'user_data' would be done incorrectly. Let's avoid such direct assignment, and use a separate variable. Also, let's warn user if TP-UDL value is grether than 140, as per 3GPP TS 03.40. Change-Id: Ibbd588545e1a4817504c806a3d02cf59d5938ee2 Related: OS#3684 --- M src/libmsc/db.c 1 file changed, 27 insertions(+), 9 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/70/13470/9 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13470 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ibbd588545e1a4817504c806a3d02cf59d5938ee2 Gerrit-Change-Number: 13470 Gerrit-PatchSet: 9 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/db.c: introduce and use parse_sm_ud_from_result()
Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13488 to look at the new patch set (#7). Change subject: libmsc/db.c: introduce and use parse_sm_ud_from_result() .. libmsc/db.c: introduce and use parse_sm_ud_from_result() The following functions: - sms_from_result(), - sms_from_result_v3(), - sms_from_result_v4(), do retrieve the TP-UD, TP-UDL and text in the same way. A consequence of such duplication is [1], which fixed potential NULL-pointer dereference for sms_from_result(), but not for two other functions: sms_from_result_v3() and sms_from_result_v4(). [1] I545967464c406348b8505d1729213cfb4afcd3e2 Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6 --- M src/libmsc/db.c 1 file changed, 37 insertions(+), 49 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/88/13488/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13488 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: If67dfb9f7d2a55fa3d45dc4689a2acff9909faf6 Gerrit-Change-Number: 13488 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset
Change in ...osmo-msc[master]: libmsc/db.c: properly get / set TP-UD length (octets vs septets)
fixeria has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13490 ) Change subject: libmsc/db.c: properly get / set TP-UD length (octets vs septets) .. Abandoned -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13490 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I84f973bc6561a9822b4b26975a781abd2b6e026a Gerrit-Change-Number: 13490 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Assignee: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Neels Hofmeyr Gerrit-Reviewer: fixeria Gerrit-MessageType: abandon
Change in ...osmo-msc[master]: libmsc/db.c: get rid of hard-coded SMS expiry threshold
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/13631 ) Change subject: libmsc/db.c: get rid of hard-coded SMS expiry threshold .. Set Ready For Review -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ce6b1ab50986dc69a2be4ea62b6a24c7f3f8f0a Gerrit-Change-Number: 13631 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: fixeria Gerrit-CC: pespin Gerrit-Comment-Date: Tue, 04 Jun 2019 21:06:06 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-sgsn[master]: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 ) Change subject: osmo-sgsn: get rid of OSMO_ASSERT() in 'auth-policy' handler .. Patch Set 2: > I created https://osmocom.org/issues/4045 to track this issue and a fix for > libosmovty. Thanks. Please also see: https://gerrit.osmocom.org/#/c/libosmocore/+/14307/ -- To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/14195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-sgsn Gerrit-Branch: master Gerrit-Change-Id: If9b0c0d031477ca87786aab5c269d00748e896c8 Gerrit-Change-Number: 14195 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 Jun 2019 11:16:57 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...osmo-msc[master]: debian/control: add missing libdbd-sqlite3 to Build-Depends
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/14380 Change subject: debian/control: add missing libdbd-sqlite3 to Build-Depends .. debian/control: add missing libdbd-sqlite3 to Build-Depends The libdbd-sqlite3 provides SQLite3 driver for libdbi. We use it by default for the built-in SMS Centre. Since [1], we have unit test coverage for the db_sms_* API, thus we need libdbd-sqlite3 to be installed at build-time. [1] Id94ad35b6f78f839137db2e17010fbf9b40111a3 Change-Id: Ice9fb11f5b8a39abecee426d2fadcf62b7ee47c4 --- M debian/control 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/80/14380/1 diff --git a/debian/control b/debian/control index 8b0d690..887e386 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ libtool, pkg-config, libdbi-dev, + libdbd-sqlite3, libsctp-dev, libtalloc-dev, libsmpp34-dev (>= 1.12), -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/14380 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: Ice9fb11f5b8a39abecee426d2fadcf62b7ee47c4 Gerrit-Change-Number: 14380 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in ...osmo-bts[master]: Use #define RSL_CHAN_RACH for RSL Channel Number of RACH
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/14381
Change subject: Use #define RSL_CHAN_RACH for RSL Channel Number of RACH
..
Use #define RSL_CHAN_RACH for RSL Channel Number of RACH
Change-Id: I7f54fccdae6799e5f4d956a101e11c2d6f998546
---
M src/common/rsl.c
M src/osmo-bts-litecell15/l1_if.c
M src/osmo-bts-oc2g/l1_if.c
M src/osmo-bts-octphy/l1_if.c
M src/osmo-bts-sysmo/l1_if.c
5 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/81/14381/1
diff --git a/src/common/rsl.c b/src/common/rsl.c
index 410b38a..7630a8c 100644
--- a/src/common/rsl.c
+++ b/src/common/rsl.c
@@ -883,7 +883,7 @@
/* 9.3.17 Access Delay */
msgb_tv_put(nmsg, RSL_IE_ACCESS_DELAY, acc_delay);
- rsl_cch_push_hdr(nmsg, RSL_MT_CHAN_RQD, 0x88); // FIXME
+ rsl_cch_push_hdr(nmsg, RSL_MT_CHAN_RQD, RSL_CHAN_RACH); // FIXME
nmsg->trx = trx;
return abis_bts_rsl_sendmsg(nmsg);
diff --git a/src/osmo-bts-litecell15/l1_if.c b/src/osmo-bts-litecell15/l1_if.c
index 99852e3..3710fa8 100644
--- a/src/osmo-bts-litecell15/l1_if.c
+++ b/src/osmo-bts-litecell15/l1_if.c
@@ -1035,7 +1035,7 @@
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
else
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
diff --git a/src/osmo-bts-oc2g/l1_if.c b/src/osmo-bts-oc2g/l1_if.c
index 87c7cf7..d9c8da0 100644
--- a/src/osmo-bts-oc2g/l1_if.c
+++ b/src/osmo-bts-oc2g/l1_if.c
@@ -1091,7 +1091,7 @@
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
else
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
diff --git a/src/osmo-bts-octphy/l1_if.c b/src/osmo-bts-octphy/l1_if.c
index f149c04..32e738f 100644
--- a/src/osmo-bts-octphy/l1_if.c
+++ b/src/osmo-bts-octphy/l1_if.c
@@ -1195,7 +1195,7 @@
if (ra_ind->LchId.bySubChannelNb ==
cOCTVC1_GSM_ID_SUB_CHANNEL_NB_ENUM_ALL &&
ra_ind->LchId.bySAPI == cOCTVC1_GSM_SAPI_ENUM_RACH) {
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
} else {
struct gsm_lchan *lchan = get_lchan_by_lchid(trx,
&ra_ind->LchId);
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 6f61c67..0777d0e 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -1030,7 +1030,7 @@
if (!lchan || lchan->ts->pchan == GSM_PCHAN_CCCH ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4 ||
lchan->ts->pchan == GSM_PCHAN_CCCH_SDCCH4_CBCH)
- rach_ind_param.chan_nr = 0x88;
+ rach_ind_param.chan_nr = RSL_CHAN_RACH;
else
rach_ind_param.chan_nr = gsm_lchan2chan_nr(lchan);
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/14381
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I7f54fccdae6799e5f4d956a101e11c2d6f998546
Gerrit-Change-Number: 14381
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in ...osmo-trx[master]: Add rate_ctr support to store/retrieve SDR errors through VTY
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14167 ) Change subject: Add rate_ctr support to store/retrieve SDR errors through VTY .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14167 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I78b158141697e5714d04db8b9ccc96f31f34f439 Gerrit-Change-Number: 14167 Gerrit-PatchSet: 2 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Comment-Date: Wed, 05 Jun 2019 18:03:25 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: lms: Drop unusued variable masterClockRate
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14367 ) Change subject: lms: Drop unusued variable masterClockRate .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14367 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I19192925d008046f474615a0476b52ddee9a9d78 Gerrit-Change-Number: 14367 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 05 Jun 2019 18:05:17 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-trx[master]: lms: Fix stream_stats checks with overrun/underrun
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/14368 ) Change subject: lms: Fix stream_stats checks with overrun/underrun .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/14368 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: I677232a7b12ee83d26aa34d92f76a91d4b5a63a6 Gerrit-Change-Number: 14368 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Harald Welte Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Wed, 05 Jun 2019 18:05:40 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-pcu[master]: gprs_bssgp_pcu: explicit allocate & initialize bssgp_nsi instance
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/14171 ) Change subject: gprs_bssgp_pcu: explicit allocate & initialize bssgp_nsi instance .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/14171 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I2aa53ea54e9352577f6280ad7b9d1d9da9f57eaf Gerrit-Change-Number: 14171 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 07 Jun 2019 00:32:31 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: BTS: pcu_rr_suspend clean up and release the channel
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14396 ) Change subject: BTS: pcu_rr_suspend clean up and release the channel .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14396 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: I55827626803ca81b68f905fd0df3126367951f39 Gerrit-Change-Number: 14396 Gerrit-PatchSet: 2 Gerrit-Owner: lynxis lazus Gerrit-Reviewer: Hoernchen Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: lynxis lazus Gerrit-Comment-Date: Fri, 07 Jun 2019 00:43:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-msc[master]: libmsc/db.c: get rid of hard-coded SMS expiry threshold
Hello Stefan Sperling, laforge, Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-msc/+/13631 to look at the new patch set (#7). Change subject: libmsc/db.c: get rid of hard-coded SMS expiry threshold .. libmsc/db.c: get rid of hard-coded SMS expiry threshold The initial idea of the SMS expiry threshold was to avoid storing SMS messages with too long validity time (e.g. 63 weeks). Unfortunately, neither this feature was properly documented, nor the expiry threshold is configurable. Moreover, it has been implemented in a wrong way, so instead of deleting the oldest expired message, it would delete the youngest one or nothing: SELECT ... FROM SMS ORDER BY created LIMIT 1; while it should be sorted by 'valid_until' in ascending order: SELECT .. FROM SMS ORDER BY valid_until LIMIT 1; Thus, if the oldest message is expired, it gets deleted. If the oldest message is not expired yet, there is nothing to delete. Change-Id: I0ce6b1ab50986dc69a2be4ea62b6a24c7f3f8f0a --- M src/libmsc/db.c M tests/db_sms/db_sms_test.ok 2 files changed, 12 insertions(+), 19 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/31/13631/7 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/13631 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I0ce6b1ab50986dc69a2be4ea62b6a24c7f3f8f0a Gerrit-Change-Number: 13631 Gerrit-PatchSet: 7 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: Stefan Sperling Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-CC: pespin Gerrit-MessageType: newpatchset
Change in ...libosmocore[master]: gsm48_decode_bcd_number2: fix ENOSPC edge case
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14397 ) Change subject: gsm48_decode_bcd_number2: fix ENOSPC edge case .. Patch Set 2: Code-Review-1 (3 comments) https://gerrit.osmocom.org/#/c/14397/2/tests/gsm0408/gsm0408_test.c File tests/gsm0408/gsm0408_test.c: https://gerrit.osmocom.org/#/c/14397/2/tests/gsm0408/gsm0408_test.c@739 PS2, Line 739: .dec_buf_lim = 4 Also, the actual strlen(dec_ascii) is 3. There is no truncation with 4. Exactly 3 reproduces the problem: the number is truncated to "12", while rc is 0. https://gerrit.osmocom.org/#/c/14397/2/tests/gsm0408/gsm0408_test.c@739 PS2, Line 739: .dec_buf_lim = 4 comma is missing https://gerrit.osmocom.org/#/c/14397/2/tests/gsm0408/gsm0408_test.c@740 PS2, Line 740: } comma is missing -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe Gerrit-Change-Number: 14397 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 07 Jun 2019 08:31:50 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...libosmocore[master]: gsm48_decode_bcd_number2: fix ENOSPC edge case
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14397 ) Change subject: gsm48_decode_bcd_number2: fix ENOSPC edge case .. Patch Set 2: I recommend to extend the unit test first, so you could show the problem in the expected output, and then the fix in a separate change. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe Gerrit-Change-Number: 14397 Gerrit-PatchSet: 2 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 07 Jun 2019 08:33:34 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in ...libosmocore[master]: gsm48_decode_bcd_number2: fix ENOSPC edge case
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/14397 ) Change subject: gsm48_decode_bcd_number2: fix ENOSPC edge case .. Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/14397 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie05900aca50cc7fe8a45d17844dbfcd905fd82fe Gerrit-Change-Number: 14397 Gerrit-PatchSet: 4 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 07 Jun 2019 09:51:53 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: rx_check_imei_req(): fix IMEI bounds checking
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-hlr/+/14399 )
Change subject: rx_check_imei_req(): fix IMEI bounds checking
..
Patch Set 1:
(2 comments)
https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c
File src/hlr.c:
https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c@a483
PS1, Line 483:
AFAIR, gsm48_decode_bcd_number2() is not NULL-safe, so I would keep this check.
Others can be safely removed, for sure.
https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c@483
PS1, Line 483: gsm48_decode_bcd_number2
Cosmetic, not critical: it would be good to store the returned value, and print
it in the error message below. I find it helpful for trouble shooting.
rc = gsm48_decode_bcd_number2(...);
if (rc) { ... }
--
To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-hlr
Gerrit-Branch: master
Gerrit-Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6
Gerrit-Change-Number: 14399
Gerrit-PatchSet: 1
Gerrit-Owner: osmith
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Fri, 07 Jun 2019 12:44:11 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: add Check IMEI tests
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 ) Change subject: hlr: add Check IMEI tests .. Patch Set 1: Code-Review+1 (1 comment) https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn File hlr/HLR_Tests.ttcn: https://gerrit.osmocom.org/#/c/14402/1/hlr/HLR_Tests.ttcn@1175 PS1, Line 1175: res So you return GSUP_PDU, but never use it? -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14402 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: I97c8462f0817149feadd0c4865e3df6c2af92a80 Gerrit-Change-Number: 14402 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 07 Jun 2019 13:17:04 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: hlr: f_vty_subscr_show(): add invert arg
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 ) Change subject: hlr: f_vty_subscr_show(): add invert arg .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14401 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: I176d8fd2ee74e1eb7ac797f931cd6005d398740f Gerrit-Change-Number: 14401 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 07 Jun 2019 13:17:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in ...osmo-hlr[master]: rx_check_imei_req(): fix IMEI bounds checking
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hlr/+/14399 ) Change subject: rx_check_imei_req(): fix IMEI bounds checking .. Patch Set 1: (1 comment) https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c File src/hlr.c: https://gerrit.osmocom.org/#/c/14399/1/src/hlr.c@483 PS1, Line 483: gsm48_decode_bcd_number2 > [...] we would need to add another if() block beforehand [...] Yep, so then you could print a better message than "failed to decode", if there was actually nothing to decode ;) -- To view, visit https://gerrit.osmocom.org/c/osmo-hlr/+/14399 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hlr Gerrit-Branch: master Gerrit-Change-Id: I060a8db98fb882e4815d1709a5d85bc0143a73a6 Gerrit-Change-Number: 14399 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Comment-Date: Fri, 07 Jun 2019 13:20:41 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria Comment-In-Reply-To: osmith Gerrit-MessageType: comment
Change in ...osmo-ttcn3-hacks[master]: CTRL_Types: Fix SET value not encoded in message
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 ) Change subject: CTRL_Types: Fix SET value not encoded in message .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/14405 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: I9e0132429265d03caa97af2b2f44eed0327f3200 Gerrit-Change-Number: 14405 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Comment-Date: Fri, 07 Jun 2019 15:02:41 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
Attention is currently required from: pespin, dexter.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27555 )
Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
..
Patch Set 1: Code-Review+2
(1 comment)
Patchset:
PS1:
1+1
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27555
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I56bebe1374eb803e3c1e9f08dda4da50a074ab0b
Gerrit-Change-Number: 27555
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-Attention: pespin
Gerrit-Attention: dexter
Gerrit-Comment-Date: Tue, 05 Apr 2022 13:45:01 +
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch
Attention is currently required from: laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27552 ) Change subject: osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27552 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I7902b4709bc3f418174e8373f52e87bb31cdc826 Gerrit-Change-Number: 27552 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Reviewer: pespin Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Tue, 05 Apr 2022 13:45:12 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): indicate BER10k=0 for FACCH BFIs
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27551 )
Change subject: osmo-bts-trx: rx_tchh_fn(): indicate BER10k=0 for FACCH BFIs
..
osmo-bts-trx: rx_tchh_fn(): indicate BER10k=0 for FACCH BFIs
It makes no sense to store BER10k value of an Uplink FACCH frame
in order to indicate it in a BFI later on. Given that these BFIs
are generated artificially, it's fine to indicate BER10k=0.
Change-Id: I24d12892760dca0ad0a5c2abca9fc66523d9e614
Related: I1ad9fa3815feb2b4da608ab7df716a87ba1f2f91
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 2 insertions(+), 6 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index 1e1a2d7..2806117 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -126,7 +126,6 @@
uint8_t dl_ongoing_facch; /* FACCH/H on downlink */
uint8_t ul_ongoing_facch; /* FACCH/H on uplink */
struct l1sched_meas_set meas_avg_facch; /* measurement results for
last FACCH */
- uint16_tber10k_facch; /* bit error rate for last
FACCH */
uint8_t dl_facch_bursts; /* number of remaining DL
FACCH bursts */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index edbb566..4553132 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -68,7 +68,7 @@
struct l1sched_meas_set meas_avg;
unsigned int fn_begin;
unsigned int fn_tch_end;
- uint16_t ber10k;
+ uint16_t ber10k = 0;
uint8_t is_sub = 0;
uint8_t ft;
bool mask_stolen_tch_block = false;
@@ -127,7 +127,6 @@
memcpy(*bursts_p + 232, *bursts_p + 464, 232);
/* we have already sent the first BFI when a FACCH/H frame
* was decoded (see below), now send the second one. */
- ber10k = 0;
memset(&meas_avg, 0, sizeof(meas_avg));
/* In order to provide an even stream of measurement reports
* we ask the code below to mask the missing TCH/H block
@@ -289,12 +288,12 @@
* measurement result for the one missing TCH block
* measurement */
memcpy(&chan_state->meas_avg_facch, &meas_avg,
sizeof(meas_avg));
- chan_state->ber10k_facch = ber10k;
/* Invalidate the current measurement result to prevent the
* code below from handing up the current measurement a second
* time. */
memset(&meas_avg, 0, sizeof(meas_avg));
+ ber10k = 0;
bfi:
/* A FACCH/H frame replaces two speech frames, so we need to
send two BFIs.
* One is sent here, another will be sent two bursts later (see
above). */
@@ -371,9 +370,7 @@
* from the FACCH transmission. */
if (mask_stolen_tch_block) {
memcpy(&meas_avg, &chan_state->meas_avg_facch,
sizeof(meas_avg));
- ber10k = chan_state->ber10k_facch;
memset(&chan_state->meas_avg_facch, 0, sizeof(meas_avg));
- chan_state->ber10k_facch = 0;
}
return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27551
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I24d12892760dca0ad0a5c2abca9fc66523d9e614
Gerrit-Change-Number: 27551
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): also use meas_avg for BFI
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27553 )
Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): also use meas_avg for BFI
..
osmo-bts-trx: rx_{tchf,tchh}_fn(): also use meas_avg for BFI
In the current implementation of both TCH/F and TCH/H lchans, we
set the 'bfi_flag' to true only if decoding fails. Perhaps this
was not the case when I wrote [1], so using meas_avg might result
in using uninitialized memory. This is not the case anymore.
Pass the *averaged* measurememnts regardless of decoding result.
Change-Id: I23f767364a018d30d04885990adf69b50b2c9738
Related: [1] I2b02b51fea5664f161382a4ddc63dbf14ffc9ac5
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 4 insertions(+), 10 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index 0388ec0..c6c5532 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -302,11 +302,8 @@
compose_l1sap:
fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_F);
return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
- /* FIXME: what should we use for BFI
here? */
- bfi_flag ? bi->toa256 : meas_avg.toa256,
ber10k,
- bfi_flag ? bi->rssi : meas_avg.rssi,
- bfi_flag ? bi->ci_cb : meas_avg.ci_cb,
- is_sub);
+ meas_avg.toa256, ber10k, meas_avg.rssi,
+ meas_avg.ci_cb, is_sub);
}
/* common section for generation of TCH bursts (TCH/H and TCH/F).
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index e97adbd..3a66321 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -350,11 +350,8 @@
fn_begin = gsm0502_fn_remap(fn_tch_end, FN_REMAP_TCH_H1);
return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
- /* FIXME: what should we use for BFI
here? */
- bfi_flag ? bi->toa256 : meas_avg.toa256,
ber10k,
- bfi_flag ? bi->rssi : meas_avg.rssi,
- bfi_flag ? bi->ci_cb : meas_avg.ci_cb,
- is_sub);
+ meas_avg.toa256, ber10k, meas_avg.rssi,
+ meas_avg.ci_cb, is_sub);
}
/* common section for generation of TCH bursts (TCH/H and TCH/F).
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27553
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I23f767364a018d30d04885990adf69b50b2c9738
Gerrit-Change-Number: 27553
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27555 )
Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
..
osmo-bts-trx: rx_{tchf,tchh}_fn(): ensure complete set of bursts
The idea of this change is to avoid attempting to decode the burst
buffer unless it's filled up completely. This eliminates expected
decoding errors in the beginning of lchan's lifetime. Moreover
this allows us to be sure that the measurement history is complete,
so that we can abuse it to store TDMA frame numbers later.
Note that even in the absence of NOPE indications (TRXDv0 case)
we can still be sure that the burst mask has no gaps due to lost
bursts, because they are compensated by trx_sched_calc_frame_loss().
Change-Id: I56bebe1374eb803e3c1e9f08dda4da50a074ab0b
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 14 insertions(+), 14 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index a689a1f..9a168af 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -85,7 +85,7 @@
if (bi->bid == 0) {
memcpy(*bursts_p, *bursts_p + 464, 464);
memset(*bursts_p + 464, 0, 464);
- *mask = 0x0;
+ *mask = *mask << 4;
}
/* update mask */
@@ -106,13 +106,13 @@
if (bi->bid != 3)
return 0;
- /* check for complete set of bursts */
- if ((*mask & 0xf) != 0xf) {
- LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi,
- "Received incomplete frame (%u/%u)\n",
- bi->fn % l1ts->mf_period, l1ts->mf_period);
+ /* fill up the burst buffer so that we have 8 bursts in there */
+ if (OSMO_UNLIKELY((*mask & 0xff) != 0xff)) {
+ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi,
+ "UL burst buffer is not filled up: mask=0x%02x !=
0xff\n",
+ *mask);
+ return 0; /* TODO: send BFI */
}
- *mask = 0x0;
/* decode
* also shift buffer by 4 bursts for interleaving */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index 6b49974..627291e 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -92,7 +92,7 @@
memcpy(*bursts_p, *bursts_p + 232, 232);
memcpy(*bursts_p + 232, *bursts_p + 464, 232);
memset(*bursts_p + 464, 0, 232);
- *mask = 0x0;
+ *mask = *mask << 2;
}
/* update mask */
@@ -113,13 +113,13 @@
if (bi->bid != 1)
return 0;
- /* check for complete set of bursts */
- if ((*mask & 0x3) != 0x3) {
- LOGL1SB(DL1P, LOGL_NOTICE, l1ts, bi,
- "Received incomplete frame (%u/%u)\n",
- bi->fn % l1ts->mf_period, l1ts->mf_period);
+ /* fill up the burst buffer so that we have 6 bursts in there */
+ if (OSMO_UNLIKELY((*mask & 0x3f) != 0x3f)) {
+ LOGL1SB(DL1P, LOGL_DEBUG, l1ts, bi,
+ "UL burst buffer is not filled up: mask=0x%02x !=
0x3f\n",
+ *mask);
+ return 0; /* TODO: send BFI */
}
- *mask = 0x0;
/* skip decoding of the last 4 bursts of FACCH/H */
if (chan_state->ul_ongoing_facch) {
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27555
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I56bebe1374eb803e3c1e9f08dda4da50a074ab0b
Gerrit-Change-Number: 27555
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27552 ) Change subject: osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch .. osmo-bts-trx: rx_tchh_fn(): get rid of chan_state->meas_avg_facch FACCH/H takes out two speech frames, so we send two BFIs once we have received it in rx_tchh_fn(). The upper layers responsible for handling of the Uplink measurements expect a fixed amount of measurement samples, so currently we do: * send a FACCH frame with the associated measurememnts (S6N6), * send the 1st BFI with invalidated measurements (RSSI=0), * send the 2nd BFI with the stored measurememnts of FACCH. This is achieved by preserving a copy of the FACCH measurememnts in chan_state->meas_avg_facch and then using it two bursts later. The same goal can be achieved a lot easier by sending the associated measurements with both BFIs as if no FACCH was received: * send a FACCH frame with invalidated measurememnts (RSSI=0), * send the 1st BFI with the associated measurememnts (S6N4), * send the 2nd BFI with the associated measurememnts (S6N4). This eliminates the need to store anything outside of the existing measurement history and simplifies the code a lot. Also, this eliminates the need for using a dedicated averaging mode S6N6. Varified by running BTS_Tests.TC_meas_res_speech_tchh_facch. Change-Id: I7902b4709bc3f418174e8373f52e87bb31cdc826 Related: I1ad9fa3815feb2b4da608ab7df716a87ba1f2f91 --- M include/osmo-bts/scheduler.h M src/osmo-bts-trx/sched_lchan_tchh.c 2 files changed, 7 insertions(+), 32 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved dexter: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h index 2806117..f671874 100644 --- a/include/osmo-bts/scheduler.h +++ b/include/osmo-bts/scheduler.h @@ -125,7 +125,6 @@ /* TCH/H */ uint8_t dl_ongoing_facch; /* FACCH/H on downlink */ uint8_t ul_ongoing_facch; /* FACCH/H on uplink */ - struct l1sched_meas_set meas_avg_facch; /* measurement results for last FACCH */ uint8_t dl_facch_bursts; /* number of remaining DL FACCH bursts */ diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c b/src/osmo-bts-trx/sched_lchan_tchh.c index 4553132..e97adbd 100644 --- a/src/osmo-bts-trx/sched_lchan_tchh.c +++ b/src/osmo-bts-trx/sched_lchan_tchh.c @@ -71,7 +71,6 @@ uint16_t ber10k = 0; uint8_t is_sub = 0; uint8_t ft; - bool mask_stolen_tch_block = false; bool fn_is_cmi; /* If handover RACH detection is turned on, treat this burst as an Access Burst. @@ -127,11 +126,7 @@ memcpy(*bursts_p + 232, *bursts_p + 464, 232); /* we have already sent the first BFI when a FACCH/H frame * was decoded (see below), now send the second one. */ - memset(&meas_avg, 0, sizeof(meas_avg)); - /* In order to provide an even stream of measurement reports -* we ask the code below to mask the missing TCH/H block -* measurement report with the FACCH measurement results. */ - mask_stolen_tch_block = true; + trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode); goto bfi; } @@ -248,8 +243,6 @@ ber10k = compute_ber10k(n_bits_total, n_errors); /* average measurements of the last N (depends on mode) bursts */ - if (rc == GSM_MACBLOCK_LEN) - meas_avg_mode = SCHED_MEAS_AVG_M_S6N6; trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode); /* Check if the frame is bad */ @@ -277,22 +270,15 @@ fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H0); else fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_H1); + /* In order to provide an even stream of measurement reports, here we +* intentionally invalidate RSSI, so that this report gets dropped in +* process_l1sap_meas_data(). The averaged results will still be sent +* with the first BFI (see below). */ _sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan, tch_data + amr, GSM_MACBLOCK_LEN, - meas_avg.rssi, meas_avg.toa256, - meas_avg.ci_cb, ber10k, + 0, /* intentionally invalidate RSSI */ + meas_avg.toa256, meas_avg.ci_cb, ber10k, PRES_INFO_UNKNOWN); - - /* Keep a copy of the measurement results of the last FACCH -* transmission
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): shift Rx burst buffer on bid=0
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27554 )
Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): shift Rx burst buffer on
bid=0
..
osmo-bts-trx: rx_{tchf,tchh}_fn(): shift Rx burst buffer on bid=0
For both TCH/F and TCH/H, the receive burst buffer needs to be
periodically shifted leftwards due to the nature of block-diagonal
interleaving. Currently we do this on receipt of bid=3 for TCH/F
and bid=1 for TCH/H, right after attempting to decode the buffer.
If for some reason we return early before attempting to decode the
buffer, the content of that buffer might not be shifted and some
bursts might be overwritten. This can be easily avoided by doing
the shifting on receipt of bid=0 for both TCH/H and TCH/F.
Change-Id: I0bd69f5a8f5c665fb5f00c127bc3fe1d91167abb
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index c6c5532..a689a1f 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -81,8 +81,9 @@
return -ENOMEM;
}
- /* clear burst */
+ /* shift the buffer by 4 bursts leftwards */
if (bi->bid == 0) {
+ memcpy(*bursts_p, *bursts_p + 464, 464);
memset(*bursts_p + 464, 0, 464);
*mask = 0x0;
}
@@ -205,7 +206,6 @@
tch_mode);
return -EINVAL;
}
- memcpy(*bursts_p, *bursts_p + 464, 464);
/* average measurements of the last N (depends on mode) bursts */
trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode);
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index 3a66321..6b49974 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -87,8 +87,10 @@
return -ENOMEM;
}
- /* clear burst */
+ /* shift the buffer by 2 bursts leftwards */
if (bi->bid == 0) {
+ memcpy(*bursts_p, *bursts_p + 232, 232);
+ memcpy(*bursts_p + 232, *bursts_p + 464, 232);
memset(*bursts_p + 464, 0, 232);
*mask = 0x0;
}
@@ -122,8 +124,6 @@
/* skip decoding of the last 4 bursts of FACCH/H */
if (chan_state->ul_ongoing_facch) {
chan_state->ul_ongoing_facch = 0;
- memcpy(*bursts_p, *bursts_p + 232, 232);
- memcpy(*bursts_p + 232, *bursts_p + 464, 232);
/* we have already sent the first BFI when a FACCH/H frame
* was decoded (see below), now send the second one. */
trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode);
@@ -238,8 +238,7 @@
tch_mode);
return -EINVAL;
}
- memcpy(*bursts_p, *bursts_p + 232, 232);
- memcpy(*bursts_p + 232, *bursts_p + 464, 232);
+
ber10k = compute_ber10k(n_bits_total, n_errors);
/* average measurements of the last N (depends on mode) bursts */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27554
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I0bd69f5a8f5c665fb5f00c127bc3fe1d91167abb
Gerrit-Change-Number: 27554
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchf,tchh}_fn(): get TDMA FN from meas history
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27556 )
Change subject: osmo-bts-trx: rx_{tchf,tchh}_fn(): get TDMA FN from meas history
..
osmo-bts-trx: rx_{tchf,tchh}_fn(): get TDMA FN from meas history
Once we have an Uplink speech or FACCH frame decoded, we need to
hand it over to the upper layers indicating TDMA frame number of
the *first* burst corresponding to the beginning of a block.
Currently we use libosmogsm's gsm0502_fn_remap() API to calculate
the first TDMA frame number from the given last frame number.
This API involves iterating over the pre-calculated offset tables
for different channel and payload types, and thus imposes some
additional CPU cycles. Another downside of the current approach
is that we have to perform such lookups several times for each
decoded L2 frame, e.g. for FACCH on TCH/AHS we do it three times!
In this patch I propose an alternative approach of storing TDMA
frame numbers in the measurement history, together with the
associated samples. This way we can easily get N-th frame number
from there without performing any additional computations, other
than what we already do during the measurement processing.
Change-Id: Id9a2b7b0f1a1ad7cfbbab862faf521e135c90605
---
M include/osmo-bts/scheduler.h
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
M src/osmo-bts-trx/scheduler_trx.c
4 files changed, 38 insertions(+), 36 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/include/osmo-bts/scheduler.h b/include/osmo-bts/scheduler.h
index f671874..e39315f 100644
--- a/include/osmo-bts/scheduler.h
+++ b/include/osmo-bts/scheduler.h
@@ -80,6 +80,7 @@
/* A set of measurements belonging to one Uplink burst */
struct l1sched_meas_set {
+ uint32_tfn; /* TDMA frame number */
int16_t toa256; /* Timing of Arrival (1/256 of
a symbol) */
int16_t ci_cb; /* Carrier-to-Interference (cB)
*/
float rssi; /* RSSI (dBm) */
@@ -325,3 +326,5 @@
void trx_sched_meas_avg(const struct l1sched_chan_state *chan_state,
struct l1sched_meas_set *avg,
enum sched_meas_avg_mode mode);
+uint32_t trx_sched_lookup_fn(const struct l1sched_chan_state *chan_state,
+const unsigned int shift);
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index 9a168af..c8ad383 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -131,7 +131,7 @@
* the first FN 4,13,21 defines that CMR is included in frame.
* NOTE: A frame ends 7 FN after start.
*/
- fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_F);
+ fn_begin = trx_sched_lookup_fn(chan_state, 8);
amr_is_cmr = !ul_amr_fn_is_cmi(fn_begin);
/* The AFS_ONSET frame itself does not result into an RTP frame
@@ -209,6 +209,8 @@
/* average measurements of the last N (depends on mode) bursts */
trx_sched_meas_avg(chan_state, &meas_avg, meas_avg_mode);
+ /* meas_avg.fn now contains TDMA frame number of the first burst */
+ fn_begin = meas_avg.fn;
/* Check if the frame is bad */
if (rc < 0) {
@@ -231,7 +233,6 @@
/* FACCH */
if (rc == GSM_MACBLOCK_LEN) {
- fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_FACCH_F);
_sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan,
tch_data + amr, GSM_MACBLOCK_LEN,
meas_avg.rssi, meas_avg.toa256,
@@ -300,7 +301,6 @@
/* TCH or BFI */
compose_l1sap:
- fn_begin = gsm0502_fn_remap(bi->fn, FN_REMAP_TCH_F);
return _sched_compose_tch_ind(l1ts, fn_begin, bi->chan, tch_data, rc,
meas_avg.toa256, ber10k, meas_avg.rssi,
meas_avg.ci_cb, is_sub);
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index 627291e..1778d36 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -67,7 +67,6 @@
enum sched_meas_avg_mode meas_avg_mode = SCHED_MEAS_AVG_M_S6N4;
struct l1sched_meas_set meas_avg;
unsigned int fn_begin;
- unsigned int fn_tch_end;
uint16_t ber10k = 0;
uint8_t is_sub = 0;
uint8_t ft;
@@ -127,6 +126,8 @@
/* we have already sent the first BFI when a FACCH/H frame
* was decoded (see below), now send the second one. */
trx_sched_mea
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27557 )
Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables
..
osmo-bts-trx: rx_{tchh,tchf}_fn(): use AMR CMI lookup tables
3GPP TS 45.009 defines that Codec Mode Indications shall be sent
with speech frames having specific TDMA frame numbers of their
*first* bursts, which are defined in tables 3.2.1.3-{1,2,3,4}.
Performance-wise it's batter to have these tables implemented as
arrays, rather then using the 'switch' statement. We can simplify
things even further and have TDMA frame numbers corresponding to
the *last* bursts in them. This eliminates the need of doing an
additional last-to-first mapping, so that bi->fn can be used.
Change-Id: I46def864729c8f9063af201750456771ea5558d5
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
M src/osmo-bts-trx/sched_utils.h
3 files changed, 20 insertions(+), 12 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
osmith: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index c8ad383..6a9a0f0 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -131,8 +131,7 @@
* the first FN 4,13,21 defines that CMR is included in frame.
* NOTE: A frame ends 7 FN after start.
*/
- fn_begin = trx_sched_lookup_fn(chan_state, 8);
- amr_is_cmr = !ul_amr_fn_is_cmi(fn_begin);
+ amr_is_cmr = !sched_tchf_ul_amr_cmi_map[bi->fn % 26];
/* The AFS_ONSET frame itself does not result into an RTP frame
* since it only contains a recognition pattern that marks the
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index 1778d36..369e35b 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -165,16 +165,7 @@
break;
}
- /* Calculate the frame number where the block begins. Note that
-* we need to traverse the measurement histort back by 6 bursts,
-* not by 4 bursts. The reason for this is that the burst shift
-* buffer we use for decoding is 6 bursts wide (one SACCH
block) but
-* TCH/H blocks are only 4 bursts wide. The decoder functions
look
-* at the beginning of the buffer while we shift into it at the
end,
-* this means that TCH/H blocks always decoded delayed by two
frame
-* number positions late. */
- fn_begin = trx_sched_lookup_fn(chan_state, 6);
- fn_is_cmi = ul_amr_fn_is_cmi(fn_begin);
+ fn_is_cmi = sched_tchh_ul_amr_cmi_map[bi->fn % 26];
/* See comment in function rx_tchf_fn() */
amr = 2;
diff --git a/src/osmo-bts-trx/sched_utils.h b/src/osmo-bts-trx/sched_utils.h
index f76e49b..398083d 100644
--- a/src/osmo-bts-trx/sched_utils.h
+++ b/src/osmo-bts-trx/sched_utils.h
@@ -37,6 +37,24 @@
return 1 * n_errors / n_bits_total;
}
+/* 3GPP TS 45.009, table 3.2.1.3-{1,3}: AMR on Uplink TCH/F */
+static const uint8_t sched_tchf_ul_amr_cmi_map[26] = {
+ [7] = 1, /* TCH/F: first=0 / last=7 */
+ [16] = 1, /* TCH/F: first=8 / last=16 */
+ [24] = 1, /* TCH/F: first=17 / last=24 */
+};
+
+/* 3GPP TS 45.009, table 3.2.1.3-{2,4}: AMR on Uplink TCH/H */
+static const uint8_t sched_tchh_ul_amr_cmi_map[26] = {
+ [6] = 1, /* TCH/H(0): first=0 / last=6 */
+ [15] = 1, /* TCH/H(0): first=8 / last=15 */
+ [23] = 1, /* TCH/H(0): first=17 / last=23 */
+
+ [7] = 1, /* TCH/H(1): first=1 / last=7 */
+ [16] = 1, /* TCH/H(1): first=9 / last=16 */
+ [24] = 1, /* TCH/H(1): first=18 / last=24 */
+};
+
/*! determine whether an uplink AMR block is CMI according to 3GPP TS 45.009.
* \param[in] fn_begin frame number of the beginning of the block.
* \returns true in case of CMI; false otherwise. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27557
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I46def864729c8f9063af201750456771ea5558d5
Gerrit-Change-Number: 27557
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: osmith
Gerrit-MessageType: merged
Change in osmo-ttcn3-hacks[master]: BTS_Tests: add altstep as_dl_sacch_lapdm_ab
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 ) Change subject: BTS_Tests: add altstep as_dl_sacch_lapdm_ab .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: I am adding it for the sake of completeness. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 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: I3ba17683892e8aa1694bb6dd32d8b37660020026 Gerrit-Change-Number: 27519 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Comment-Date: Tue, 05 Apr 2022 13:52:46 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: BTS_Tests: add altstep as_dl_sacch_lapdm_ab
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519 )
Change subject: BTS_Tests: add altstep as_dl_sacch_lapdm_ab
..
BTS_Tests: add altstep as_dl_sacch_lapdm_ab
Change-Id: I3ba17683892e8aa1694bb6dd32d8b37660020026
---
M bts/BTS_Tests.ttcn
1 file changed, 21 insertions(+), 0 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 1d3dfe7..3a3d7cc 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -917,6 +917,27 @@
}
}
+/* This altstep triggers on receipt of a Downlink SACCH containing a L2 payload
+ * that matches the given LAPDm frame, as well as the given SACCH L1 header. */
+private altstep as_dl_sacch_lapdm_ab(out SacchL1Header l1h, out LapdmFrameAB
frame,
+template (present) LapdmFrameAB tr_frame
:= ?,
+template (present) SacchL1Header tr_l1h :=
?,
+template (present) GsmSapi sapi := ?)
+runs on ConnHdlr {
+ var L1ctlDlMessage dl_msg;
+ template (present) RslLinkId link_id := tr_RslLinkID_SACCH(sapi);
+ template (present) L1ctlDataReq tr_data := {
+ l1header := tr_l1h,
+ l2_payload := decmatch tr_frame
+ };
+
+ [] as_l1ctl_dl_msg(dl_msg, decmatch tr_data, g_chan_nr, link_id) {
+ var octetstring data := dl_msg.payload.data_ind.payload;
+ l1h := dec_SacchL1Header(substr(data, 0, 2));
+ frame := dec_LapdmFrameAB(substr(data, 2, lengthof(data) - 2));
+ }
+}
+
/* This altstep is built on top of as_dl_dcch_lapdm_ab(), and triggers on
receipt
* of a LAPDm AB frame with a L3 payload matching the given template. The L3
* payload is treated as PDU_ML3_NW_MS. */
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27519
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: I3ba17683892e8aa1694bb6dd32d8b37660020026
Gerrit-Change-Number: 27519
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-MessageType: merged
Change in osmo-bsc[master]: contrib/osmo-bsc.spec.in: add new config files
Attention is currently required from: osmith, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27653 ) Change subject: contrib/osmo-bsc.spec.in: add new config files .. Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: Thanks for fixing this! -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27653 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie6c68681e5e68f4aa071fe4cee8f49040a4463e6 Gerrit-Change-Number: 27653 Gerrit-PatchSet: 1 Gerrit-Owner: osmith Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: pespin Gerrit-Attention: osmith Gerrit-Attention: pespin Gerrit-Comment-Date: Wed, 06 Apr 2022 09:49:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: always mark MGCP ci as completed
Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27656 ) Change subject: assignment_fsm: always mark MGCP ci as completed .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27656 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I5ab10ee7fd9c5d7608e8a06893881d990943feed Gerrit-Change-Number: 27656 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 08:12:09 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bsc[master]: assignment_fsm: always update RTP info
Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/27657 ) Change subject: assignment_fsm: always update RTP info .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27657 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I0788d1f013b8f820f559b6ed58a5f9bb8a02e0b4 Gerrit-Change-Number: 27657 Gerrit-PatchSet: 1 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 08:13:26 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: as_Media_mgw: fail on DLCX
Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 ) Change subject: bsc: as_Media_mgw: fail on DLCX .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27658 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: I0633f60f09d58802f6be0238ef41a632d93a4327 Gerrit-Change-Number: 27658 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 08:16:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: bsc: add TC_emerg_call_and_lcs_loc_req
Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 ) Change subject: bsc: add TC_emerg_call_and_lcs_loc_req .. Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27659 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: I95037374c45943cb14401bc48f16a39c2fcbe1f5 Gerrit-Change-Number: 27659 Gerrit-PatchSet: 2 Gerrit-Owner: neels Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: neels Gerrit-Comment-Date: Thu, 07 Apr 2022 08:27:16 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654 ) Change subject: Diameter_Templates.ttcn: Avoid sending AuthAppId Relay in CEA .. Patch Set 1: Code-Review+2 (3 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654/comment/14ab4bfa_51622a66 PS1, Line 7: Relay This is the key word here. Patchset: PS1: The comments below helped me to understand the patch better while doing review. File library/DIAMETER_Templates.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654/comment/23b0b8a2_34433273 PS1, Line 883: ts_AVP_AuthAppId Here I see that the ts_AVP_AuthAppId was listed twice, so we're including only one now with the given auth_app_id value. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27654 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: I0a9daf094f4c27c0b4de5581ddd56feced8e5732 Gerrit-Change-Number: 27654 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 08:33:21 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ci[master]: jobs: Add ttcn3-pgw-test jenkins job
Attention is currently required from: osmith, laforge, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/27660 ) Change subject: jobs: Add ttcn3-pgw-test jenkins job .. Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/27660 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I363a7a8eb524abfeb45c81603c29cea96f86a787 Gerrit-Change-Number: 27660 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Reviewer: laforge Gerrit-Reviewer: osmith Gerrit-Attention: osmith Gerrit-Attention: laforge Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 16:46:03 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pgw: Add T_guard
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 ) Change subject: pgw: Add T_guard .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27661 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: I9dce4aee4a0b1181bb7dc1a53fb254e6d17cf22e Gerrit-Change-Number: 27661 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 17:20:38 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-ttcn3-hacks[master]: pgw: Add expected_results.xml
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 ) Change subject: pgw: Add expected_results.xml .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27682 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: I451b10a7b79854e630e7f2d487423dc39ade5bbd Gerrit-Change-Number: 27682 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 17:21:08 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/27683 )
Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
..
osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
There is no reason not to use 'chan_state->tch_mode' directly in
the 'switch' statement. If a logical channel is in signalling
mode, then both 'chan_state->{rsl,tch}_cmode' are set to
RSL_CMOD_SPD_SIGN and GSM48_CMODE_SIGN, respectively.
Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/27683/1
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index 6a9a0f0..4f5d6d3 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -116,8 +116,8 @@
/* decode
* also shift buffer by 4 bursts for interleaving */
- switch ((rsl_cmode != RSL_CMOD_SPD_SPEECH) ? GSM48_CMODE_SPEECH_V1
- : tch_mode) {
+ switch (tch_mode) {
+ case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* FR */
rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0,
&n_errors, &n_bits_total);
if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index 369e35b..a8bdd08 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -133,8 +133,8 @@
/* decode
* also shift buffer by 4 bursts for interleaving */
- switch ((rsl_cmode != RSL_CMOD_SPD_SPEECH) ? GSM48_CMODE_SPEECH_V1
- : tch_mode) {
+ switch (tch_mode) {
+ case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* HR or signalling */
/* Note on FN-10: If we are at FN 10, we decoded an even aligned
* TCH/FACCH frame, because our burst buffer carries 6 bursts.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27683
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Gerrit-Change-Number: 27683
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/27684 )
Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling
mode
..
osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
In change [1] I broke measurement reporting for TCH/H in signalling
mode. The problem is that in rx_tchh_fn() we started to invalidate
the Uplink RSSI for FACCH regardless of the channel mode: speech or
signalling. In speech mode, the averaged measurements are carried
over by the two BFIs. In signalling mode we send no BFIs, so:
* let's use the proper averaging mode S6N6 (not S6N4), and
* send the averaged measurements together with the FACCH.
This change fixes BTS_Tests.TC_meas_res_sign_tchh[_toa256].
Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f
Fixes: [1] I7902b4709bc3f418174e8373f52e87bb31cdc826
---
M src/osmo-bts-trx/sched_lchan_tchh.c
1 file changed, 3 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/27684/1
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index a8bdd08..fa3434e 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -135,6 +135,8 @@
* also shift buffer by 4 bursts for interleaving */
switch (tch_mode) {
case GSM48_CMODE_SIGN:
+ meas_avg_mode = SCHED_MEAS_AVG_M_S6N6;
+ /* fall-through */
case GSM48_CMODE_SPEECH_V1: /* HR or signalling */
/* Note on FN-10: If we are at FN 10, we decoded an even aligned
* TCH/FACCH frame, because our burst buffer carries 6 bursts.
@@ -265,7 +267,7 @@
* with the first BFI (see below). */
_sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan,
tch_data + amr, GSM_MACBLOCK_LEN,
- 0, /* intentionally invalidate RSSI */
+ tch_mode == GSM48_CMODE_SIGN ? meas_avg.rssi : 0,
meas_avg.toa256, meas_avg.ci_cb, ber10k,
PRES_INFO_UNKNOWN);
ber10k = 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f
Gerrit-Change-Number: 27684
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
fixeria has uploaded a new patch set (#2). (
https://gerrit.osmocom.org/c/osmo-bts/+/27683 )
Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
..
osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
There is no reason not to use 'chan_state->tch_mode' directly in
the 'switch' statement. If a logical channel is in signalling
mode, then both 'chan_state->{rsl,tch}_cmode' are set to
RSL_CMOD_SPD_SIGN and GSM48_CMODE_SIGN, respectively.
Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Related: SYS#5853
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/83/27683/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27683
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Gerrit-Change-Number: 27683
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode In change [1] I broke measurement reporting for TCH/H in signalling mode. The problem is that in rx_tchh_fn() we started to invalidate the Uplink RSSI for FACCH regardless of the channel mode: speech or signalling. In speech mode, the averaged measurements are carried over by the two BFIs. In signalling mode we send no BFIs, so: * let's use the proper averaging mode S6N6 (not S6N4), and * send the averaged measurements together with the FACCH. This change fixes BTS_Tests.TC_meas_res_sign_tchh[_toa256]. Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Fixes: [1] I7902b4709bc3f418174e8373f52e87bb31cdc826 Related: SYS#5853 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/27684/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
Attention is currently required from: fixeria. Hello pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 to look at the new patch set (#3). Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode In change [1] I broke measurement reporting for TCH/H in signalling mode. The problem is that in rx_tchh_fn() we started to invalidate the Uplink RSSI for FACCH regardless of the channel mode: speech or signalling. In speech mode, the averaged measurements are carried over by the two BFIs. In signalling mode we send no BFIs, so: * let's use the proper averaging mode S6N6 (not S6N4), and * send the averaged measurements together with the FACCH. This change fixes BTS_Tests.TC_meas_res_sign_tchh[_toa256]. Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Fixes: [1] I7902b4709bc3f418174e8373f52e87bb31cdc826 Related: SYS#5853 --- M src/osmo-bts-trx/sched_lchan_tchh.c 1 file changed, 7 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/84/27684/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: fixeria Gerrit-MessageType: newpatchset
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. Patch Set 3: (1 comment) File src/osmo-bts-trx/sched_lchan_tchh.c: https://gerrit.osmocom.org/c/osmo-bts/+/27684/comment/d5b88e96_edd6a16e PS1, Line 265: * intentionally invalidate RSSI, so that this report gets dropped in > "intentionally invalidate RSSI for speech blocks" Actually not for speech blocks, but for FACCH in speech mode. Done. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: pespin Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 17:37:30 + Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-ggsn-ogs: Rename config files
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27686 ) Change subject: ttcn3-ggsn-ogs: Rename config files .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27686 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: If56d1a890a4f1b80b4f04ae22644f9cb9cdd35f4 Gerrit-Change-Number: 27686 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:16:05 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27687 ) Change subject: ttcn3-pgw-test: Log stdout to find crashes .. Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: Please edit the configuration files and disable logging to a file there. Otherwise we end up having two log files (*.out and *.log) in the artifacts - this is definitely undesirable. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3 Gerrit-Change-Number: 27687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:19:20 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Use process name in log file
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27688 ) Change subject: ttcn3-pgw-test: Use process name in log file .. Patch Set 1: Code-Review-2 (1 comment) Patchset: PS1: See my comment to I573637866787ce1f613bd56a009251578c98cbf3 regarding having two logging files in the artifacts. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 Gerrit-Change-Number: 27688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:21:00 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get open5gs-smf...
Attention is currently required from: pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27689 )
Change subject: ttcn3-{pgw,ggsn}-tests: Add comment with procedure to get
open5gs-smfd bt automatically
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27689
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: I1ac8b77e84d57040fc09964356bc8a01e5d721e3
Gerrit-Change-Number: 27689
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 07 Apr 2022 18:21:47 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27690 ) Change subject: ttcn3-pgw-tests: use same bootstrap for upfd as in ttcn-ggsn-tests-ogs .. Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27690 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I94219abbeb5e004ce707407b5aa5ee8ad6c3a80e Gerrit-Change-Number: 27690 Gerrit-PatchSet: 3 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:26:24 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Use process name in log file
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27688 ) Change subject: ttcn3-pgw-test: Use process name in log file .. Patch Set 1: -Code-Review -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 Gerrit-Change-Number: 27688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:31:49 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27687 ) Change subject: ttcn3-pgw-test: Log stdout to find crashes .. Patch Set 1: Code-Review+1 (1 comment) Patchset: PS1: > do you know how to disable logging? We agreed to disable it in a separate change, using '/dev/null'. -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3 Gerrit-Change-Number: 27687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:32:29 + Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin Comment-In-Reply-To: fixeria Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
Attention is currently required from: pespin.
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/docker-playground/+/27692 )
Change subject: ttcn3-{ggsn,pgw}-test: Avoid open5gs itself logging to a file
..
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27692
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: docker-playground
Gerrit-Branch: master
Gerrit-Change-Id: Ifdc010f26abdc8cefeec0c72a1f617911ec375d7
Gerrit-Change-Number: 27692
Gerrit-PatchSet: 1
Gerrit-Owner: pespin
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Attention: pespin
Gerrit-Comment-Date: Thu, 07 Apr 2022 18:46:03 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Log stdout to find crashes
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27687 ) Change subject: ttcn3-pgw-test: Log stdout to find crashes .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27687 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I573637866787ce1f613bd56a009251578c98cbf3 Gerrit-Change-Number: 27687 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:46:13 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27691 ) Change subject: ttcn3-pgw-test: Log open5gs-nrfd stdout/stderr .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27691 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I31f2ff2dd5daa68756e910c4cb91acefdad50cb1 Gerrit-Change-Number: 27691 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:46:34 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in docker-playground[master]: ttcn3-pgw-test: Use process name in log file
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27688 ) Change subject: ttcn3-pgw-test: Use process name in log file .. Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27688 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ibac0e6bc9dc7c2e576a4f5d1ccb730211d1e1427 Gerrit-Change-Number: 27688 Gerrit-PatchSet: 1 Gerrit-Owner: pespin Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria Gerrit-Attention: pespin Gerrit-Comment-Date: Thu, 07 Apr 2022 18:46:48 + Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment
Change in osmo-bts[master]: VTY: fix NULL-pointer dereference in 'show transceiver'
fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/27693 ) Change subject: VTY: fix NULL-pointer dereference in 'show transceiver' .. VTY: fix NULL-pointer dereference in 'show transceiver' Change-Id: I403a027f064a4898eb74a11381bab3c884ec8ccf --- M src/osmo-bts-trx/trx_vty.c 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/93/27693/1 diff --git a/src/osmo-bts-trx/trx_vty.c b/src/osmo-bts-trx/trx_vty.c index 2b8bc24..c6209a3 100644 --- a/src/osmo-bts-trx/trx_vty.c +++ b/src/osmo-bts-trx/trx_vty.c @@ -94,6 +94,9 @@ const struct l1sched_ts *l1ts = ts->priv; const struct trx_sched_multiframe *mf; + /* May be NULL in absence of the A-bis connection */ + if (l1ts == NULL) + continue; mf = &trx_sched_multiframes[l1ts->mf_index]; vty_out(vty, " timeslot #%u (%s)%s", -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27693 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I403a027f064a4898eb74a11381bab3c884ec8ccf Gerrit-Change-Number: 27693 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria Gerrit-MessageType: newchange
Change in osmo-bsc[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/27694 )
Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
..
power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
For the sake of consistency and code readability, initialize the
power loop control interval (P_Con_INTERVAL) for both Uplink and
Downlink directions in the same function.
Change-Id: Ie3d4b481cbfacf27004787616e22b6f8a863b47b
---
M src/osmo-bsc/gsm_data.c
1 file changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/94/27694/1
diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c
index 38d8a7c..5fba05f 100644
--- a/src/osmo-bsc/gsm_data.c
+++ b/src/osmo-bsc/gsm_data.c
@@ -1142,8 +1142,6 @@
.inc_step_size_db = 4, /* 2, 4, or 6 dB */
.red_step_size_db = 2, /* 2 or 4 dB */
- .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008
sec 4.7.1 */
-
/* RxLev measurement parameters */
.rxlev_meas = {
.enabled = true,
@@ -1338,9 +1336,12 @@
{
*params = power_ctrl_params_def;
params->dir = dir;
+
+ /* Trigger loop every N-th SACCH block. See 3GPP TS 45.008 section
4.7.1. */
if (dir == GSM_PWR_CTRL_DIR_UL)
- /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec
4.7.1: */
- params->ctrl_interval = 2;
+ params->ctrl_interval = 2; /* N=4 (1.92s) */
+ else
+ params->ctrl_interval = 1; /* N=2 (0.960) */
}
enum rsl_cmod_spd chan_mode_to_rsl_cmod_spd(enum gsm48_chan_mode chan_mode)
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/27694
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ie3d4b481cbfacf27004787616e22b6f8a863b47b
Gerrit-Change-Number: 27694
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bsc[master]: Move power control related definitions to power_control.h
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bsc/+/27695 )
Change subject: Move power control related definitions to power_control.h
..
Move power control related definitions to power_control.h
Now that we have separate header/code files for the power control,
let's move the related definitions there. This change makes the
code consistent with osmo-bts, where it's already done this way.
Change-Id: I1cb3f6bfba0306e8f371dcd5162d1813beb3a088
---
M include/osmocom/bsc/bts.h
M include/osmocom/bsc/gsm_data.h
M include/osmocom/bsc/power_control.h
M src/osmo-bsc/gsm_data.c
M src/osmo-bsc/power_control.c
5 files changed, 308 insertions(+), 307 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/95/27695/1
diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h
index c4ee39d..cd0f8cb 100644
--- a/include/osmocom/bsc/bts.h
+++ b/include/osmocom/bsc/bts.h
@@ -12,6 +12,7 @@
#include
+#include "osmocom/bsc/power_control.h"
#include "osmocom/bsc/gsm_data.h"
#include "osmocom/bsc/bts_trx.h"
#include "osmocom/bsc/bts_sm.h"
diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h
index fcd8883..4a58c2b 100644
--- a/include/osmocom/bsc/gsm_data.h
+++ b/include/osmocom/bsc/gsm_data.h
@@ -1356,98 +1356,6 @@
int bsc_sccp_inst_next_conn_id(struct osmo_sccp_instance *sccp);
-/* MS/BS Power related measurement averaging algo */
-enum gsm_power_ctrl_meas_avg_algo {
- GSM_PWR_CTRL_MEAS_AVG_ALGO_NONE = 0x00,
- GSM_PWR_CTRL_MEAS_AVG_ALGO_UNWEIGHTED = 0x01,
- GSM_PWR_CTRL_MEAS_AVG_ALGO_WEIGHTED = 0x02,
- GSM_PWR_CTRL_MEAS_AVG_ALGO_MOD_MEDIAN = 0x03,
- /* EWMA is an Osmocom specific algo */
- GSM_PWR_CTRL_MEAS_AVG_ALGO_OSMO_EWMA= 0x04,
-};
-
-/* MS/BS Power related measurement parameters */
-struct gsm_power_ctrl_meas_params {
- /* Are these measurement paremeters to be taken into account by loop? */
- bool enabled;
-
- /* Thresholds (see 3GPP TS 45.008, section A.3.2.1) */
- uint8_t lower_thresh; /* lower (decreasing) direction */
- uint8_t upper_thresh; /* upper (increasing) direction */
-
- /* Threshold Comparators for lower (decreasing) direction */
- uint8_t lower_cmp_p; /* P1 for RxLev, P3 for RxQual */
- uint8_t lower_cmp_n; /* N1 for RxLev, N3 for RxQual */
- /* Threshold Comparators for upper (increasing) direction */
- uint8_t upper_cmp_p; /* P2 for RxLev, P4 for RxQual */
- uint8_t upper_cmp_n; /* N2 for RxLev, N4 for RxQual */
-
- /* Hreqave and Hreqt (see 3GPP TS 45.008, Annex A) */
- uint8_t h_reqave;
- uint8_t h_reqt;
-
- /* AVG algorithm and its specific parameters */
- enum gsm_power_ctrl_meas_avg_algo algo;
- union {
- /* Exponentially Weighted Moving Average */
- struct {
- /* Smoothing factor: higher the value - less smoothing
*/
- uint8_t alpha; /* 1 .. 99 (in %) */
- } ewma;
- };
-};
-
-enum gsm_power_ctrl_dir {
- GSM_PWR_CTRL_DIR_UL, /* MS Power Control */
- GSM_PWR_CTRL_DIR_DL, /* BS Power Control */
-};
-
-enum gsm_power_ctrl_mode {
- /* Do not send MS/BS Power Control IEs */
- GSM_PWR_CTRL_MODE_NONE = 0,
- /* Send MS/BS Power IE only (with target level) */
- GSM_PWR_CTRL_MODE_STATIC,
- /* Send MS/BS Power [Parameters] IEs (dynamic mode) */
- GSM_PWR_CTRL_MODE_DYN_BTS,
- /* Do not send MS/BS Power IEs and use BSC Power Loop */
- GSM_PWR_CTRL_MODE_DYN_BSC,
-
-};
-
-/* MS/BS Power Control Parameters */
-struct gsm_power_ctrl_params {
- /* Power Control direction: Uplink or Downlink */
- enum gsm_power_ctrl_dir dir;
- /* Power Control mode to be used by the BTS */
- enum gsm_power_ctrl_mode mode;
-
- /* BS Power reduction value / maximum (in dB) */
- uint8_t bs_power_val_db; /* for static mode */
- uint8_t bs_power_max_db; /* for dynamic mode */
-
- /* Power change step size (dynamic mode only) */
- uint8_t inc_step_size_db; /* increasing direction */
- uint8_t red_step_size_db; /* reducing direction */
-
- /* Minimum interval between power level changes */
- uint8_t ctrl_interval; /* 1 step is 2 SACCH periods */
-
- /* Measurement averaging parameters for RxLev & RxQual */
- struct gsm_power_ctrl_meas_params rxqual_meas;
- struct gsm_power_ctrl_meas_params rxlev_meas;
- /* Measurement averaging parameters for C/I: */
- struct gsm_power_ctrl_meas_params ci_fr_meas;
- struct gsm_power_ctrl_meas_params ci_hr_meas;
- struct gsm_power_ctrl_meas_params ci_amr_fr_meas;
- struct gsm_power_ctrl_meas_params ci_amr_hr_meas;
-
Change in osmo-bts[master]: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-bts/+/27696 )
Change subject: power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
..
power_ctrl_params_def_reset(): set .ctrl_interval for both UL/DL
For the sake of consistency and code readability, initialize the
power loop control interval (P_Con_INTERVAL) for both Uplink and
Downlink directions in the same function.
Change-Id: If7c804e51eb104d9fe73294a3867ab3b551d83c3
---
M src/common/power_control.c
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/96/27696/1
diff --git a/src/common/power_control.c b/src/common/power_control.c
index 42d9d07..0db5378 100644
--- a/src/common/power_control.c
+++ b/src/common/power_control.c
@@ -404,9 +404,6 @@
/* Default MS/BS Power Control parameters (see 3GPP TS 45.008, table A.1) */
const struct gsm_power_ctrl_params power_ctrl_params_def = {
-
- .ctrl_interval = 1, /* Trigger loop every second SACCH block. TS 45.008
sec 4.7.1 */
-
/* Power increasing/reducing step size (optimal defaults) */
.inc_step_size_db = 4, /* quickly increase MS/BS power */
.red_step_size_db = 2, /* slowly decrease MS/BS power */
@@ -569,7 +566,10 @@
void power_ctrl_params_def_reset(struct gsm_power_ctrl_params *params, bool
is_bs_pwr)
{
*params = power_ctrl_params_def;
+
+ /* Trigger loop every N-th SACCH block. See 3GPP TS 45.008 section
4.7.1. */
if (!is_bs_pwr)
- /* Trigger loop every fourth SACCH block (1.92s). TS 45.008 sec
4.7.1: */
- params->ctrl_interval = 2;
+ params->ctrl_interval = 2; /* N=4 (1.92s) */
+ else
+ params->ctrl_interval = 1; /* N=2 (0.960) */
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27696
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If7c804e51eb104d9fe73294a3867ab3b551d83c3
Gerrit-Change-Number: 27696
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-ttcn3-hacks[master]: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
fixeria has uploaded this change for review. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697 )
Change subject: BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
..
BTS_Tests: tune waiting timeout in TC_rsl_ms_pwr_dyn_up
Since recenly, osmo-bts is using P_CON_INTERVAL=2 by default. This
means that the MS power loop gets triggered every 4th SACCH block
(1.92s), so we need more time to reach the maximim Tx power.
Change-Id: I9266f7284fcdb0afa3473f575640689e334e89a8
Related: osmo-bts.git I91c505447f68714239a4f033d4f06e91893df201
Related: OS#5517
---
M bts/BTS_Tests.ttcn
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks
refs/changes/97/27697/1
diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 3a3d7cc..f33e8cc 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -3042,8 +3042,9 @@
48.058 The maximum power to be used is indicated in the BS and MS Power
elements respectively. */
RSL.send(ts_RSL_MS_PWR_CTRL_with_pp(g_chan_nr, pwr_max_var));
- /* wait, then check that our power level was reduced */
- timer T1 := 10.0;
+ /* By default, the MS power loop gets triggered every 4th SACCH block
(1.92s).
+* We need 9 * 4 dB steps to get from 0 dBm to 33 dBm, so 9 * 1.92s
total. */
+ timer T1 := 9.0 * 1.92;
T1.start;
alt {
[] as_l1_sacch_l1h(l1h) { repeat; }
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27697
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: I9266f7284fcdb0afa3473f575640689e334e89a8
Gerrit-Change-Number: 27697
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria
Gerrit-MessageType: newchange
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/27684 ) Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode .. Patch Set 3: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f Gerrit-Change-Number: 27684 Gerrit-PatchSet: 3 Gerrit-Owner: fixeria Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin Gerrit-Attention: pespin Gerrit-Comment-Date: Fri, 08 Apr 2022 00:32:36 + Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
fixeria has posted comments on this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27683 )
Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
..
Patch Set 2: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27683
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Gerrit-Change-Number: 27683
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-Comment-Date: Fri, 08 Apr 2022 12:31:46 +
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Change in osmo-bts[master]: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27683 )
Change subject: osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
..
osmo-bts-trx: rx_{tchh,tchf}_fn(): use tch_mode directly
There is no reason not to use 'chan_state->tch_mode' directly in
the 'switch' statement. If a logical channel is in signalling
mode, then both 'chan_state->{rsl,tch}_cmode' are set to
RSL_CMOD_SPD_SIGN and GSM48_CMODE_SIGN, respectively.
Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Related: SYS#5853
---
M src/osmo-bts-trx/sched_lchan_tchf.c
M src/osmo-bts-trx/sched_lchan_tchh.c
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/src/osmo-bts-trx/sched_lchan_tchf.c
b/src/osmo-bts-trx/sched_lchan_tchf.c
index 6a9a0f0..4f5d6d3 100644
--- a/src/osmo-bts-trx/sched_lchan_tchf.c
+++ b/src/osmo-bts-trx/sched_lchan_tchf.c
@@ -116,8 +116,8 @@
/* decode
* also shift buffer by 4 bursts for interleaving */
- switch ((rsl_cmode != RSL_CMOD_SPD_SPEECH) ? GSM48_CMODE_SPEECH_V1
- : tch_mode) {
+ switch (tch_mode) {
+ case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* FR */
rc = gsm0503_tch_fr_decode(tch_data, *bursts_p, 1, 0,
&n_errors, &n_bits_total);
if (rc == GSM_FR_BYTES) /* only for valid *speech* frames */
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index 369e35b..a8bdd08 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -133,8 +133,8 @@
/* decode
* also shift buffer by 4 bursts for interleaving */
- switch ((rsl_cmode != RSL_CMOD_SPD_SPEECH) ? GSM48_CMODE_SPEECH_V1
- : tch_mode) {
+ switch (tch_mode) {
+ case GSM48_CMODE_SIGN:
case GSM48_CMODE_SPEECH_V1: /* HR or signalling */
/* Note on FN-10: If we are at FN 10, we decoded an even aligned
* TCH/FACCH frame, because our burst buffer carries 6 bursts.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27683
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9e5e2c891c80c32fc522b53c9371b71ea32dd54d
Gerrit-Change-Number: 27683
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
Change in osmo-bts[master]: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
fixeria has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bts/+/27684 )
Change subject: osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling
mode
..
osmo-bts-trx: rx_tchh_fn(): fix meas reporting in signalling mode
In change [1] I broke measurement reporting for TCH/H in signalling
mode. The problem is that in rx_tchh_fn() we started to invalidate
the Uplink RSSI for FACCH regardless of the channel mode: speech or
signalling. In speech mode, the averaged measurements are carried
over by the two BFIs. In signalling mode we send no BFIs, so:
* let's use the proper averaging mode S6N6 (not S6N4), and
* send the averaged measurements together with the FACCH.
This change fixes BTS_Tests.TC_meas_res_sign_tchh[_toa256].
Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f
Fixes: [1] I7902b4709bc3f418174e8373f52e87bb31cdc826
Related: SYS#5853
---
M src/osmo-bts-trx/sched_lchan_tchh.c
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Jenkins Builder: Verified
daniel: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
diff --git a/src/osmo-bts-trx/sched_lchan_tchh.c
b/src/osmo-bts-trx/sched_lchan_tchh.c
index a8bdd08..21fb62c 100644
--- a/src/osmo-bts-trx/sched_lchan_tchh.c
+++ b/src/osmo-bts-trx/sched_lchan_tchh.c
@@ -135,6 +135,8 @@
* also shift buffer by 4 bursts for interleaving */
switch (tch_mode) {
case GSM48_CMODE_SIGN:
+ meas_avg_mode = SCHED_MEAS_AVG_M_S6N6;
+ /* fall-through */
case GSM48_CMODE_SPEECH_V1: /* HR or signalling */
/* Note on FN-10: If we are at FN 10, we decoded an even aligned
* TCH/FACCH frame, because our burst buffer carries 6 bursts.
@@ -259,13 +261,13 @@
/* FACCH */
if (rc == GSM_MACBLOCK_LEN) {
chan_state->ul_ongoing_facch = 1;
- /* In order to provide an even stream of measurement reports,
here we
-* intentionally invalidate RSSI, so that this report gets
dropped in
-* process_l1sap_meas_data(). The averaged results will still
be sent
-* with the first BFI (see below). */
+ /* In order to provide an even stream of measurement reports in
*speech*
+* mode, here we intentionally invalidate RSSI for FACCH, so
that this
+* report gets dropped in process_l1sap_meas_data(). The
averaged results
+* will be sent with the first (see below) and second (see
above) BFIs. */
_sched_compose_ph_data_ind(l1ts, fn_begin, bi->chan,
tch_data + amr, GSM_MACBLOCK_LEN,
- 0, /* intentionally invalidate RSSI */
+ tch_mode == GSM48_CMODE_SIGN ? meas_avg.rssi : 0,
meas_avg.toa256, meas_avg.ci_cb, ber10k,
PRES_INFO_UNKNOWN);
ber10k = 0;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/27684
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: If98aa1f0f7255f20344460bdd07e2c896dd6e56f
Gerrit-Change-Number: 27684
Gerrit-PatchSet: 3
Gerrit-Owner: fixeria
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel
Gerrit-Reviewer: fixeria
Gerrit-Reviewer: laforge
Gerrit-Reviewer: neels
Gerrit-Reviewer: pespin
Gerrit-MessageType: merged
