<p>Stefan Sperling <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12243">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Vadim Yanitskiy: Looks good to me, but someone else must approve
Max: Looks good to me, but someone else must approve
Stefan Sperling: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">make gsup ipa name configurable in osmo-sgsn.cfg<br><br>Add a 'gsup ipa-name' VTY command which overrides the default<br>IPA name used by the SGSN on the GSUP link towards the HLR.<br>This is required for GSUP routing in multi-SGSN networks.<br><br>The 'gsup ipa-name' option can only be set via the config file<br>because changing the IPA name at run-time conflicts with active<br>GSUP connections and routes configured in the HLR. The osmo-sgsn<br>program must be restarted if its IPA name needs to change.<br><br>Related: OS#3356<br><br>Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f<br>---<br>M include/osmocom/sgsn/sgsn.h<br>M src/gprs/gprs_subscriber.c<br>M src/gprs/sgsn_vty.c<br>3 files changed, 36 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/sgsn.h b/include/osmocom/sgsn/sgsn.h</span><br><span>index 3a34ff9..c80355d 100644</span><br><span>--- a/include/osmocom/sgsn/sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/sgsn.h</span><br><span>@@ -124,6 +124,12 @@</span><br><span> enum ranap_nsap_addr_enc rab_assign_addr_enc;</span><br><span> } iu;</span><br><span> #endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This is transmitted as IPA Serial Number tag, which is used for GSUP routing (e.g. in OsmoHLR).</span><br><span style="color: hsl(120, 100%, 40%);">+ * This name must be set in a multi-SGSN network, and it must be unique to each SGSN.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If no name is set, the IPA Serial Number will be the same as the Unit Name,</span><br><span style="color: hsl(120, 100%, 40%);">+ * and will be of the form 'SGSN-00-00-00-00-00-00' */</span><br><span style="color: hsl(120, 100%, 40%);">+ char *sgsn_ipa_name;</span><br><span> };</span><br><span> </span><br><span> struct sgsn_instance {</span><br><span>diff --git a/src/gprs/gprs_subscriber.c b/src/gprs/gprs_subscriber.c</span><br><span>index 4ab45c2..484c7ef 100644</span><br><span>--- a/src/gprs/gprs_subscriber.c</span><br><span>+++ b/src/gprs/gprs_subscriber.c</span><br><span>@@ -23,6 +23,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_04_08_gprs.h></span><br><span> #include <osmocom/gsm/gsup.h></span><br><span> #include <osmocom/gsm/apn.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/gsm/ipa.h></span><br><span> #include <osmocom/core/utils.h></span><br><span> #include <osmocom/core/logging.h></span><br><span> #include <osmocom/sgsn/gprs_subscriber.h></span><br><span>@@ -63,15 +64,20 @@</span><br><span> int gprs_subscr_init(struct sgsn_instance *sgi)</span><br><span> {</span><br><span> const char *addr_str;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct ipaccess_unit *ipa_dev;</span><br><span> </span><br><span> if (!sgi->cfg.gsup_server_addr.sin_addr.s_addr)</span><br><span> return 0;</span><br><span> </span><br><span> addr_str = inet_ntoa(sgi->cfg.gsup_server_addr.sin_addr);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- sgi->gsup_client = osmo_gsup_client_create(</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_dev = talloc_zero(sgi, struct ipaccess_unit);</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_dev->unit_name = "SGSN";</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_dev->serno = sgi->cfg.sgsn_ipa_name; /* NULL unless configured via VTY */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ sgi->gsup_client = osmo_gsup_client_create2(</span><br><span> sgi,</span><br><span style="color: hsl(0, 100%, 40%);">- "SGSN",</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa_dev,</span><br><span> addr_str, sgi->cfg.gsup_server_port,</span><br><span> &gsup_read_cb,</span><br><span> &sgi->cfg.oap);</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 601b3c5..3757c07 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -203,6 +203,8 @@</span><br><span> vty_out(vty, " encryption %s%s",</span><br><span> get_value_string(gprs_cipher_names, g_cfg->cipher),</span><br><span> VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (g_cfg->sgsn_ipa_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " gsup ipa-name %s%s", g_cfg->sgsn_ipa_name, VTY_NEWLINE);</span><br><span> if (g_cfg->gsup_server_addr.sin_addr.s_addr)</span><br><span> vty_out(vty, " gsup remote-ip %s%s",</span><br><span> inet_ntoa(g_cfg->gsup_server_addr.sin_addr), VTY_NEWLINE);</span><br><span>@@ -1075,6 +1077,25 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_gsup_ipa_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_gsup_ipa_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "gsup ipa-name NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "GSUP Parameters\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set the IPA name of this SGSN\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "A unique name for this SGSN. For example: PLMN + redundancy server number: SGSN-901-70-0. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "This name is used for GSUP routing and must be set if more than one SGSN is connected to the network. "</span><br><span style="color: hsl(120, 100%, 40%);">+ "The default is 'SGSN-00-00-00-00-00-00'.\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "The IPA name cannot be changed at run-time; "</span><br><span style="color: hsl(120, 100%, 40%);">+ "It can only be set in the configuraton file.%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ g_cfg->sgsn_ipa_name = talloc_strdup(tall_vty_ctx, 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_gsup_remote_ip, cfg_gsup_remote_ip_cmd,</span><br><span> "gsup remote-ip A.B.C.D",</span><br><span> "GSUP Parameters\n"</span><br><span>@@ -1365,6 +1386,7 @@</span><br><span> install_element(SGSN_NODE, &cfg_imsi_acl_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_auth_policy_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_encrypt_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(SGSN_NODE, &cfg_gsup_ipa_name_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_gsup_remote_ip_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_gsup_remote_port_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_gsup_oap_id_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12243">change 12243</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/12243"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ib2f65fed9f56b9718e8a9647e3f01dce69870c1f </div>
<div style="display:none"> Gerrit-Change-Number: 12243 </div>
<div style="display:none"> Gerrit-PatchSet: 7 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-CC: osmith <osmith@sysmocom.de> </div>