<p>Harald Welte has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9317">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Permit selection of other ASP protocol than M3UA<br><br>We used to have hard-coded M3UA. Let's allow the user to configure<br>this per MSC using a new "asp-protocol (m3ua|sua|ipa)" VTY command.<br><br>For SUA this should just work 1:1 without any trouble. For IPA,<br>this of course only changes the underlying transport without reflecting<br>the various differences in terms of BSSMAP ASSIGNMENT, MGCP handling,<br>etc.<br><br>Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13<br>Related: OS#2544<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M src/osmo-bsc/osmo_bsc_sigtran.c<br>M src/osmo-bsc/osmo_bsc_vty.c<br>4 files changed, 21 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/17/9317/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index bedf412..ce6512e 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -110,6 +110,9 @@</span><br><span> struct osmo_sccp_instance *sccp;</span><br><span> struct osmo_sccp_user *sccp_user;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* IPA or M3UA or SUA? */</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_protocol asp_proto;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Holds a copy of the our local MSC address,</span><br><span> * this will be the sccp-address that is associated</span><br><span> * with the A interface of this particular BSC,</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index e9309ea..612a00b 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -98,6 +98,7 @@</span><br><span> </span><br><span> msc_data->nr = nr;</span><br><span> msc_data->allow_emerg = 1;</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_data->a.asp_proto = OSMO_SS7_ASP_PROT_M3UA;</span><br><span> </span><br><span> /* Defaults for the audio setup */</span><br><span> msc_data->amr_conf.m5_90 = 1;</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>index 1a31a7c..6778201 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_sigtran.c</span><br><span>@@ -447,7 +447,7 @@</span><br><span> default_pc = osmo_ss7_pointcode_parse(NULL, BSC_DEFAULT_PC);</span><br><span> msc->a.sccp =</span><br><span> osmo_sccp_simple_client_on_ss7_id(msc, msc->a.cs7_instance, msc_name, default_pc,</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_SS7_ASP_PROT_M3UA, 0, NULL, 0, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->a.asp_proto, 0, NULL, 0, NULL);</span><br><span> if (!msc->a.sccp)</span><br><span> return -EINVAL;</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_vty.c b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index 36c3223..bda89c1 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -181,6 +181,7 @@</span><br><span> vty_out(vty, " msc-addr %s%s",</span><br><span> msc->a.msc_addr_name, VTY_NEWLINE);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " asp-protocol %s%s", osmo_ss7_asp_protocol_name(msc->a.asp_proto), VTY_NEWLINE);</span><br><span> </span><br><span> /* write MGW configuration */</span><br><span> mgcp_client_config_write(vty, " ");</span><br><span>@@ -672,6 +673,20 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_cs7_asp_proto,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_msc_cs7_asp_proto_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "asp-protocol (m3ua|sua|ipa)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "A interface protocol to use for this MSC)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "MTP3 User Adaptation\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "SCCP User Adaptation\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "IPA Multiplex (SCCP Lite)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msc_data *msc = bsc_msc_data(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ msc->a.asp_proto = get_string_value(osmo_ss7_asp_protocol_vals, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_net_bsc_mid_call_text,</span><br><span> cfg_net_bsc_mid_call_text_cmd,</span><br><span> "mid-call-text .TEXT",</span><br><span>@@ -951,6 +966,7 @@</span><br><span> install_element(MSC_NODE, &cfg_msc_no_acc_lst_name_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_bsc_addr_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_msc_addr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_cs7_asp_proto_cmd);</span><br><span> </span><br><span> /* Deprecated: ping time config, kept to support legacy config files. */</span><br><span> install_element(MSC_NODE, &cfg_net_msc_no_ping_time_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9317">change 9317</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/9317"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I0800c709e574cedd7f5dd98be81c78782245cd13 </div>
<div style="display:none"> Gerrit-Change-Number: 9317 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Harald Welte <laforge@gnumonks.org> </div>