fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/37514?usp=email )
Change subject: osmo_msc_data_alloc(), doc/examples: deny emergency calls by default
......................................................................
osmo_msc_data_alloc(), doc/examples: deny emergency calls by default
It's safer to deny emergency calls by default, and thus require
osmo-bsc users to allow them manually iff such calls can actually
be routed to their local emergency services.
This reduces the risk of a situation, when a person having a real-life
emergency would be trying, for instance, to call an ambulance via a
test network, which does allow emergency calls but cannot route them.
Change-Id: I5296b3031c14a896caa33b16bf04db762b9f30bf
---
M doc/examples/osmo-bsc/osmo-bsc-4trx.cfg
M doc/examples/osmo-bsc/osmo-bsc.cfg
M src/osmo-bsc/osmo_bsc_msc.c
M tests/ctrl/osmo-bsc-neigh-test.cfg
4 files changed, 24 insertions(+), 4 deletions(-)
Approvals:
laforge: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg
index 03c3477..7ef8fd9 100644
--- a/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc-4trx.cfg
@@ -165,6 +165,8 @@
phys_chan_config DYNAMIC/OSMOCOM
hopping enabled 0
msc 0
- allow-emergency allow
+ ! Do not allow emergency calls unless you can route
+ ! them to the local emergency services
+ allow-emergency deny
bsc
mid-call-timeout 0
diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg
index 32a8349..8368a27 100644
--- a/doc/examples/osmo-bsc/osmo-bsc.cfg
+++ b/doc/examples/osmo-bsc/osmo-bsc.cfg
@@ -84,7 +84,9 @@
phys_chan_config TCH/F
hopping enabled 0
msc 0
- allow-emergency allow
+ ! Do not allow emergency calls unless you can route
+ ! them to the local emergency services
+ allow-emergency deny
amr-config 12_2k forbidden
amr-config 10_2k forbidden
amr-config 7_95k forbidden
diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
index 2425592..6faac4e 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -443,7 +443,7 @@
};
msc_data->nr = nr;
- msc_data->allow_emerg = 1;
+ msc_data->allow_emerg = 0;
msc_data->a.asp_proto = OSMO_SS7_ASP_PROT_M3UA;
/* Defaults for the audio setup */
diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg
index 80acd64..e4c610d 100644
--- a/tests/ctrl/osmo-bsc-neigh-test.cfg
+++ b/tests/ctrl/osmo-bsc-neigh-test.cfg
@@ -189,7 +189,6 @@
hopping enabled 0
msc 0
type normal
- allow-emergency allow
amr-config 12_2k forbidden
amr-config 10_2k forbidden
amr-config 7_95k forbidden
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/37514?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I5296b3031c14a896caa33b16bf04db762b9f30bf
Gerrit-Change-Number: 37514
Gerrit-PatchSet: 2
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: neels <nhofmeyr(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
falconia has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/37647?usp=email )
Change subject: sysmo: generate empty TCH/H payload on FACCH/H Rx
......................................................................
sysmo: generate empty TCH/H payload on FACCH/H Rx
When sysmoBTS PHY decodes TCH UL Rx as FACCH, it sends only one
PH-DATA.ind for the FACCH, but none for TCH. This case was handled
correctly for TCH/F in 2023-03, but FACCH/H has not been handled
correctly until now.
Change-Id: Id6d966348fb2be084485279e75480f98f46e464b
---
M src/osmo-bts-sysmo/l1_if.c
1 file changed, 35 insertions(+), 16 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/47/37647/1
diff --git a/src/osmo-bts-sysmo/l1_if.c b/src/osmo-bts-sysmo/l1_if.c
index 9ca1c32..aa4a739 100644
--- a/src/osmo-bts-sysmo/l1_if.c
+++ b/src/osmo-bts-sysmo/l1_if.c
@@ -987,23 +987,28 @@
return rc;
}
- /* If we got FACCH, the RTP clock needs to account for it,
- * and if we have rtp continuous-streaming enabled,
- * an actual BFI packet will be emitted.
+ /* When TCH UL receiver in sysmoBTS PHY detects FACCH,
+ * it behaves as follows (observed):
*
- * Only the case of TCH/F is currently handled; the task of
- * supporting TCH/H is left as a FIXME for other/later
- * developers. The difficulty with supporting FACCH/H is that
- * only one GsmL1_Sapi_FacchH message will be received,
- * covering 40 ms of time, but two RTP "tick" output calls
- * will need to be made, with appropriately adjusted frame
- * numbers. As a further consideration for rtp continuous-streaming
- * mode, having the two RTP BFI packets sent directly back to back,
- * as opposed to proper 20 ms timing, may be so undesirable
- * that some deployments may rather disable TCH/H (use only TCH/F)
- * than deal with the extra pain, or use TCH/H only on SDR-based
- * BTS with osmo-bts-trx where correct timing is easily achieved. */
- if (data_ind->sapi == GsmL1_Sapi_FacchF)
+ * - In each 20 ms window (both TCH/F and TCH/H), a single
+ * PH-DATA.ind arrives.
+ * - In the case of TCH/F, this PH-DATA.ind carries GsmL1_Sapi_FacchF
+ * instead of GsmL1_Sapi_TchF.
+ * - In the case of TCH/H, the PH-DATA.ind for block 0 carries
+ * GsmL1_Sapi_FacchH instead of GsmL1_Sapi_TchH. However,
+ * in the following 20 ms window (block 1 of FACCH/H)
+ * a PH-DATA.ind with GsmL1_Sapi_TchH arrives as normal.
+ * Typically the latter PHY message carries a BFI (0 length payload),
+ * but nonzero payloads have also been observed under some conditions.
+ * (The latter case remains to be investigated further.)
+ *
+ * In those 20 ms windows where we receive PH-DATA.ind for FACCH
+ * instead of the usual TCH kind, we need to pass an empty payload
+ * to the upper layers so we can produce the correct effect in
+ * the outgoing RTP stream depending on configuration.
+ */
+ if (data_ind->sapi == GsmL1_Sapi_FacchF ||
+ data_ind->sapi == GsmL1_Sapi_FacchH)
l1if_tch_rx_facch(trx, chan_nr, l1p_msg);
/* fill L1SAP header */
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/37647?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: Id6d966348fb2be084485279e75480f98f46e464b
Gerrit-Change-Number: 37647
Gerrit-PatchSet: 1
Gerrit-Owner: falconia <falcon(a)freecalypso.org>
Gerrit-MessageType: newchange
Attention is currently required from: dexter, fixeria.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/37543?usp=email )
Change subject: pySim-shell: add "fsdump" command
......................................................................
Patch Set 2:
(5 comments)
Patchset:
PS1:
> I noticed we actually forget to dump the DF and ADD, but those also have FCP with security attribute […]
Done
File pySim-shell.py:
https://gerrit.osmocom.org/c/pysim/+/37543/comment/9436f00b_df895119
PS1, Line 731: # the EF we want to export. To maintain consistency we will then
> tabs vs spaces
Done
https://gerrit.osmocom.org/c/pysim/+/37543/comment/0eff120f_c3edf22c
PS1, Line 784: result[0])
> don't you need to do `str()` like above?
Done
https://gerrit.osmocom.org/c/pysim/+/37543/comment/bf83e2dc_21fe430c
PS1, Line 790: else
> cosmetic: `else` is not needed after `break` or `return`
Done
https://gerrit.osmocom.org/c/pysim/+/37543/comment/384c391e_c064698c
PS1, Line 852: self.export_ef(opts.filename, context, **kwargs_export)
> Did you mean fsdump_ef here?
Done
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37543?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ib179f57bc04d394efe11003ba191dca6098192d3
Gerrit-Change-Number: 37543
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 27 Jul 2024 14:48:05 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: laforge <laforge(a)osmocom.org>
Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de>
Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: dexter, fixeria, laforge.
Hello Jenkins Builder, dexter, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/37543?usp=email
to look at the new patch set (#3).
Change subject: pySim-shell: add "fsdump" command
......................................................................
pySim-shell: add "fsdump" command
This command exports the entire filesystem state as one JSON document,
which can be useful for storing it in a noSQL database, or for doing a
structured diff between different such dumps.
It's similar to "export", but then reasonably different to rectify a
separate command.
Change-Id: Ib179f57bc04d394efe11003ba191dca6098192d3
---
M docs/shell.rst
M pySim-shell.py
M pySim/exceptions.py
3 files changed, 233 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/37543/3
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37543?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ib179f57bc04d394efe11003ba191dca6098192d3
Gerrit-Change-Number: 37543
Gerrit-PatchSet: 3
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: dexter, fixeria, laforge.
Hello Jenkins Builder, dexter, fixeria,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/pysim/+/37543?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review+1 by fixeria, Code-Review-1 by laforge, Verified+1 by Jenkins Builder, Verified+1 by dexter
Change subject: pySim-shell: add "fsdump" command
......................................................................
pySim-shell: add "fsdump" command
This command exports the entire filesystem state as one JSON document,
which can be useful for storing it in a noSQL database, or for doing a
structured diff between different such dumps.
It's similar to "export", but then reasonably different to rectify a
separate command.
Change-Id: Ib179f57bc04d394efe11003ba191dca6098192d3
---
M docs/shell.rst
M pySim-shell.py
M pySim/exceptions.py
3 files changed, 230 insertions(+), 3 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/43/37543/2
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/37543?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: Ib179f57bc04d394efe11003ba191dca6098192d3
Gerrit-Change-Number: 37543
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-MessageType: newpatchset
Attention is currently required from: osmith.
laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/37633?usp=email )
Change subject: jobs/osmocom-depcheck: remove
......................................................................
Patch Set 1:
(1 comment)
Commit Message:
https://gerrit.osmocom.org/c/osmo-ci/+/37633/comment/747f68ef_a6d2f099
PS1, Line 14: I thought this was used in the release
: process to make sure that e.g. programs that don't mention a new
: libosmocore in their TODO-RELEASE still build with the previous
: libosmocore. But what we actually do is just bump the required versions
: of the dependencies regardless
this means our process is broken. I'd rather fix the process than remove tools that help a proper process.
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/37633?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I8b159ececaed86369fe272ae8a8bf0e88b0effa2
Gerrit-Change-Number: 37633
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: osmith <osmith(a)sysmocom.de>
Gerrit-Comment-Date: Sat, 27 Jul 2024 14:24:36 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment