[S] Change in osmo-bsc[master]: osmo_msc_data_alloc(), doc/examples: allow all AMR modes by default

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/37515?usp=email ) Change subject: osmo_msc_data_alloc(), doc/examples: allow all AMR modes by default ...................................................................... osmo_msc_data_alloc(), doc/examples: allow all AMR modes by default There is no reason to allow the 5.90k mode alone. Allow them all and let codec negotiation figure out the AMR rates to use. Change-Id: I33e297a28bcaf8fd9ccddb20ce9ce092ab57d2e0 --- M doc/examples/osmo-bsc/osmo-bsc.cfg M src/osmo-bsc/osmo_bsc_msc.c M tests/ctrl/osmo-bsc-neigh-test.cfg 3 files changed, 19 insertions(+), 16 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/doc/examples/osmo-bsc/osmo-bsc.cfg b/doc/examples/osmo-bsc/osmo-bsc.cfg index 8368a27..c5b51f5 100644 --- a/doc/examples/osmo-bsc/osmo-bsc.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc.cfg @@ -87,13 +87,5 @@ ! 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 - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden bsc mid-call-timeout 0 diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c index 6faac4e..f062533 100644 --- a/src/osmo-bsc/osmo_bsc_msc.c +++ b/src/osmo-bsc/osmo_bsc_msc.c @@ -447,7 +447,14 @@ msc_data->a.asp_proto = OSMO_SS7_ASP_PROT_M3UA; /* Defaults for the audio setup */ + msc_data->amr_conf.m12_2 = 1; + msc_data->amr_conf.m10_2 = 1; + msc_data->amr_conf.m7_95 = 1; + msc_data->amr_conf.m7_40 = 1; + msc_data->amr_conf.m6_70 = 1; msc_data->amr_conf.m5_90 = 1; + msc_data->amr_conf.m5_15 = 1; + msc_data->amr_conf.m4_75 = 1; msc_data->amr_octet_aligned = true; /* Allow the full set of possible codecs by default */ diff --git a/tests/ctrl/osmo-bsc-neigh-test.cfg b/tests/ctrl/osmo-bsc-neigh-test.cfg index e4c610d..d6a5c9d 100644 --- a/tests/ctrl/osmo-bsc-neigh-test.cfg +++ b/tests/ctrl/osmo-bsc-neigh-test.cfg @@ -189,13 +189,5 @@ hopping enabled 0 msc 0 type normal - amr-config 12_2k forbidden - amr-config 10_2k forbidden - amr-config 7_95k forbidden - amr-config 7_40k forbidden - amr-config 6_70k forbidden - amr-config 5_90k allowed - amr-config 5_15k forbidden - amr-config 4_75k forbidden bsc mid-call-timeout 0 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/37515?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: I33e297a28bcaf8fd9ccddb20ce9ce092ab57d2e0 Gerrit-Change-Number: 37515 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> 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-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged