<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12403">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Vadim Yanitskiy: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">tweak fsm_msc_mgcp FSM and FI name<br><br>Instead of<br><br> MGW(MGW_99)<br><br>use a name of<br><br> msc-mgcp(MSISDN:2331_GERAN_A:00000017_trans99)<br><br>1. The FSM is communication towards an MGW, not the MGW itself. When reading<br>combined logging (gsmtap_log), it is confusing to read 'MGW' in a log coming<br>from the MSC. The API is also called msc_mgcp_*.<br><br>2. Calling the FSM instance 'MGW_' again doesn't make sense.<br><br>3. Indicate 'trans' before the trans_id (trans_id was already shown, but not<br>indicated what it was).<br><br>4. Also indicate the actual subscriber's identification.<br><br>5. Also indicate the RAN connection and conn_id.<br><br>This comes up while trying to understand a call coming in on an already<br>established call: parsing the log with a human brain is near torture without<br>this info, taking extremely long to get grips on.<br><br>Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473<br>---<br>M src/libmsc/msc_mgcp.c<br>1 file changed, 4 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/msc_mgcp.c b/src/libmsc/msc_mgcp.c</span><br><span>index 08a1db0..5c88880 100644</span><br><span>--- a/src/libmsc/msc_mgcp.c</span><br><span>+++ b/src/libmsc/msc_mgcp.c</span><br><span>@@ -941,7 +941,7 @@</span><br><span> </span><br><span> /* State machine definition */</span><br><span> static struct osmo_fsm fsm_msc_mgcp = {</span><br><span style="color: hsl(0, 100%, 40%);">- .name = "MGW",</span><br><span style="color: hsl(120, 100%, 40%);">+ .name = "msc-mgcp",</span><br><span> .states = fsm_msc_mgcp_states,</span><br><span> .num_states = ARRAY_SIZE(fsm_msc_mgcp_states),</span><br><span> .log_subsys = DMGCP,</span><br><span>@@ -977,7 +977,6 @@</span><br><span> int msc_mgcp_call_assignment(struct gsm_trans *trans)</span><br><span> {</span><br><span> struct mgcp_ctx *mgcp_ctx;</span><br><span style="color: hsl(0, 100%, 40%);">- char name[32];</span><br><span> static bool fsm_registered = false;</span><br><span> struct ran_conn *conn;</span><br><span> struct mgcp_client *mgcp;</span><br><span>@@ -1007,9 +1006,6 @@</span><br><span> conn->iu.rab_id = next_iu_rab_id++;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (snprintf(name, sizeof(name), "MGW_%i", trans->transaction_id) >= sizeof(name))</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Register the fsm description (if not already done) */</span><br><span> if (fsm_registered == false) {</span><br><span> osmo_fsm_register(&fsm_msc_mgcp);</span><br><span>@@ -1027,8 +1023,10 @@</span><br><span> vlr_subscr_name(trans->vsub), osmo_quote_str(mgcp_client_rtpbridge_wildcard(mgcp), -1));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, name);</span><br><span style="color: hsl(120, 100%, 40%);">+ mgcp_ctx->fsm = osmo_fsm_inst_alloc(&fsm_msc_mgcp, NULL, NULL, LOGL_DEBUG, NULL);</span><br><span> OSMO_ASSERT(mgcp_ctx->fsm);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_fsm_inst_update_id_f(mgcp_ctx->fsm, "%s_%s_trans%d",</span><br><span style="color: hsl(120, 100%, 40%);">+ vlr_subscr_name(trans->vsub), ran_conn_get_conn_id(conn), trans->transaction_id);</span><br><span> mgcp_ctx->fsm->priv = mgcp_ctx;</span><br><span> mgcp_ctx->mgcp = mgcp;</span><br><span> mgcp_ctx->trans = trans;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12403">change 12403</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/12403"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ie5fc1ffb7eba0209fee4666a075655cd24d27473 </div>
<div style="display:none"> Gerrit-Change-Number: 12403 </div>
<div style="display:none"> Gerrit-PatchSet: 12 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>