<p>Neels Hofmeyr <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13593">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_04_08_cc: improve logging for CC trans<br><br>Pass trans around more functions as log context.<br>Add missing "rx" logging for two cases.<br><br>Change-Id: If79f724a2faca70023271398c618cfe490fb294e<br>---<br>M src/libmsc/gsm_04_08_cc.c<br>1 file changed, 12 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/gsm_04_08_cc.c b/src/libmsc/gsm_04_08_cc.c</span><br><span>index 4475d05..62b5d12 100644</span><br><span>--- a/src/libmsc/gsm_04_08_cc.c</span><br><span>+++ b/src/libmsc/gsm_04_08_cc.c</span><br><span>@@ -1601,7 +1601,7 @@</span><br><span> return mncc_recvmsg(trans->net, trans, MNCC_USERINFO_IND, &user);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mncc_recv_rtp(struct gsm_network *net, uint32_t callref,</span><br><span style="color: hsl(120, 100%, 40%);">+static void mncc_recv_rtp(struct gsm_network *net, struct gsm_trans *trans, uint32_t callref,</span><br><span> int cmd, uint32_t addr, uint16_t port, uint32_t payload_type,</span><br><span> uint32_t payload_msg_type)</span><br><span> {</span><br><span>@@ -1617,7 +1617,7 @@</span><br><span> rtp->port = port;</span><br><span> rtp->payload_type = payload_type;</span><br><span> rtp->payload_msg_type = payload_msg_type;</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_recvmsg(net, NULL, cmd, (struct gsm_mncc *)data);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_recvmsg(net, trans, cmd, (struct gsm_mncc *)data);</span><br><span> }</span><br><span> </span><br><span> static void mncc_recv_rtp_sock(struct gsm_network *net, struct gsm_trans *trans, int cmd)</span><br><span>@@ -1652,16 +1652,16 @@</span><br><span> * lchan->abis_ip.rtp_payload */</span><br><span> uint32_t payload_type = 0;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- return mncc_recv_rtp(net, trans->callref, cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ return mncc_recv_rtp(net, trans, trans->callref, cmd,</span><br><span> addr,</span><br><span> port,</span><br><span> payload_type,</span><br><span> msg_type);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mncc_recv_rtp_err(struct gsm_network *net, uint32_t callref, int cmd)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mncc_recv_rtp_err(struct gsm_network *net, struct gsm_trans *trans, uint32_t callref, int cmd)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return mncc_recv_rtp(net, callref, cmd, 0, 0, 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ return mncc_recv_rtp(net, trans, callref, cmd, 0, 0, 0, 0);</span><br><span> }</span><br><span> </span><br><span> static int tch_rtp_create(struct gsm_network *net, uint32_t callref)</span><br><span>@@ -1672,15 +1672,16 @@</span><br><span> trans = trans_find_by_callref(net, callref);</span><br><span> if (!trans) {</span><br><span> LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "RTP create for non-existing trans\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_recv_rtp_err(net, callref, MNCC_RTP_CREATE);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_recv_rtp_err(net, trans, callref, MNCC_RTP_CREATE);</span><br><span> return -EIO;</span><br><span> }</span><br><span> log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub);</span><br><span> if (!trans->conn) {</span><br><span> LOG_TRANS_CAT(trans, DMNCC, LOGL_NOTICE, "RTP create for trans without conn\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_recv_rtp_err(net, callref, MNCC_RTP_CREATE);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_recv_rtp_err(net, trans, callref, MNCC_RTP_CREATE);</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s\n", get_mncc_name(MNCC_RTP_CREATE));</span><br><span> </span><br><span> /* When we call msc_mgcp_call_assignment() we will trigger, depending</span><br><span> * on the RAN type the call assignment on the A or Iu interface.</span><br><span>@@ -1733,16 +1734,18 @@</span><br><span> trans = trans_find_by_callref(net, rtp->callref);</span><br><span> if (!trans) {</span><br><span> LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "RTP connect for non-existing trans\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_recv_rtp_err(net, rtp->callref, MNCC_RTP_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_recv_rtp_err(net, trans, rtp->callref, MNCC_RTP_CONNECT);</span><br><span> return -EIO;</span><br><span> }</span><br><span> log_set_context(LOG_CTX_VLR_SUBSCR, trans->vsub);</span><br><span> if (!trans->conn) {</span><br><span> LOG_TRANS_CAT(trans, DMNCC, LOGL_ERROR, "RTP connect for trans without conn\n");</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_recv_rtp_err(net, rtp->callref, MNCC_RTP_CONNECT);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_recv_rtp_err(net, trans, rtp->callref, MNCC_RTP_CONNECT);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_TRANS_CAT(trans, DMNCC, LOGL_DEBUG, "rx %s\n", get_mncc_name(MNCC_RTP_CONNECT));</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> addr.s_addr = osmo_htonl(rtp->ip);</span><br><span> return msc_mgcp_call_complete(trans, rtp->port, inet_ntoa(addr));</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13593">change 13593</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/13593"/><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: If79f724a2faca70023271398c618cfe490fb294e </div>
<div style="display:none"> Gerrit-Change-Number: 13593 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </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: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>