March 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-bsc[master]: cosmetic: clarify test_codec_support_bts()
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31612 ) Change subject: cosmetic: clarify test_codec_support_bts() ...................................................................... cosmetic: clarify test_codec_support_bts() Change-Id: I13d9b158d08f4938c5aa47ef3134819a4b1f7d29 --- M src/osmo-bsc/codec_pref.c 1 file changed, 28 insertions(+), 20 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/12/31612/1 diff --git a/src/osmo-bsc/codec_pref.c b/src/osmo-bsc/codec_pref.c index dc29a5a..8fd5380 100644 --- a/src/osmo-bsc/codec_pref.c +++ b/src/osmo-bsc/codec_pref.c @@ -194,14 +194,22 @@ llist_for_each_entry(trx, &bts->trx_list, list) { for (i = 0; i < TRX_NR_TS; i++) { pchan = trx->ts[i].pchan_from_config; - if (pchan == GSM_PCHAN_OSMO_DYN) + switch (pchan) { + case GSM_PCHAN_OSMO_DYN: rate_match = true; - else if (full_rate && pchan == GSM_PCHAN_TCH_F) - rate_match = true; - else if (full_rate && pchan == GSM_PCHAN_TCH_F_PDCH) - rate_match = true; - else if (!full_rate && pchan == GSM_PCHAN_TCH_H) - rate_match = true; + break; + case GSM_PCHAN_TCH_F: + case GSM_PCHAN_TCH_F_PDCH: + if (full_rate) + rate_match = true; + break; + case GSM_PCHAN_TCH_H: + if (!full_rate) + rate_match = true; + break; + default: + break; + } } } if (!rate_match) @@ -214,21 +222,12 @@ * selectively disable GSM-RF per BTS via VTY. */ return true; case GSM0808_PERM_FR2: - if (bts_codec->efr) - return true; - break; + return (bool)bts_codec->efr; case GSM0808_PERM_FR3: - if (bts_codec->amr) - return true; - break; - case GSM0808_PERM_HR1: - if (bts_codec->hr) - return true; - break; case GSM0808_PERM_HR3: - if (bts_codec->amr) - return true; - break; + return (bool)bts_codec->amr; + case GSM0808_PERM_HR1: + return (bool)bts_codec->hr; default: return false; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31612 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13d9b158d08f4938c5aa47ef3134819a4b1f7d29 Gerrit-Change-Number: 31612 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: select_codecs(): constify ct arg
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31614 ) Change subject: select_codecs(): constify ct arg ...................................................................... select_codecs(): constify ct arg Change-Id: Icb07374b40629e48d811a036b9a56d026c1d897c --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/14/31614/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index cc659f1..1af8fdd 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -674,7 +674,7 @@ * lchan is requested. The preferred lchan will be requested first. If we * find an alternate setting here, this one will be tried secondly if our * primary choice fails. */ -static int select_codecs(struct assignment_request *req, struct gsm0808_channel_type *ct, +static int select_codecs(struct assignment_request *req, const struct gsm0808_channel_type *ct, struct gsm_subscriber_connection *conn) { int rc, i, nc = 0; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Icb07374b40629e48d811a036b9a56d026c1d897c Gerrit-Change-Number: 31614 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: select_codecs(): doc tweak
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31613 ) Change subject: select_codecs(): doc tweak ...................................................................... select_codecs(): doc tweak Change-Id: I52a111b1992db1e335c692d2caee7c5398a6f90e --- M src/osmo-bsc/osmo_bsc_bssap.c 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/13/31613/1 diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c index 6e78f47..cc659f1 100644 --- a/src/osmo-bsc/osmo_bsc_bssap.c +++ b/src/osmo-bsc/osmo_bsc_bssap.c @@ -668,7 +668,7 @@ } /* Select a preferred and an alternative codec rate depending on the available - * capabilities. This decision does not include the actual channel load yet, + * capabilities. This decision does not include the actual lchan availability yet, * this is also the reason why the result is a preferred and an alternate * setting. The final decision is made in assignment_fsm.c when the actual * lchan is requested. The preferred lchan will be requested first. If we -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31613 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I52a111b1992db1e335c692d2caee7c5398a6f90e Gerrit-Change-Number: 31613 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: vty: add 'osmodyn' as alias for 'tch/f_tch/h_sdcch8_pdch'
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31615 ) Change subject: vty: add 'osmodyn' as alias for 'tch/f_tch/h_sdcch8_pdch' ...................................................................... vty: add 'osmodyn' as alias for 'tch/f_tch/h_sdcch8_pdch' We already use "OSMO_DYN" as name for "fully dynamic" timeslot config, when working with osmo-bsc.cfg I dearly miss this short name, it is a pain / has become ridiculous to write 'tch/f_tch/h_sdcch8_pdch'. 'osmodyn' is now the default name used on 'vty write', but the old 'tch/f_tch/h_sdcch8_pdch' is still supported: get_value_string() hits 'OSMODYN' first, but get_string_value() also reaches the old name. Change-Id: I37719edd867c777d1ce944b8e2f1efffac38f00e --- M src/osmo-bsc/gsm_data.c 1 file changed, 19 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/15/31615/1 diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index a682a32..54f8b89 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -188,6 +188,8 @@ { GSM_PCHAN_UNKNOWN, "UNKNOWN" }, { GSM_PCHAN_CCCH_SDCCH4_CBCH, "CCCH+SDCCH4+CBCH" }, { GSM_PCHAN_SDCCH8_SACCH8C_CBCH, "SDCCH8+CBCH" }, + /* make get_string_value() return GSM_PCHAN_OSMO_DYN for both "OSMODYN" and "TCH/F_TCH/H_SDCCH8_PDCH" */ + { GSM_PCHAN_OSMO_DYN, "OSMODYN" }, { GSM_PCHAN_OSMO_DYN, "TCH/F_TCH/H_SDCCH8_PDCH" }, { 0, NULL } }; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31615 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I37719edd867c777d1ce944b8e2f1efffac38f00e Gerrit-Change-Number: 31615 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: doc: add codec_resolution.msc
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31616 ) Change subject: doc: add codec_resolution.msc ...................................................................... doc: add codec_resolution.msc Illustrate the various factors that influence picking a codec for a 2G voice call in osmo-bsc. Change-Id: I3d63a0d587a43fc18ea54b3982800b19b4d50a08 --- M doc/Makefile.am A doc/codec_resolution.msc 2 files changed, 61 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/16/31616/1 diff --git a/doc/Makefile.am b/doc/Makefile.am index d68b3f6..32d06c1 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -14,6 +14,7 @@ $(builddir)/handover-inter-bsc-in.png \ $(builddir)/mgw-endpoint.png \ $(builddir)/location_services_ta.png \ + $(builddir)/codec_resolution.png \ $(NULL) dot: \ diff --git a/doc/codec_resolution.msc b/doc/codec_resolution.msc new file mode 100644 index 0000000..4550448 --- /dev/null +++ b/doc/codec_resolution.msc @@ -0,0 +1,48 @@ +msc { + hscale="1.7"; + ms[label="MS/BTS"],cfg[label="osmo-bsc.cfg"],bsc[label="osmo-bsc"],__msc[label="MSC"],sip[label="SIP"]; + + ms => bsc [label="EST IND / Compl L3"]; + cfg => bsc [label="'msc 0'\n'codec-list fr3 hr3 fr2 fr1 hr1'"]; + bsc rbox bsc [label="build Speech Codec List\ngen_bss_supported_codec_list()"]; + bsc => __msc [label="Compl L3"]; + bsc note __msc [label="Speech Codec List (BSS Supported)\n{GSM0808_SCT_FR3 + AMR-cfg,\nGSM0808_SCT_HR3 + AMR-cfg,\nGSM0808_SCT_FR2,\nGSM0808_SCT_FR1,\nGSM0808_SCT_HR1}"]; + --- [label="AMR-cfg:"]; + bsc note __msc [label="S0-S15: 16bit flags\nS0 = 1: 4.75 ---- ---- ---- ---- ---- ---- ----\nS1 = 1: 4.75 ---- 5.90 ---- 7.40 ---- ---- 12.2\nS2 = 1: ---- ---- 5.90 ---- ---- ---- ---- ----\nS3 = 1: ---- ---- ---- 6.70 ---- ---- ---- ----\nS4 = 1: ---- ---- ---- ---- 7.40 ---- ---- ----\nS5 = 1: ---- ---- ---- ---- ---- 7.95 ---- ----\nS6 = 1: ---- ---- ---- ---- ---- ---- 10.2 ----\nS7 = 1: ---- ---- ---- ---- ---- ---- ---- 12.2\n\nS8 = 1: 4.75 ---- 5.90 ---- ---- ---- ---- ----\nS9 = 1: 4.75 ---- 5.90 6.70 ---- ---- ---- ----\nS10= 1: 4.75 ---- 5.90 6.70 7.40 ---- ---- ----\nS11= 1: ---- ---- ---- ---- ---- ---- ---- ----\nS12= 1: 4.75 ---- 5.90 6.70 ---- ---- 10.2 ----\nS13= 1: ---- ---- ---- ---- ---- ---- ---- ----\nS14= 1: 4.75 ---- 5.90 ---- ---- 7.95 ---- 12.2\nS15= 1: ---- ---- ---- ---- ---- ---- ---- ----\n\n3GPP TS 28.062 Table 7.11.3.1.3-2: \"Preferred Configurations\",\nsome removed as specified in 3GPP TS 48.008 3.2.2.103"]; + + cfg => bsc [label="'bts 0'\n'amr tch-x modes 0 2 4 7'"]; + bsc rbox bsc [label="convert AMR modes to\nbts-S0-S15"]; + cfg => bsc [label="'msc 0'\n'amr-config 4_75k allowed'"]; + bsc rbox bsc [label="convert AMR modes to\nmsc-S0-S15"]; + bsc => __msc [label="Compl L3 Speech Codec List:\nbitwise AND:\nbts-S0-S15 & msc-S0-S15"]; + ---; + + ms => __msc [label="Bearer Capabilities"]; + __msc <= sip [label="SDP"]; + __msc note sip [label="m=audio 12345 RTP/AVP 112 3 111 110\na=rtpmap:112 AMR/8000\na=fmtp:112 mode-set=0,2,4,7\na=rtpmap:3 GSM/8000\na=rtpmap:111 GSM-HR-08/8000\na=rtpmap:110 GSM-EFR/8000"]; + + __msc rbox __msc [label="combine:\nBSC: Speech Codec List\nMS: Bearer Cap\nSIP: SDP"]; + + bsc <= __msc [label="BSSMAP Assignment Request\ncontains\nChannel Type\nSpeech Codec List (MSC Preferred)"]; + bsc note __msc [label="Channel Type\nChannel Rate And Type:\n- [prefer] full rate\n- [prefer] half rate\n- indicated by Permitted Speech list\nPermitted Speech [1..9]:\n{GSM0808_PERM_FR3,\nGSM0808_PERM_HR3,\nGSM0808_PERM_FR2,\nGSM0808_PERM_FR1,\nGSM0808_PERM_HR1}"]; + bsc note __msc [label="Speech Codec List (MSC Preferred)\n{GSM0808_SCT_FR3 + AMR-cfg,\nGSM0808_SCT_HR3 + AMR-cfg,\nGSM0808_SCT_FR2,\nGSM0808_SCT_FR1,\nGSM0808_SCT_HR1}"]; + + cfg => bsc [label="'msc 0'\n'codec-list fr3 hr3 fr2 fr1 hr1'"]; + cfg => bsc [label="'bts 0'\n'phys_chan_cfg TCH/F'"]; + cfg => bsc [label="'bts 0'\n'codec-support amr efr fr hr'"]; + + cfg rbox bsc [label="combine:\n'msc 0' 'codec-list fr3 hr3 fr2 fr1 hr1'\n'bts 0' 'phys_chan_cfg TCH/F'\n'bts 0' 'codec-support amr efr fr hr'\nMSC: Channel Type\nMSC: Speech Codec List (MSC Preferred)\n=>\n{GSM48_CMODE_SPEECH_AMR, FR, S0-S15},\n{GSM48_CMODE_SPEECH_AMR, HR, S0-S15}"]; + + cfg => bsc [label="'bts 0'\n'amr tch-x bts threshold'\n'amr tch-x bts hysteresis'"]; + ms <= bsc [label="RSL CHANnel ACTIVation"]; + ms note bsc [label="Channel Rate and Type: Full/Half rate\nSpeech Coding Algorithm Version: 3 (=AMR)\nMultiRate Configuration:\n- 4.75 | 5.90 | 7.40 | 12.2\n- Threshold / Hysteresis x 3"]; + cfg => bsc [label="'bts 0'\n'amr tch-x ms threshold'\n'amr tch-x ms hysteresis'"]; + ms <= bsc [label="RSL Assignment Command"]; + ms note bsc [label="Channel Description: TCH/F\nSpeech Coding Algorithm Version: 3 (=AMR)\nMultiRate Configuration:\n- 4.75 | 5.90 | 7.40 | 12.2\n- Threshold / Hysteresis x 3"]; + + bsc => __msc [label="BSSMAP Assignment Complete"]; + bsc note __msc [label="Chosen Channel: Speech, Full Rate\nSpeech Version (Chosen): FR3\nSpeech Codec (Chosen): FR AMR, S0-S15"]; + + __msc => sip [label="SDP (optional)"]; + __msc note sip [label="m=audio 12345 RTP/AVP 112\na=rtpmap:112 AMR/8000\na=fmtp:112 mode-set=0,2,4,7"]; +} -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31616 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I3d63a0d587a43fc18ea54b3982800b19b4d50a08 Gerrit-Change-Number: 31616 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: cosmetic: use char literals in cfg_net_bsc_codec_list()
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31603 ) Change subject: cosmetic: use char literals in cfg_net_bsc_codec_list() ...................................................................... cosmetic: use char literals in cfg_net_bsc_codec_list() Change-Id: I1a29fb54cdcd15c6e9b6447d929db0e9492264f7 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 11 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/03/31603/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 4b7f24c..a3ba143 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2718,8 +2718,8 @@ if (strlen(argv[i]) != 3 || argv[i][1] != 'r' || (argv[i][0] != 'h' && argv[i][0] != 'f') - || argv[i][2] < 0x30 - || argv[i][2] > 0x39) + || argv[i][2] < '0' + || argv[i][2] > '9') goto error; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31603 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I1a29fb54cdcd15c6e9b6447d929db0e9492264f7 Gerrit-Change-Number: 31603 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-bsc[master]: add msc.vty to test 'msc' / 'codec-list' cfg
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31602 ) Change subject: add msc.vty to test 'msc' / 'codec-list' cfg ...................................................................... add msc.vty to test 'msc' / 'codec-list' cfg Show various weird things we allow in codec-list. Change-Id: I04ce02dff7cadab826611bd6a0df5596a40578b5 --- A tests/msc.vty 1 file changed, 135 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/02/31602/1 diff --git a/tests/msc.vty b/tests/msc.vty new file mode 100644 index 0000000..555ea34 --- /dev/null +++ b/tests/msc.vty @@ -0,0 +1,124 @@ +OsmoBSC> enable + +OsmoBSC# configure terminal +OsmoBSC(config)# msc 0 + +OsmoBSC(config-msc)# codec-list? + codec-list Set the allowed audio codecs +OsmoBSC(config-msc)# codec-list ? + LIST List of audio codecs, e.g. fr3 fr1 hr3 + +OsmoBSC(config-msc)# # Default list -- should match the default in osmo_msc_data_alloc() +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr1 hr1 fr2 fr3 hr3 +... + +OsmoBSC(config-msc)# # Change order +OsmoBSC(config-msc)# codec-list fr3 hr3 fr2 fr1 hr1 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr3 hr3 fr2 fr1 hr1 +... +OsmoBSC(config-msc)# codec-list hr1 hr3 fr1 fr2 fr3 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list hr1 hr3 fr1 fr2 fr3 +... + +OsmoBSC(config-msc)# codec-list foo +Codec name must be hrX or frX. Was 'foo' +% Command incomplete. +OsmoBSC(config-msc)# # ERROR: "Command incomplete" is not accurate + +OsmoBSC(config-msc)# codec-list fr10 +Codec name must be hrX or frX. Was 'fr10' +% Command incomplete. +OsmoBSC(config-msc)# # ERROR: "Command incomplete" is not accurate + +OsmoBSC(config-msc)# codec-list hr10 +Codec name must be hrX or frX. Was 'hr10' +% Command incomplete. +OsmoBSC(config-msc)# # ERROR: "Command incomplete" is not accurate + +OsmoBSC(config-msc)# codec-list FR1 +Codec name must be hrX or frX. Was 'FR1' +% Command incomplete. +OsmoBSC(config-msc)# # ERROR: "Command incomplete" is not accurate + +OsmoBSC(config-msc)# # Ensure the codec-list with wrong args did not change the config +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list hr1 hr3 fr1 fr2 fr3 +... + +OsmoBSC(config-msc)# codec-list fr1 fr1 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr1 fr1 +... +OsmoBSC(config-msc)# # ERROR: duplicate entries make no sense + +OsmoBSC(config-msc)# codec-list fr0 fr1 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr0 fr1 +... +OsmoBSC(config-msc)# # ERROR: fr0 should be rejected + +OsmoBSC(config-msc)# codec-list hr0 hr1 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list hr0 hr1 +... +OsmoBSC(config-msc)# # ERROR: hr0 should be rejected + +OsmoBSC(config-msc)# codec-list fr8 fr9 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr8 fr9 +... +OsmoBSC(config-msc)# # ERROR: fr8 and fr9 should be rejected + +OsmoBSC(config-msc)# codec-list hr8 hr9 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list hr8 hr9 +... +OsmoBSC(config-msc)# # ERROR: hr8 and hr9 should be rejected + +OsmoBSC(config-msc)# codec-list fr2 hr2 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr2 hr2 +... +OsmoBSC(config-msc)# # TODO: should hr2 be rejected + +OsmoBSC(config-msc)# codec-list fr1 fr2 fr3 fr4 +OsmoBSC(config-msc)# show running-config +... +msc 0 +... + codec-list fr1 fr2 fr3 fr4 +... +OsmoBSC(config-msc)# # TODO: should fr4 thru fr7 be rejected -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31602 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I04ce02dff7cadab826611bd6a0df5596a40578b5 Gerrit-Change-Number: 31602 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: examples: osmo-bsc-minimal.cfg: drop codec-list
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31601 ) Change subject: examples: osmo-bsc-minimal.cfg: drop codec-list ...................................................................... examples: osmo-bsc-minimal.cfg: drop codec-list A new VTY test is coming up that includes testing the default codec-list setting. The VTY tests are using osmo-bsc-minimal.cfg, so let's not overwrite the compile time default for codec-list. Also, there is no need to define a codec-list, so it is actually minimal to omit it. Change-Id: I01bee711f21023e2eab0688f45ff68f81afe1831 --- M doc/examples/osmo-bsc/osmo-bsc-minimal.cfg 1 file changed, 16 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/01/31601/1 diff --git a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg index 5e1ac11..b4e6e4a 100644 --- a/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg +++ b/doc/examples/osmo-bsc/osmo-bsc-minimal.cfg @@ -30,4 +30,3 @@ e1_line 0 driver ipa msc 0 allow-emergency deny - codec-list fr1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31601 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I01bee711f21023e2eab0688f45ff68f81afe1831 Gerrit-Change-Number: 31601 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: bsc_vty.c: s/bsc/msc for commands under msc node
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31606 ) Change subject: bsc_vty.c: s/bsc/msc for commands under msc node ...................................................................... bsc_vty.c: s/bsc/msc for commands under msc node Change-Id: Id91a82ca8e2eb91b52836e024ccf925245886ae6 --- M src/osmo-bsc/bsc_vty.c 1 file changed, 27 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/06/31606/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index 0472a93..ce4f654 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2640,8 +2640,8 @@ return CMD_SUCCESS; } -DEFUN_ATTR(cfg_net_bsc_ncc, - cfg_net_bsc_ncc_cmd, +DEFUN_ATTR(cfg_net_msc_ncc, + cfg_net_msc_ncc_cmd, "core-mobile-network-code <1-999>", "Use this network code for the core network\n" "MNC value\n", CMD_ATTR_IMMEDIATE) @@ -2659,8 +2659,8 @@ return CMD_SUCCESS; } -DEFUN_ATTR(cfg_net_bsc_mcc, - cfg_net_bsc_mcc_cmd, +DEFUN_ATTR(cfg_net_msc_mcc, + cfg_net_msc_mcc_cmd, "core-mobile-country-code <1-999>", "Use this country code for the core network\n" "MCC value\n", CMD_ATTR_IMMEDIATE) @@ -2675,8 +2675,8 @@ return CMD_SUCCESS; } -DEFUN_DEPRECATED(cfg_net_bsc_lac, - cfg_net_bsc_lac_cmd, +DEFUN_DEPRECATED(cfg_net_msc_lac, + cfg_net_msc_lac_cmd, "core-location-area-code <0-65535>", "Legacy configuration that no longer has any effect\n-\n") { @@ -2684,8 +2684,8 @@ return CMD_SUCCESS; } -DEFUN_DEPRECATED(cfg_net_bsc_ci, - cfg_net_bsc_ci_cmd, +DEFUN_DEPRECATED(cfg_net_msc_ci, + cfg_net_msc_ci_cmd, "core-cell-identity <0-65535>", "Legacy configuration that no longer has any effect\n-\n") { @@ -2693,8 +2693,8 @@ return CMD_SUCCESS; } -DEFUN_DEPRECATED(cfg_net_bsc_rtp_base, - cfg_net_bsc_rtp_base_cmd, +DEFUN_DEPRECATED(cfg_net_msc_rtp_base, + cfg_net_msc_rtp_base_cmd, "ip.access rtp-base <1-65000>", "deprecated\n" "deprecated, RTP is handled by the MGW\n" "deprecated\n") { @@ -2702,8 +2702,8 @@ return CMD_SUCCESS; } -DEFUN_USRATTR(cfg_net_bsc_codec_list, - cfg_net_bsc_codec_list_cmd, +DEFUN_USRATTR(cfg_net_msc_codec_list, + cfg_net_msc_codec_list_cmd, BSC_VTY_ATTR_NEW_LCHAN, "codec-list .LIST", "Set the allowed audio codecs and their order of preference\n" @@ -3615,12 +3615,12 @@ install_element(BSC_NODE, &cfg_bsc_bts_setup_ramping_step_interval_cmd); install_node(&msc_node, config_write_msc); - install_element(MSC_NODE, &cfg_net_bsc_ncc_cmd); - install_element(MSC_NODE, &cfg_net_bsc_mcc_cmd); - install_element(MSC_NODE, &cfg_net_bsc_lac_cmd); - install_element(MSC_NODE, &cfg_net_bsc_ci_cmd); - install_element(MSC_NODE, &cfg_net_bsc_rtp_base_cmd); - install_element(MSC_NODE, &cfg_net_bsc_codec_list_cmd); + install_element(MSC_NODE, &cfg_net_msc_ncc_cmd); + install_element(MSC_NODE, &cfg_net_msc_mcc_cmd); + install_element(MSC_NODE, &cfg_net_msc_lac_cmd); + install_element(MSC_NODE, &cfg_net_msc_ci_cmd); + install_element(MSC_NODE, &cfg_net_msc_rtp_base_cmd); + install_element(MSC_NODE, &cfg_net_msc_codec_list_cmd); install_element(MSC_NODE, &cfg_net_msc_dest_cmd); install_element(MSC_NODE, &cfg_net_msc_no_dest_cmd); install_element(MSC_NODE, &cfg_net_msc_welcome_ussd_cmd); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31606 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id91a82ca8e2eb91b52836e024ccf925245886ae6 Gerrit-Change-Number: 31606 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-bsc[master]: vty: improve doc for 'codec-list'
by neels 01 Mar '23

01 Mar '23

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31605 ) Change subject: vty: improve doc for 'codec-list' ...................................................................... vty: improve doc for 'codec-list' Change-Id: I33e6568997bcb1a9466e1e0c1b00718b703e2904 --- M src/osmo-bsc/bsc_vty.c M tests/msc.vty 2 files changed, 14 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/05/31605/1 diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c index fd08ff5..0472a93 100644 --- a/src/osmo-bsc/bsc_vty.c +++ b/src/osmo-bsc/bsc_vty.c @@ -2706,8 +2706,9 @@ cfg_net_bsc_codec_list_cmd, BSC_VTY_ATTR_NEW_LCHAN, "codec-list .LIST", - "Set the allowed audio codecs\n" - "List of audio codecs, e.g. fr3 fr1 hr3\n") + "Set the allowed audio codecs and their order of preference\n" + "List of audio codecs in order of preference, e.g. 'codec-list fr3 fr2 fr1 hr3 hr1'." + " (fr3: AMR-FR, hr3: AMR-HR, fr2: GSM-EFR, fr1: GSM-FR, hr1: GSM-HR)\n") { struct bsc_msc_data *data = bsc_msc_data(vty); int i; diff --git a/tests/msc.vty b/tests/msc.vty index 555ea34..6edc846 100644 --- a/tests/msc.vty +++ b/tests/msc.vty @@ -4,9 +4,9 @@ OsmoBSC(config)# msc 0 OsmoBSC(config-msc)# codec-list? - codec-list Set the allowed audio codecs + codec-list Set the allowed audio codecs and their order of preference OsmoBSC(config-msc)# codec-list ? - LIST List of audio codecs, e.g. fr3 fr1 hr3 + LIST List of audio codecs in order of preference, e.g. 'codec-list fr3 fr2 fr1 hr3 hr1'. (fr3: AMR-FR, hr3: AMR-HR, fr2: GSM-EFR, fr1: GSM-FR, hr1: GSM-HR) OsmoBSC(config-msc)# # Default list -- should match the default in osmo_msc_data_alloc() OsmoBSC(config-msc)# show running-config -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31605 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I33e6568997bcb1a9466e1e0c1b00718b703e2904 Gerrit-Change-Number: 31605 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 0