<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15357">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">vty: Print MM state and RAN type in show mm-context<br><br>Value presviosuly printed as MM state is actually usually refereed as<br>GMM state, so rename it.<br><br>Change-Id: Ia06c53f0cd2a6348237ed3abeb9367d965745aba<br>---<br>M include/osmocom/sgsn/gprs_sgsn.h<br>M src/gprs/gprs_sgsn.c<br>M src/gprs/sgsn_vty.c<br>3 files changed, 17 insertions(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sgsn refs/changes/57/15357/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sgsn/gprs_sgsn.h b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>index 8f16c5b..8e8b762 100644</span><br><span>--- a/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>+++ b/include/osmocom/sgsn/gprs_sgsn.h</span><br><span>@@ -104,6 +104,7 @@</span><br><span>      MM_CTX_T_GERAN_Iu,</span><br><span> #endif</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string sgsn_ran_type_names[];</span><br><span> </span><br><span> struct service_info {</span><br><span>     uint8_t type;</span><br><span>diff --git a/src/gprs/gprs_sgsn.c b/src/gprs/gprs_sgsn.c</span><br><span>index 2334707..387c0d5 100644</span><br><span>--- a/src/gprs/gprs_sgsn.c</span><br><span>+++ b/src/gprs/gprs_sgsn.c</span><br><span>@@ -62,6 +62,15 @@</span><br><span> LLIST_HEAD(sgsn_apn_ctxts);</span><br><span> LLIST_HEAD(sgsn_pdp_ctxts);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string sgsn_ran_type_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+        { MM_CTX_T_GERAN_Gb, "GPRS/EDGE via Gb" },</span><br><span style="color: hsl(120, 100%, 40%);">+  { MM_CTX_T_UTRAN_Iu, "UMTS via Iu" },</span><br><span style="color: hsl(120, 100%, 40%);">+#if 0</span><br><span style="color: hsl(120, 100%, 40%);">+        { MM_CTX_T_GERAN_Iu, "GPRS/EDGE via Iu" },</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span style="color: hsl(120, 100%, 40%);">+  { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static const struct rate_ctr_desc mmctx_ctr_description[] = {</span><br><span>   { "sign:packets:in",  "Signalling Messages ( In)" },</span><br><span>     { "sign:packets:out", "Signalling Messages (Out)" },</span><br><span>diff --git a/src/gprs/sgsn_vty.c b/src/gprs/sgsn_vty.c</span><br><span>index 8637909..7798f17 100644</span><br><span>--- a/src/gprs/sgsn_vty.c</span><br><span>+++ b/src/gprs/sgsn_vty.c</span><br><span>@@ -526,17 +526,21 @@</span><br><span>                       struct sgsn_mm_ctx *mm, int pdp)</span><br><span> {</span><br><span>     uint32_t id;</span><br><span style="color: hsl(120, 100%, 40%);">+  const char *mm_state_name;</span><br><span> </span><br><span>       switch(mm->ran_type) {</span><br><span>    case MM_CTX_T_UTRAN_Iu:</span><br><span> #if BUILD_IU</span><br><span>              id = mm->iu.ue_ctx->conn_id;</span><br><span style="color: hsl(120, 100%, 40%);">+            mm_state_name = osmo_fsm_inst_state_name(mm->iu.mm_state_fsm);</span><br><span> #else</span><br><span>           id = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+               mm_state_name = NULL;</span><br><span> #endif</span><br><span>              break;</span><br><span>       case MM_CTX_T_GERAN_Gb:</span><br><span>              id = mm->gb.tlli;</span><br><span style="color: hsl(120, 100%, 40%);">+          mm_state_name = osmo_fsm_inst_state_name(mm->gb.mm_state_fsm);</span><br><span>            break;</span><br><span>       }</span><br><span> </span><br><span>@@ -544,9 +548,11 @@</span><br><span>                 pfx, mm->imsi, mm->imei, mm->p_tmsi, VTY_NEWLINE);</span><br><span>  vty_out(vty, "%s  MSISDN: %s, TLLI: %08x%s HLR: %s",</span><br><span>               pfx, mm->msisdn, id, mm->hlr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">-       vty_out(vty, "%s  MM State: %s, Routeing Area: %s, Cell ID: %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+  vty_out(vty, "%s  GMM State: %s, Routeing Area: %s, Cell ID: %u%s",</span><br><span>                pfx, get_value_string(gprs_mm_st_strs, mm->gmm_state),</span><br><span>            osmo_rai_name(&mm->ra), mm->gb.cell_id, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+       vty_out(vty, "%s  MM State: %s, RAN Type: %s%s", pfx, mm_state_name,</span><br><span style="color: hsl(120, 100%, 40%);">+                get_value_string(sgsn_ran_type_names, mm->ran_type), VTY_NEWLINE);</span><br><span> </span><br><span>    vty_out_rate_ctr_group(vty, "  ", mm->ctrg);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sgsn/+/15357">change 15357</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/+/15357"/><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: Ia06c53f0cd2a6348237ed3abeb9367d965745aba </div>
<div style="display:none"> Gerrit-Change-Number: 15357 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>