<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21882">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gbproxy: Add config option to name an SGSN<br><br>This is useful for logging and configuration to identify an SGSN by name<br><br>Change-Id: I2a3410dd9bebb242957e13a63ed70e447204203c<br>Related: SYS#5115, OS#4472<br>---<br>M doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg<br>M doc/examples/osmo-gbproxy/osmo-gbproxy.cfg<br>M include/osmocom/sgsn/gb_proxy.h<br>M src/gbproxy/gb_proxy.c<br>M src/gbproxy/gb_proxy_peer.c<br>M src/gbproxy/gb_proxy_vty.c<br>6 files changed, 66 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg</span><br><span>index a5e8967..bbc8a1b 100644</span><br><span>--- a/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg</span><br><span>+++ b/doc/examples/osmo-gbproxy/osmo-gbproxy-pool.cfg</span><br><span>@@ -9,6 +9,7 @@</span><br><span> nri bitlen 4</span><br><span> nri null add 0 4</span><br><span> sgsn nsei 101</span><br><span style="color: hsl(120, 100%, 40%);">+ name main</span><br><span> nri add 1</span><br><span> nri add 11</span><br><span> sgsn nsei 102</span><br><span>diff --git a/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg b/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg</span><br><span>index 0a2c16e..777d0b0 100644</span><br><span>--- a/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg</span><br><span>+++ b/doc/examples/osmo-gbproxy/osmo-gbproxy.cfg</span><br><span>@@ -7,6 +7,7 @@</span><br><span> !</span><br><span> gbproxy</span><br><span> sgsn nsei 101</span><br><span style="color: hsl(120, 100%, 40%);">+ name main</span><br><span> ns</span><br><span> bind udp local</span><br><span> listen 127.0.0.100 23000</span><br><span>diff --git a/include/osmocom/sgsn/gb_proxy.h b/include/osmocom/sgsn/gb_proxy.h</span><br><span>index 8654d10..dd45c2f 100644</span><br><span>--- a/include/osmocom/sgsn/gb_proxy.h</span><br><span>+++ b/include/osmocom/sgsn/gb_proxy.h</span><br><span>@@ -149,6 +149,9 @@</span><br><span> /* The NSE belonging to this SGSN */</span><br><span> struct gbproxy_nse *nse;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Name of the SGSN */</span><br><span style="color: hsl(120, 100%, 40%);">+ char *name;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Pool configuration for the sgsn (only valid if sgsn_facing == true) */</span><br><span> struct {</span><br><span> bool allow_attach;</span><br><span>@@ -176,7 +179,7 @@</span><br><span> LOGPCELL_CAT(CELL, DGPRS, LEVEL, FMT, ## ARGS)</span><br><span> </span><br><span> #define LOGPSGSN_CAT(SGSN, SUBSYS, LEVEL, FMT, ARGS...) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(SUBSYS, LEVEL, "NSE(%05u)-SGSN " FMT, (SGSN)->nse->nsei, ## ARGS)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(SUBSYS, LEVEL, "NSE(%05u)-SGSN(%s) " FMT, (SGSN)->nse->nsei, (SGSN)->name, ## ARGS)</span><br><span> #define LOGPSGSN(SGSN, LEVEL, FMT, ARGS...) \</span><br><span> LOGPSGSN_CAT(SGSN, DGPRS, LEVEL, FMT, ## ARGS)</span><br><span> </span><br><span>@@ -224,8 +227,9 @@</span><br><span> struct gbproxy_nse *gbproxy_nse_by_nsei_or_new(struct gbproxy_config *cfg, uint16_t nsei, bool sgsn_facing);</span><br><span> </span><br><span> /* SGSN handling */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gbproxy_sgsn *gbproxy_sgsn_alloc(struct gbproxy_config *cfg, uint16_t nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_sgsn *gbproxy_sgsn_alloc(struct gbproxy_config *cfg, uint16_t nsei, const char *name);</span><br><span> void gbproxy_sgsn_free(struct gbproxy_sgsn *sgsn);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_sgsn *gbproxy_sgsn_by_name(struct gbproxy_config *cfg, const char *name);</span><br><span> struct gbproxy_sgsn *gbproxy_sgsn_by_nsei(struct gbproxy_config *cfg, uint16_t nsei);</span><br><span> struct gbproxy_sgsn *gbproxy_sgsn_by_nsei_or_new(struct gbproxy_config *cfg, uint16_t nsei);</span><br><span> struct gbproxy_sgsn *gbproxy_sgsn_by_nri(struct gbproxy_config *cfg, uint16_t nri, bool *null_nri);</span><br><span>diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c</span><br><span>index d86c6ae..34cff31 100644</span><br><span>--- a/src/gbproxy/gb_proxy.c</span><br><span>+++ b/src/gbproxy/gb_proxy.c</span><br><span>@@ -302,7 +302,7 @@</span><br><span> }</span><br><span> </span><br><span> /* This shouldn't happen */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPCELL(cell, LOGL_ERROR, "Could not find matching BVC for SGSN, dropping message!\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPCELL(cell, LOGL_ERROR, "Could not find matching BVC for SGSN %s, dropping message!\n", sgsn->name);</span><br><span> return NULL;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c</span><br><span>index a966c6c..88b71be 100644</span><br><span>--- a/src/gbproxy/gb_proxy_peer.c</span><br><span>+++ b/src/gbproxy/gb_proxy_peer.c</span><br><span>@@ -350,9 +350,10 @@</span><br><span> /*! Allocate a new SGSN. This ensures the corresponding gbproxy_nse is allocated as well</span><br><span> * \param[in] cfg The gbproxy configuration</span><br><span> * \param[in] nsei The nsei where the SGSN can be reached</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] name A name to give the SGSN</span><br><span> * \return The SGSN, NULL if it couldn't be allocated</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gbproxy_sgsn *gbproxy_sgsn_alloc(struct gbproxy_config *cfg, uint16_t nsei)</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_sgsn *gbproxy_sgsn_alloc(struct gbproxy_config *cfg, uint16_t nsei, const char *name)</span><br><span> {</span><br><span> struct gbproxy_sgsn *sgsn;</span><br><span> OSMO_ASSERT(cfg);</span><br><span>@@ -364,16 +365,26 @@</span><br><span> sgsn->nse = gbproxy_nse_alloc(cfg, nsei, true);</span><br><span> if (!sgsn->nse) {</span><br><span> LOGPSGSN_CAT(sgsn, DOBJ, LOGL_INFO, "Could not allocate NSE(%05u) for SGSN\n", nsei);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(sgsn);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ goto free_sgsn;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (name)</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn->name = talloc_strdup(sgsn, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn->name = talloc_asprintf(sgsn, "NSE(%05u)", sgsn->nse->nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sgsn->name)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto free_sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> sgsn->pool.allow_attach = true;</span><br><span> sgsn->pool.nri_ranges = osmo_nri_ranges_alloc(sgsn);</span><br><span> </span><br><span> llist_add_tail(&sgsn->list, &cfg->sgsns);</span><br><span> LOGPSGSN_CAT(sgsn, DOBJ, LOGL_INFO, "SGSN Created\n");</span><br><span> return sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+free_sgsn:</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(sgsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span> }</span><br><span> </span><br><span> /* Only free gbproxy_sgsn, sgsn can't be NULL */</span><br><span>@@ -386,6 +397,7 @@</span><br><span> </span><br><span> LOGPSGSN_CAT(sgsn, DOBJ, LOGL_INFO, "SGSN Destroying\n");</span><br><span> llist_del(&sgsn->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ // talloc will free ->name and ->pool.nri_ranges</span><br><span> talloc_free(sgsn);</span><br><span> }</span><br><span> </span><br><span>@@ -408,6 +420,24 @@</span><br><span> * \param[in] nsei The nsei where the SGSN can be reached</span><br><span> * \return Returns the matching SGSN or NULL if it couldn't be found</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+struct gbproxy_sgsn *gbproxy_sgsn_by_name(struct gbproxy_config *cfg, const char *name)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_sgsn *sgsn;</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(cfg);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(sgsn, &cfg->sgsns, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(sgsn->name, name))</span><br><span style="color: hsl(120, 100%, 40%);">+ return sgsn;</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%);">+ return NULL;</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%);">+/*! Return the SGSN for a given NSEI</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] cfg The gbproxy configuration</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nsei The nsei where the SGSN can be reached</span><br><span style="color: hsl(120, 100%, 40%);">+ * \return Returns the matching SGSN or NULL if it couldn't be found</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span> struct gbproxy_sgsn *gbproxy_sgsn_by_nsei(struct gbproxy_config *cfg, uint16_t nsei)</span><br><span> {</span><br><span> struct gbproxy_sgsn *sgsn;</span><br><span>@@ -433,7 +463,7 @@</span><br><span> </span><br><span> sgsn = gbproxy_sgsn_by_nsei(cfg, nsei);</span><br><span> if (!sgsn)</span><br><span style="color: hsl(0, 100%, 40%);">- sgsn = gbproxy_sgsn_alloc(cfg, nsei);</span><br><span style="color: hsl(120, 100%, 40%);">+ sgsn = gbproxy_sgsn_alloc(cfg, nsei, NULL);</span><br><span> </span><br><span> return sgsn;</span><br><span> }</span><br><span>diff --git a/src/gbproxy/gb_proxy_vty.c b/src/gbproxy/gb_proxy_vty.c</span><br><span>index 92915fe..4d0fa3d 100644</span><br><span>--- a/src/gbproxy/gb_proxy_vty.c</span><br><span>+++ b/src/gbproxy/gb_proxy_vty.c</span><br><span>@@ -29,6 +29,7 @@</span><br><span> #include <osmocom/core/talloc.h></span><br><span> #include <osmocom/core/timer.h></span><br><span> #include <osmocom/core/rate_ctr.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/core/utils.h></span><br><span> </span><br><span> #include <osmocom/gprs/gprs_ns2.h></span><br><span> #include <osmocom/gprs/bssgp_bvc_fsm.h></span><br><span>@@ -188,6 +189,7 @@</span><br><span> static void write_sgsn(struct vty *vty, struct gbproxy_sgsn *sgsn)</span><br><span> {</span><br><span> vty_out(vty, "sgsn nsei %u%s", sgsn->nse->nsei, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " name %s%s", sgsn->name, VTY_NEWLINE);</span><br><span> vty_out(vty, " %sallow-attach%s", sgsn->pool.allow_attach ? "" : "no ", VTY_NEWLINE);</span><br><span> sgsn_write_nri(vty, sgsn, false);</span><br><span> }</span><br><span>@@ -256,6 +258,26 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_sgsn_name,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_sgsn_name_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "name NAME",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure the SGSN\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Name the SGSN\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "The name\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gbproxy_sgsn *sgsn = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *name = argv[0];</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%);">+ osmo_talloc_replace_string(sgsn, &sgsn->name, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!sgsn->name) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Unable to set name for SGSN with nsei %05u%s", sgsn->nse->nsei, 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%);">+ 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_ATTR(cfg_sgsn_nri_add, cfg_sgsn_nri_add_cmd,</span><br><span> "nri add <0-32767> [<0-32767>]",</span><br><span> NRI_STR "Add NRI value or range to the NRI mapping for this MSC\n"</span><br><span>@@ -647,6 +669,7 @@</span><br><span> </span><br><span> install_element(CONFIG_NODE, &cfg_sgsn_nsei_cmd);</span><br><span> install_node(&sgsn_node, config_write_sgsn);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(SGSN_NODE, &cfg_sgsn_name_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_sgsn_allow_attach_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_sgsn_no_allow_attach_cmd);</span><br><span> install_element(SGSN_NODE, &cfg_sgsn_nri_add_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/21882">change 21882</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/+/21882"/><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: I2a3410dd9bebb242957e13a63ed70e447204203c </div>
<div style="display:none"> Gerrit-Change-Number: 21882 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-CC: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>