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