<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12329">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Stefan Sperling: Looks good to me, but someone else must approve
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">MNCC: use log wrapper for call processing<br><br>Add log/debug wrappers to conveniently print local and remote call<br>references.<br><br>Change-Id: I5c44d7bb28f1ff895dd4f839d75840495503c916<br>---<br>M src/libmsc/mncc_builtin.c<br>1 file changed, 12 insertions(+), 13 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/libmsc/mncc_builtin.c b/src/libmsc/mncc_builtin.c</span><br><span>index 135a5e4..fbdc5b4 100644</span><br><span>--- a/src/libmsc/mncc_builtin.c</span><br><span>+++ b/src/libmsc/mncc_builtin.c</span><br><span>@@ -35,6 +35,8 @@</span><br><span> #include <osmocom/msc/gsm_data.h></span><br><span> #include <osmocom/msc/transaction.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#define DEBUGCC(l, r, fmt, args...) DEBUGP(DMNCC, "(call %x, remote %x) " fmt, l->callref, r->callref, ##args)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void *tall_call_ctx;</span><br><span> </span><br><span> static LLIST_HEAD(call_list);</span><br><span>@@ -105,8 +107,7 @@</span><br><span> llist_add_tail(&remote->entry, &call_list);</span><br><span> remote->net = call->net;</span><br><span> remote->callref = new_callref++;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Creating new remote instance %x.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- call->callref, remote->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Creating new remote instance.\n");</span><br><span> </span><br><span> /* link remote call */</span><br><span> call->remote_ref = remote->callref;</span><br><span>@@ -115,20 +116,20 @@</span><br><span> /* send call proceeding */</span><br><span> memset(&mncc, 0, sizeof(struct gsm_mncc));</span><br><span> mncc.callref = call->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Accepting call.\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Accepting call.\n");</span><br><span> mncc_tx_to_cc(call->net, MNCC_CALL_PROC_REQ, &mncc);</span><br><span> </span><br><span> /* modify mode */</span><br><span> memset(&mncc, 0, sizeof(struct gsm_mncc));</span><br><span> mncc.callref = call->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Modify channel mode\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Modify channel mode.\n");</span><br><span> mncc_tx_to_cc(call->net, MNCC_LCHAN_MODIFY, &mncc);</span><br><span> </span><br><span> /* send setup to remote */</span><br><span> // setup->fields |= MNCC_F_SIGNAL;</span><br><span> // setup->signal = GSM48_SIGNAL_DIALTONE;</span><br><span> setup->callref = remote->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Forwarding SETUP to remote.\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Forwarding SETUP to remote.\n");</span><br><span> return mncc_tx_to_cc(remote->net, MNCC_SETUP_REQ, setup);</span><br><span> </span><br><span> out_reject:</span><br><span>@@ -146,7 +147,7 @@</span><br><span> if (!(remote = get_call_ref(call->remote_ref)))</span><br><span> return 0;</span><br><span> alert->callref = remote->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Forwarding ALERT to remote.\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Forwarding ALERT to remote.\n");</span><br><span> return mncc_tx_to_cc(remote->net, MNCC_ALERT_REQ, alert);</span><br><span> }</span><br><span> </span><br><span>@@ -159,7 +160,7 @@</span><br><span> if (!(remote = get_call_ref(call->remote_ref)))</span><br><span> return 0;</span><br><span> notify->callref = remote->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Forwarding NOTIF to remote.\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Forwarding NOTIF to remote.\n");</span><br><span> return mncc_tx_to_cc(remote->net, MNCC_NOTIFY_REQ, notify);</span><br><span> }</span><br><span> </span><br><span>@@ -180,13 +181,13 @@</span><br><span> if (!(remote = get_call_ref(call->remote_ref)))</span><br><span> return 0;</span><br><span> connect->callref = remote->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Sending CONNECT to remote.\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Sending CONNECT to remote.\n");</span><br><span> mncc_tx_to_cc(remote->net, MNCC_SETUP_RSP, connect);</span><br><span> </span><br><span> /* bridge tch */</span><br><span> bridge.callref[0] = call->callref;</span><br><span> bridge.callref[1] = call->remote_ref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Bridging with remote.\n", call->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Bridging with remote.\n");</span><br><span> </span><br><span> return mncc_tx_to_cc(call->net, MNCC_BRIDGE, &bridge);</span><br><span> }</span><br><span>@@ -206,8 +207,7 @@</span><br><span> return 0;</span><br><span> }</span><br><span> disc->callref = remote->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Disconnecting remote with cause %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- remote->callref, disc->cause.value);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Disconnecting remote with cause %d\n", disc->cause.value);</span><br><span> return mncc_tx_to_cc(remote->net, MNCC_DISC_REQ, disc);</span><br><span> }</span><br><span> </span><br><span>@@ -222,8 +222,7 @@</span><br><span> }</span><br><span> </span><br><span> rel->callref = remote->callref;</span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DMNCC, "(call %x) Releasing remote with cause %d\n",</span><br><span style="color: hsl(0, 100%, 40%);">- call->callref, rel->cause.value);</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGCC(call, remote, "Releasing remote with cause %d\n", rel->cause.value);</span><br><span> </span><br><span> /*</span><br><span> * Release this side of the call right now. Otherwise we end up</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12329">change 12329</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/12329"/><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: I5c44d7bb28f1ff895dd4f839d75840495503c916 </div>
<div style="display:none"> Gerrit-Change-Number: 12329 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Max <msuraev@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: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>