<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/22201">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins Builder: Verified
  pespin: Looks good to me, but someone else must approve
  laforge: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">mncc: remove callref argument from mncc_write()<br><br>The callref is always included in the struct mncc argument.<br><br>Change-Id: Ia156010194c1f4334a4966d01aadfd02fa7097a8<br>---<br>M src/mncc.c<br>1 file changed, 6 insertions(+), 6 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mncc.c b/src/mncc.c</span><br><span>index 0725d4c..5456ac6 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -130,7 +130,7 @@</span><br><span>       }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void mncc_write(struct mncc_connection *conn, struct gsm_mncc *mncc, uint32_t callref)</span><br><span style="color: hsl(120, 100%, 40%);">+static void mncc_write(struct mncc_connection *conn, struct gsm_mncc *mncc)</span><br><span> {</span><br><span>    int rc;</span><br><span> </span><br><span>@@ -141,7 +141,7 @@</span><br><span>    rc = write(conn->fd.fd, mncc, sizeof(*mncc));</span><br><span>     LOGP(DMNCC, LOGL_DEBUG, "MNCC sent message type: %s\n", osmo_mncc_name(mncc->msg_type));</span><br><span>        if (rc != sizeof(*mncc)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", callref);</span><br><span style="color: hsl(120, 100%, 40%);">+          LOGP(DMNCC, LOGL_ERROR, "Failed to send message for call(%u)\n", mncc->callref);</span><br><span>                close_connection(conn);</span><br><span>      }</span><br><span> }</span><br><span>@@ -151,7 +151,7 @@</span><br><span>         struct gsm_mncc mncc = { 0, };</span><br><span> </span><br><span>   mncc_fill_header(&mncc, msg_type, callref);</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_write(conn, &mncc, callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_write(conn, &mncc);</span><br><span> }</span><br><span> </span><br><span> static void mncc_rtp_send(struct mncc_connection *conn, uint32_t msg_type, uint32_t callref)</span><br><span>@@ -264,7 +264,7 @@</span><br><span>  out_mncc.progress.location = GSM48_CAUSE_LOC_PRN_S_LU; /* Private network serving the local user */</span><br><span>  out_mncc.progress.descr = GSM48_PROGR_IN_BAND_AVAIL; /* In-band information or appropriate pattern now available */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- mncc_write(leg->conn, &out_mncc, leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+     mncc_write(leg->conn, &out_mncc);</span><br><span> </span><br><span>         /*</span><br><span>    * If we have remote IP/port let's connect it already.</span><br><span>@@ -807,7 +807,7 @@</span><br><span>     mncc_fill_header(&out_mncc, MNCC_START_DTMF_RSP, leg->callref);</span><br><span>       out_mncc.fields |= MNCC_F_KEYPAD;</span><br><span>    out_mncc.keypad = data->keypad;</span><br><span style="color: hsl(0, 100%, 40%);">-      mncc_write(conn, &out_mncc, leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+     mncc_write(conn, &out_mncc);</span><br><span> }</span><br><span> </span><br><span> static void check_dtmf_stop(struct mncc_connection *conn, const char *buf, int rc)</span><br><span>@@ -825,7 +825,7 @@</span><br><span>        mncc_fill_header(&out_mncc, MNCC_STOP_DTMF_RSP, leg->callref);</span><br><span>        out_mncc.fields |= MNCC_F_KEYPAD;</span><br><span>    out_mncc.keypad = data->keypad;</span><br><span style="color: hsl(0, 100%, 40%);">-      mncc_write(conn, &out_mncc, leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+     mncc_write(conn, &out_mncc);</span><br><span> }</span><br><span> </span><br><span> static void check_hello(struct mncc_connection *conn, const char *buf, int rc)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/22201">change 22201</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-sip-connector/+/22201"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-sip-connector </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ia156010194c1f4334a4966d01aadfd02fa7097a8 </div>
<div style="display:none"> Gerrit-Change-Number: 22201 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>