falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38131?usp=email )
Change subject: osmo_trau_frame_decode_8k: fix recognition of O&M UL
......................................................................
osmo_trau_frame_decode_8k: fix recognition of O&M UL
In the case of an O&M frame in UL direction, the bit pattern
in C1-C5 is 01011, not 10011 - see TS 48.061 section 5.2.4.1.1.
Change-Id: I16c6b598ce5c843b5306aa69592a7d66723622d4
---
M src/trau/trau_frame.c
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/31/38131/1
diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c
index 9cb8a66..43b0e6b 100644
--- a/src/trau/trau_frame.c
+++ b/src/trau/trau_frame.c
@@ -1466,7 +1466,7 @@
return decode8_hr(fr, bits, dir);
case 0x07:
return decode8_data(fr, bits, dir);
- case 0x13:
+ case 0x0B:
return decode8_oam(fr, bits, dir);
}
} else {
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38131?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I16c6b598ce5c843b5306aa69592a7d66723622d4
Gerrit-Change-Number: 38131
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-abis/+/38130?usp=email )
Change subject: osmo_trau_frame_decode_8k: check all sync bits
......................................................................
osmo_trau_frame_decode_8k: check all sync bits
The decoding of unknown TRAU-8k frames (the direction and 8 kbit/s
submux are wrong, but nothing else) begins by trial-and-error
checking of 4 possible GSM 08.61 sync patterns. In the case of
classic HR speech/data and AMR-low sync patterns, not all bits
were checked.
Change-Id: I47b055b4d3b92f018508fd7baa0784dfcabe6262
---
M src/trau/trau_frame.c
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/libosmo-abis refs/changes/30/38130/1
diff --git a/src/trau/trau_frame.c b/src/trau/trau_frame.c
index 509021d..9cb8a66 100644
--- a/src/trau/trau_frame.c
+++ b/src/trau/trau_frame.c
@@ -1376,7 +1376,7 @@
return false;
if (bits[16] != 0 || bits[17] != 1)
return false;
- for (i = 24; i < 20 * 8; i += 16) {
+ for (i = 24; i < 20 * 8; i += 8) {
if (bits[i] != 1)
return false;
}
@@ -1398,7 +1398,7 @@
return false;
if (bits[24] != 0 || bits[25] != 1)
return false;
- for (i = 32; i < 20 * 8; i += 16) {
+ for (i = 32; i < 20 * 8; i += 8) {
if (bits[i] != 1)
return false;
}
--
To view, visit https://gerrit.osmocom.org/c/libosmo-abis/+/38130?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: libosmo-abis
Gerrit-Branch: master
Gerrit-Change-Id: I47b055b4d3b92f018508fd7baa0784dfcabe6262
Gerrit-Change-Number: 38130
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38099?usp=email )
Change subject: s1gw: move t_ConnHdlrPars back to S1GW_Tests
......................................................................
s1gw: move t_ConnHdlrPars back to S1GW_Tests
This is a partial revert of 956bf05e7, which moved the t_ConnHdlrPars
from module S1GW_Tests to S1GW_ConnHdlr and added f_new_ConnHdlrPars().
The problem is that we want to assign module parameter values to
some fields of the ConnHdlrPars record, but TTCN-3 does not allow
to access module parameters of one module from another. Having to
add more and more parameters to the proxy function
f_new_ConnHdlrPars() is highly inconvenient.
Change-Id: Ibc34d0219a616a239c0595e61a783f18fbc91b36
Related: 956bf05e7 "s1gw: Initial StatsD support"
---
M s1gw/S1GW_ConnHdlr.ttcn
M s1gw/S1GW_Tests.ttcn
2 files changed, 11 insertions(+), 15 deletions(-)
Approvals:
laforge: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/s1gw/S1GW_ConnHdlr.ttcn b/s1gw/S1GW_ConnHdlr.ttcn
index bb502be..d90609d 100644
--- a/s1gw/S1GW_ConnHdlr.ttcn
+++ b/s1gw/S1GW_ConnHdlr.ttcn
@@ -64,13 +64,6 @@
iE_Extensions := omit
}
-template (value) ConnHdlrPars
-t_ConnHdlrPars(integer idx := 0, charstring statsd_prefix := "") := {
- idx := idx,
- genb_id := ts_Global_ENB_ID(idx),
- statsd_prefix := statsd_prefix
-}
-
type function void_fn(charstring id) runs on ConnHdlr;
function f_ConnHdlr_init(void_fn fn, charstring id, ConnHdlrPars pars)
diff --git a/s1gw/S1GW_Tests.ttcn b/s1gw/S1GW_Tests.ttcn
index 06e4877..fd6a0ee 100644
--- a/s1gw/S1GW_Tests.ttcn
+++ b/s1gw/S1GW_Tests.ttcn
@@ -109,9 +109,12 @@
vc_PFCP.start(PFCP_Emulation.main(pfcp_cfg));
}
-function f_new_ConnHdlrPars(integer idx := 0) return ConnHdlrPars {
- var ConnHdlrPars pars := valueof(t_ConnHdlrPars(idx, mp_statsd_prefix));
- return pars;
+template (value) ConnHdlrPars
+t_ConnHdlrPars(integer idx := 0,
+ charstring statsd_prefix := mp_statsd_prefix) := {
+ idx := idx,
+ genb_id := ts_Global_ENB_ID(idx),
+ statsd_prefix := statsd_prefix
}
function f_ConnHdlr_spawn(void_fn fn, ConnHdlrPars pars)
@@ -162,7 +165,7 @@
f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
}
testcase TC_setup() runs on test_CT {
- var ConnHdlrPars pars := f_new_ConnHdlrPars();
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars);
var ConnHdlr vc_conn;
f_init();
@@ -189,7 +192,7 @@
f_init();
for (var integer i := 0; i < 42; i := i + 1) {
- var ConnHdlrPars pars := f_new_ConnHdlrPars(i);
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars(i));
var ConnHdlr vc_conn := f_ConnHdlr_spawn(refers(f_TC_setup_multi), pars);
vc_conns := vc_conns & { vc_conn };
}
@@ -217,7 +220,7 @@
f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
}
testcase TC_conn_term_by_mme() runs on test_CT {
- var ConnHdlrPars pars := f_new_ConnHdlrPars();
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars);
var ConnHdlr vc_conn;
f_init();
@@ -237,7 +240,7 @@
setverdict(pass);
}
testcase TC_conn_term_mme_unavail() runs on test_CT {
- var ConnHdlrPars pars := f_new_ConnHdlrPars();
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars);
var ConnHdlr vc_conn;
f_init(s1apsrv_start := false);
@@ -312,7 +315,7 @@
f_ConnHdlr_s1ap_unregister(g_pars.genb_id);
}
testcase TC_e_rab_setup() runs on test_CT {
- var ConnHdlrPars pars := f_new_ConnHdlrPars();
+ var ConnHdlrPars pars := valueof(t_ConnHdlrPars);
var ConnHdlr vc_conn;
f_init();
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38099?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibc34d0219a616a239c0595e61a783f18fbc91b36
Gerrit-Change-Number: 38099
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
fixeria has posted comments on this change by fixeria. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38099?usp=email )
Change subject: s1gw: move t_ConnHdlrPars back to S1GW_Tests
......................................................................
Patch Set 1:
(1 comment)
File s1gw/S1GW_Tests.ttcn:
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38099/comment/2398e411_5ccd… :
PS1, Line 168: var ConnHdlrPars pars := valueof(t_ConnHdlrPars);
> I really don't see why you prefer having a valueof(t_ConnHdlrPars) instead of an already in place fu […]
It's not about having `valueof(t_ConnHdlrPars)` vs `f_new_ConnHdlrPars()`, it's about the burden of adding new parameters in several places. Doesn't really matter if it's a function of a template, since I just copy-paste the testcase template anyway rather than typing all the `f_init()`-stuff manually.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/38099?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibc34d0219a616a239c0595e61a783f18fbc91b36
Gerrit-Change-Number: 38099
Gerrit-PatchSet: 1
Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 13 Sep 2024 01:21:50 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>