<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-iuh/+/21899">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hnbgw: Introduce LOGHNB() macro for log context information<br><br>So far we don't really have any way of matching a given log message<br>to a specific hNB. Let's introduce a new log macro, together with<br>a configuration directive to select whether the hNB-ID or the<br>UMTS CellID shall be used.<br><br>Change-Id: I6113925216c6f88add2c6d27bdf47ccbb017f293<br>---<br>M include/osmocom/iuh/hnbgw.h<br>M src/hnbgw.c<br>M src/hnbgw_vty.c<br>3 files changed, 42 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/iuh/hnbgw.h b/include/osmocom/iuh/hnbgw.h</span><br><span>index 4848c2f..fc8298d 100644</span><br><span>--- a/include/osmocom/iuh/hnbgw.h</span><br><span>+++ b/include/osmocom/iuh/hnbgw.h</span><br><span>@@ -18,6 +18,9 @@</span><br><span> DRANAP,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define LOGHNB(x, ss, lvl, fmt, args ...) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(ss, lvl, "%s " fmt, hnb_context_name(x), ## args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> enum hnb_ctrl_node {</span><br><span> CTRL_NODE_HNB = _LAST_CTRL_NODE,</span><br><span> _LAST_CTRL_NODE_HNB</span><br><span>@@ -128,6 +131,8 @@</span><br><span> const char *iups_remote_addr_name;</span><br><span> uint16_t rnc_id;</span><br><span> bool hnbap_allow_tmsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ /*! print hnb-id (true) or MCC-MNC-LAC-RAC-SAC (false) in logs */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool log_prefix_hnb_id;</span><br><span> } config;</span><br><span> /*! SCTP listen socket for incoming connections */</span><br><span> struct osmo_stream_srv_link *iuh;</span><br><span>@@ -152,6 +157,7 @@</span><br><span> </span><br><span> struct hnb_context *hnb_context_by_id(struct hnb_gw *gw, uint32_t cid);</span><br><span> struct hnb_context *hnb_context_by_identity_info(struct hnb_gw *gw, const char *identity_info);</span><br><span style="color: hsl(120, 100%, 40%);">+const char *hnb_context_name(struct hnb_context *ctx);</span><br><span> unsigned hnb_contexts(const struct hnb_gw *gw);</span><br><span> </span><br><span> struct ue_context *ue_context_by_id(struct hnb_gw *gw, uint32_t id);</span><br><span>diff --git a/src/hnbgw.c b/src/hnbgw.c</span><br><span>index dd157d7..ba8a06f 100644</span><br><span>--- a/src/hnbgw.c</span><br><span>+++ b/src/hnbgw.c</span><br><span>@@ -83,6 +83,7 @@</span><br><span> /* strdup so we can easily talloc_free in the VTY code */</span><br><span> gw->config.iuh_local_ip = talloc_strdup(gw, HNBGW_LOCAL_IP_DEFAULT);</span><br><span> gw->config.iuh_local_port = IUH_DEFAULT_SCTP_PORT;</span><br><span style="color: hsl(120, 100%, 40%);">+ gw->config.log_prefix_hnb_id = true;</span><br><span> </span><br><span> gw->next_ue_ctx_id = 23;</span><br><span> INIT_LLIST_HEAD(&gw->hnb_list);</span><br><span>@@ -296,6 +297,25 @@</span><br><span> return ctx;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const char *umts_cell_id_name(const struct umts_cell_id *ucid)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static __thread char buf[40];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ snprintf(buf, sizeof(buf), "%u-%u-L%u-R%u-S%u", ucid->mcc, ucid->mnc, ucid->lac, ucid->rac, ucid->sac);</span><br><span style="color: hsl(120, 100%, 40%);">+ return buf;</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%);">+const char *hnb_context_name(struct hnb_context *ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!ctx)</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%);">+ if (ctx->gw->config.log_prefix_hnb_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ return ctx->identity_info;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ return umts_cell_id_name(&ctx->id);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void hnb_context_release(struct hnb_context *ctx)</span><br><span> {</span><br><span> struct hnbgw_context_map *map, *map2;</span><br><span>diff --git a/src/hnbgw_vty.c b/src/hnbgw_vty.c</span><br><span>index f2e51d4..a826246 100644</span><br><span>--- a/src/hnbgw_vty.c</span><br><span>+++ b/src/hnbgw_vty.c</span><br><span>@@ -296,6 +296,19 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_hnbgw_log_prefix, cfg_hnbgw_log_prefix_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "log-prefix (hnb-id|umts-cell-id)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure the log message prefix\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Use the hNB-ID as log message prefix\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Use the UMTS Cell ID as log message prefix\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[0], "hnb-id"))</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hnb_gw->config.log_prefix_hnb_id = true;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ g_hnb_gw->config.log_prefix_hnb_id = false;</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_hnbgw_iucs_remote_addr,</span><br><span> cfg_hnbgw_iucs_remote_addr_cmd,</span><br><span> "remote-addr NAME",</span><br><span>@@ -319,6 +332,8 @@</span><br><span> static int config_write_hnbgw(struct vty *vty)</span><br><span> {</span><br><span> vty_out(vty, "hnbgw%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " log-prefix %s%s", g_hnb_gw->config.log_prefix_hnb_id ? "hnb-id" : "umts-cell-id",</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span>@@ -376,6 +391,7 @@</span><br><span> install_node(&hnbgw_node, config_write_hnbgw);</span><br><span> </span><br><span> install_element(HNBGW_NODE, &cfg_hnbgw_rnc_id_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(HNBGW_NODE, &cfg_hnbgw_log_prefix_cmd);</span><br><span> </span><br><span> install_element(HNBGW_NODE, &cfg_hnbgw_iuh_cmd);</span><br><span> install_node(&iuh_node, config_write_hnbgw_iuh);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-iuh/+/21899">change 21899</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-iuh/+/21899"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-iuh </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I6113925216c6f88add2c6d27bdf47ccbb017f293 </div>
<div style="display:none"> Gerrit-Change-Number: 21899 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>