<p>pespin <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15239">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
laforge: Looks good to me, but someone else must approve
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Introduce cs7-instance-iu<br><br>Similar to what we already have in osmo-msc.<br><br>Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904<br>---<br>M doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg<br>M doc/manuals/vty/sgsn_vty_reference.xml<br>M include/osmocom/sgsn/sgsn.h<br>M src/gprs/sgsn_main.c<br>M src/gprs/sgsn_vty.c<br>5 files changed, 25 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg</span><br><span>index a18d76a..f60c076 100644</span><br><span>--- a/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg</span><br><span>+++ b/doc/examples/osmo-sgsn/osmo-sgsn_custom-sccp.cfg</span><br><span>@@ -21,6 +21,7 @@</span><br><span> auth-policy remote</span><br><span> gsup remote-ip 127.0.0.1</span><br><span> gsup remote-port 4222</span><br><span style="color: hsl(120, 100%, 40%);">+ cs7-instance-iu 0</span><br><span> !</span><br><span> ns</span><br><span> timer tns-block 3</span><br><span>diff --git a/doc/manuals/vty/sgsn_vty_reference.xml b/doc/manuals/vty/sgsn_vty_reference.xml</span><br><span>index c3f91cf..38e21c2 100644</span><br><span>--- a/doc/manuals/vty/sgsn_vty_reference.xml</span><br><span>+++ b/doc/manuals/vty/sgsn_vty_reference.xml</span><br><span>@@ -2502,6 +2502,12 @@</span><br><span> <param name='passive' doc='Compression is available on request' /></span><br><span> </params></span><br><span> </command></span><br><span style="color: hsl(120, 100%, 40%);">+ <command id='cs7-instance-iu <0-15>'></span><br><span style="color: hsl(120, 100%, 40%);">+ <params></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='cs7-instance-iu' doc='Set SS7 to be used by the Iu-Interface.' /></span><br><span style="color: hsl(120, 100%, 40%);">+ <param name='<0-15>' doc='SS7 instance reference number (default: 0)' /></span><br><span style="color: hsl(120, 100%, 40%);">+ </params></span><br><span style="color: hsl(120, 100%, 40%);">+ </command></span><br><span> <command id='iu rab-assign-addr-enc (x213|v4raw)'></span><br><span> <params></span><br><span> <param name='iu' doc='Iu interface protocol options' /></span><br><span>diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h</span><br><span>index 6e4f5ca..78803c7 100644</span><br><span>--- a/include/osmocom/sgsn/sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/sgsn.h</span><br><span>@@ -112,6 +112,7 @@</span><br><span> #if BUILD_IU</span><br><span> struct {</span><br><span> enum ranap_nsap_addr_enc rab_assign_addr_enc;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t cs7_instance;</span><br><span> } iu;</span><br><span> #endif</span><br><span> </span><br><span>diff --git a/src/gprs/sgsn_main.c b/src/gprs/sgsn_main.c</span><br><span>index 5979886..4232e23 100644</span><br><span>--- a/src/gprs/sgsn_main.c</span><br><span>+++ b/src/gprs/sgsn_main.c</span><br><span>@@ -500,7 +500,9 @@</span><br><span> </span><br><span> #if BUILD_IU</span><br><span> /* Note that these are mostly defaults and can be overriden from the VTY */</span><br><span style="color: hsl(0, 100%, 40%);">- sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx, 0, "OsmoSGSN",</span><br><span style="color: hsl(120, 100%, 40%);">+ sccp = osmo_sccp_simple_client_on_ss7_id(tall_sgsn_ctx,</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn->cfg.iu.cs7_instance,</span><br><span style="color: hsl(120, 100%, 40%);">+ "OsmoSGSN",</span><br><span> (23 << 3) + 4,</span><br><span> OSMO_SS7_ASP_PROT_M3UA,</span><br><span> 0, NULL,</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 6698691..68d3a77 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -289,6 +289,8 @@</span><br><span> vty_out(vty, " no compression v42bis%s", VTY_NEWLINE);</span><br><span> </span><br><span> #ifdef BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " cs7-instance-iu %u%s", g_cfg->iu.cs7_instance,</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> ranap_iu_vty_config_write(vty, " ");</span><br><span> #endif</span><br><span> </span><br><span>@@ -1378,6 +1380,17 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#if BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_sgsn_cs7_instance_iu,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_sgsn_cs7_instance_iu_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "cs7-instance-iu <0-15>",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set SS7 to be used by the Iu-Interface.\n" "SS7 instance reference number (default: 0)\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->iu.cs7_instance = atoi(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%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int sgsn_vty_init(struct sgsn_config *cfg)</span><br><span> {</span><br><span> g_cfg = cfg;</span><br><span>@@ -1441,6 +1454,7 @@</span><br><span> install_element(SGSN_NODE, &cfg_comp_v42bisp_cmd);</span><br><span> </span><br><span> #ifdef BUILD_IU</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(SGSN_NODE, &cfg_sgsn_cs7_instance_iu_cmd);</span><br><span> ranap_iu_vty_init(SGSN_NODE, &g_cfg->iu.rab_assign_addr_enc);</span><br><span> #endif</span><br><span> return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15239">change 15239</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/c/osmo-sgsn/+/15239"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-sgsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Iaa9e1d06dd0430848ef4f7498a3c15d13f899904 </div>
<div style="display:none"> Gerrit-Change-Number: 15239 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>