Change in osmo-bsc[master]: osmo_bsc_msc: Set reasonable codec list defaults

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/11237 )

Change subject: osmo_bsc_msc: Set reasonable codec list defaults
......................................................................

osmo_bsc_msc: Set reasonable codec list defaults

When the user sets no codec-list in the msc node, the configuration will
end up with an empty codec list. This is a useless configuration. There
should be a sane default setting.

- Set all possible codecs as default for codec-list

Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed
Related: OS#3625
---
M src/osmo-bsc/osmo_bsc_msc.c
1 file changed, 22 insertions(+), 0 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c
index e00c9ef..71931e6 100644
--- a/src/osmo-bsc/osmo_bsc_msc.c
+++ b/src/osmo-bsc/osmo_bsc_msc.c
@@ -64,6 +64,7 @@
 struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *net, int nr)
 {
 	struct bsc_msc_data *msc_data;
+	unsigned int i;
 
 	/* check if there is already one */
 	msc_data = osmo_msc_data_find(net, nr);
@@ -94,6 +95,27 @@
 	/* Defaults for the audio setup */
 	msc_data->amr_conf.m5_90 = 1;
 
+	/* Allow the full set of possible codecs by default */
+	msc_data->audio_length = 5;
+	msc_data->audio_support =
+	    talloc_zero_array(msc_data, struct gsm_audio_support *,
+			      msc_data->audio_length);
+	for (i = 0; i < msc_data->audio_length; i++) {
+		msc_data->audio_support[i] =
+		    talloc_zero(msc_data->audio_support,
+				struct gsm_audio_support);
+	}
+	msc_data->audio_support[0]->ver = 1;
+	msc_data->audio_support[0]->hr = 0;
+	msc_data->audio_support[1]->ver = 1;
+	msc_data->audio_support[1]->hr = 1;
+	msc_data->audio_support[2]->ver = 2;
+	msc_data->audio_support[2]->hr = 0;
+	msc_data->audio_support[3]->ver = 3;
+	msc_data->audio_support[3]->hr = 0;
+	msc_data->audio_support[4]->ver = 3;
+	msc_data->audio_support[4]->hr = 1;
+
 	return msc_data;
 }
 

-- 
To view, visit https://gerrit.osmocom.org/11237
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3749a65828c788f38c22f0a5314533f4516da3ed
Gerrit-Change-Number: 11237
Gerrit-PatchSet: 2
Gerrit-Owner: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder (1000002)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181006/871b987a/attachment.htm>