pespin has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-bsc/+/33754 )
Change subject: SI13: Set DRX_TIMER_MAX value actually transmitted
......................................................................
SI13: Set DRX_TIMER_MAX value actually transmitted
The set of values in seconds which can be expressed in the 3-bit field
DRX_TIMER_MAX (0s, 1s, 2s, 4s,...64s) don't include the "3s" that where
being specified. Instead, libosmocore's encode_drx_timer() was
taking both upper boundary "4s" and encoding it "0b011".
Hence, better write the value actually being transmitted to MS, to avoid
users/readers confusion.
More related info can be found on TS 44.060 Table 12.24.2 and TS 45.002
6.5.6.
Change-Id: Ibf01a50b258e197ba5e3173492513349ddffdb38
---
M src/osmo-bsc/system_information.c
1 file changed, 20 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/33754/2
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33754
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ibf01a50b258e197ba5e3173492513349ddffdb38
Gerrit-Change-Number: 33754
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-CC: Jenkins Builder
Gerrit-MessageType: newpatchset
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33754 )
Change subject: SI13: Set DRX_TIMER_MAX value actually transmitted
......................................................................
SI13: Set DRX_TIMER_MAX value actually transmitted
The set of values in seconds which can be expressed in the 3-bit field
DRX_TIMER_MAX (0s, 1s, 2s, 4s,...64s) don't include the "3s" that where
being specified. Instead, libosmocore's encode_drx_timer() was
taking both upper boundary "4s" and encoding it "0b011".
Hence, better write the value actually being transmitted to MS, to avoid
users/readers confusion.
Change-Id: Ibf01a50b258e197ba5e3173492513349ddffdb38
---
M src/osmo-bsc/system_information.c
1 file changed, 17 insertions(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/54/33754/1
diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c
index 35fce68..9ed77f9 100644
--- a/src/osmo-bsc/system_information.c
+++ b/src/osmo-bsc/system_information.c
@@ -1244,7 +1244,7 @@
.nmo = GPRS_NMO_II,
.t3168 = 2000,
.t3192 = 1500,
- .drx_timer_max = 3,
+ .drx_timer_max = 4,
.bs_cv_max = 15,
.ctrl_ack_type_use_block = bts->gprs.ctrl_ack_type_use_block,
.ext_info_present = true,
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33754
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: Ibf01a50b258e197ba5e3173492513349ddffdb38
Gerrit-Change-Number: 33754
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-sgsn/+/33753 )
Change subject: gmm: Update DRX params during rx RAU REQ
......................................................................
gmm: Update DRX params during rx RAU REQ
The DRX params where already parsed in GMM Attached Req and transmitted
to PCU over BSSGP DL UD packets, but it was not being updated if the MS
changed it during RAU Req.
TS 24.008 9.4.14.3 DRX parameter:
"This IE shall be included if the MS changes the access network
from GSM to UMTS, or the MS wants to indicate new DRX parameters
to the network."
Change-Id: I1dd7f8f161280dd017c337eacc3aa2be4ccd65ea
---
M src/sgsn/gprs_gmm.c
1 file changed, 22 insertions(+), 0 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/53/33753/1
diff --git a/src/sgsn/gprs_gmm.c b/src/sgsn/gprs_gmm.c
index 547edbb..3cc3055 100644
--- a/src/sgsn/gprs_gmm.c
+++ b/src/sgsn/gprs_gmm.c
@@ -1766,6 +1766,10 @@
/* Update the MM context with the new (i.e. foreign) TLLI */
mmctx->gb.tlli = msgb_tlli(msg);
}
+ /* Update the MM context with the new DRX params */
+ if (TLVP_PRESENT(&tp, GSM48_IE_GMM_DRX_PARAM))
+ memcpy(&mmctx->drx_parms, TLVP_VAL(&tp, GSM48_IE_GMM_DRX_PARAM), sizeof(mmctx->drx_parms));
+
/* FIXME: Update the MM context with the MS radio acc capabilities */
/* FIXME: Update the MM context with the MS network capabilities */
--
To view, visit https://gerrit.osmocom.org/c/osmo-sgsn/+/33753
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Change-Id: I1dd7f8f161280dd017c337eacc3aa2be4ccd65ea
Gerrit-Change-Number: 33753
Gerrit-PatchSet: 1
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: newchange
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33727 )
Change subject: BTS_Tests: properly release TCH in f_TC_speech_no_rtp()
......................................................................
BTS_Tests: properly release TCH in f_TC_speech_no_rtp()
Otherwise we're getting a DTE when trying to run this function more
than once in a single testcase (e.g. when testing different channel
modes). This is already done properly in f_TC_speech_rtp().
Change-Id: I290789153bea4b128af29dcf7c52da16b64c4108
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 16 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: 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/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 5a34a8c..9482561 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8278,6 +8278,8 @@
f_rsl_chan_deact();
f_L1CTL_DM_REL_REQ(L1CTL, g_chan_nr);
+ f_rsl_chan_deact();
+ f_rslem_unregister(0, g_chan_nr);
}
testcase TC_speech_no_rtp_tchf() runs on test_CT {
var ConnHdlr vc_conn;
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33727
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: I290789153bea4b128af29dcf7c52da16b64c4108
Gerrit-Change-Number: 33727
Gerrit-PatchSet: 2
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986 )
Change subject: BTS_Tests: fix expectations in TC_speech_no_rtp_tch[fh]
......................................................................
BTS_Tests: fix expectations in TC_speech_no_rtp_tch[fh]
This testcase is currently passing for both -master and -latest
versions of osmo-bts, despite their behavior is different:
* the -latest is sending FACCH frames with dummy LAPDm func=UI,
* the -master is sending invalid speech frames with inverted CRC3.
There is a bug in the 'tr_bad_frame' template definition: we expect
the payload to be present, while in real BFIs it's omitted. So these
two testcases would always pass, even if the IUT would be sending dummy
bursts or sending nothing at all, because they were designed to fail on
receipt of a never-matching TRAFFIC.ind template.
Let's fix this and align our expectations with the current behavior
of the -master version of osmo-bts. Note that sending invalid speech
frames with inverted CRC3 is not osmo-bts-trx specific behavior;
it's actually a replicated behavior of DSP based osmo-bts-sysmo.
Change-Id: Ic680002f60e598cfeeb448c517581b3506355e5b
Related: osmo-bts.git I78106802a0aa4af39859c75d29fe0e77037899fe
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 48 insertions(+), 13 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: 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/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 3433666..5a34a8c 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8235,7 +8235,8 @@
}
private function f_TC_speech_no_rtp(charstring id) runs on ConnHdlr {
- var template L1ctlMessage tr_bad_frame;
+ var template L1ctlMessage tr_dummy_frame;
+ var integer dummy_frame_num := 0;
var L1ctlMessage l1_dl;
timer T := 8.0;
@@ -8248,24 +8249,30 @@
f_sleep(2.0); /* ... so let's give the L1 some time to stabilize */
L1CTL.clear;
- /* A universal template for bad Downlink frame: {DATA,TRAFFIC}.ind */
- tr_bad_frame := tr_L1CTL_TRAFFIC_IND(g_chan_nr, tr_RslLinkID_DCCH(0));
- tr_bad_frame.header.msg_type := (L1CTL_DATA_IND, L1CTL_TRAFFIC_IND);
- tr_bad_frame.dl_info.fire_crc := (1..255); /* != 0 */
- tr_bad_frame.payload := ?;
+ /* Expect empty TRAFFIC.ind with no bit errors and bad CRC. In the absence
+ * of RTP, osmo-bts is transmitting dummy speech frames with inverted CRC3.
+ * This is a beautiful hack inducing a BFI condition in the MS receiver.
+ * See https://osmocom.org/issues/4823#note-13 for more details. */
+ tr_dummy_frame := tr_L1CTL_TRAFFIC_IND(g_chan_nr, tr_RslLinkID_DCCH(0));
+ tr_dummy_frame.dl_info.fire_crc := (1..255); /* != 0 */
+ tr_dummy_frame.dl_info.num_biterr := 0;
+ tr_dummy_frame.payload := omit;
T.start;
alt {
- /* OS#4823: DATA.ind or TRAFFIC.ind with bad CRC most likely means that
- * the IUT is sending *dummy bursts*, so the L1 fails to decode them. */
- [] L1CTL.receive(tr_bad_frame) -> value l1_dl {
- setverdict(fail, "Received {DATA,TRAFFIC}.ind with bad CRC: ", l1_dl);
+ [] L1CTL.receive(tr_dummy_frame) -> value l1_dl {
+ dummy_frame_num := dummy_frame_num + 1;
+ log("Rx dummy TRAFFIC.ind (num ", dummy_frame_num, "): ", l1_dl);
+ /* break the loop if we got 5 dummy frames */
+ if (dummy_frame_num < 5)
+ { repeat; }
+ }
+ [] L1CTL.receive(tr_L1CTL_TRAFFIC_IND(g_chan_nr)) -> value l1_dl {
+ setverdict(fail, "Rx unexpected TRAFFIC.ind: ", l1_dl);
}
[] as_l1_sacch();
- [] L1CTL.receive { repeat; }
[] T.timeout {
- /* We're done, break the loop */
- setverdict(pass);
+ setverdict(fail, "Timeout waiting for TRAFFIC.ind");
}
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27986
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: Ic680002f60e598cfeeb448c517581b3506355e5b
Gerrit-Change-Number: 27986
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: falconia <falcon(a)freecalypso.org>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725 )
Change subject: BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
......................................................................
BTS_Tests: also test TCH/EFS (EFR) in TC_speech_no_rtp_tchf
Also add TODO comments for TCH/AFS and TCH/AHS.
Change-Id: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Related: SYS#5919, OS#4823
---
M bts/BTS_Tests.ttcn
1 file changed, 23 insertions(+), 0 deletions(-)
Approvals:
fixeria: Looks good to me, approved
pespin: 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/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn
index 2989cb8..2a56a25 100644
--- a/bts/BTS_Tests.ttcn
+++ b/bts/BTS_Tests.ttcn
@@ -8292,6 +8292,14 @@
vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars);
vc_conn.done;
+ /* TS1, TCH/F, V2 (EFR codec) */
+ pars := valueof(t_Pars(ts_RslChanNr_Bm(1), ts_RSL_ChanMode(RSL_CHRT_TCH_F, RSL_CMOD_SP_GSM2)));
+ vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars);
+ vc_conn.done;
+
+ /* TODO: we don't know what's the expected behavior for TCH/AFS, so we don't test it here.
+ * Current osmo-bts is sending FACCH/F with dummy LAPDm func=UI frames. */
+
Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
}
testcase TC_speech_no_rtp_tchh() runs on test_CT {
@@ -8305,6 +8313,9 @@
vc_conn := f_start_handler(refers(f_TC_speech_no_rtp), pars);
vc_conn.done;
+ /* TODO: we don't know what's the expected behavior for TCH/AHS, so we don't test it here.
+ * Current osmo-bts is sending FACCH/H with dummy LAPDm func=UI frames (whenever possible). */
+
Misc_Helpers.f_shutdown(__BFILE__, __LINE__);
}
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33725
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: I272b4343f895889f6cb3e0d3aba2c63b4eab08a2
Gerrit-Change-Number: 33725
Gerrit-PatchSet: 4
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged