<p>keith <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
keith: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Add support for MNCC HOLD/RETRIEVE<br><br>Handle MO hold and retrieve and pass this to the SIP side.<br><br>Handle the 200 from the SIP side in response to our HOLD-ing re-INVITE.<br><br>With this commit we now handle MO hold and therefore also handle<br>call-waiting and swapping.<br><br>Change-Id: Ife7bdab20cde92b7ce550215bab28b36a0f302e9<br>---<br>M src/mncc.c<br>M src/sip.c<br>2 files changed, 55 insertions(+), 7 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 6ee7670..81fe30f 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -188,6 +188,8 @@</span><br><span> * FIXME: mncc.payload_msg_type should already be compatible.. but</span><br><span> * payload_type should be different..</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr net = { .s_addr = other->ip };</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_DEBUG, "SEND rtp_connect: IP=(%s) PORT=(%u)\n", inet_ntoa(net), mncc.port);</span><br><span> rc = write(leg->conn->fd.fd, &mncc, sizeof(mncc));</span><br><span> if (rc != sizeof(mncc)) {</span><br><span> LOGP(DMNCC, LOGL_ERROR, "Failed to send message leg(%u)\n",</span><br><span>@@ -687,14 +689,40 @@</span><br><span> {</span><br><span> const struct gsm_mncc *data;</span><br><span> struct mncc_call_leg *leg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct call_leg *other_leg;</span><br><span> </span><br><span> leg = find_leg(conn, buf, rc, &data);</span><br><span> if (!leg)</span><br><span> return;</span><br><span> </span><br><span> LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(0, 100%, 40%);">- "leg(%u) is req hold. rejecting.\n", leg->callref);</span><br><span style="color: hsl(0, 100%, 40%);">- mncc_send(leg->conn, MNCC_HOLD_REJ, leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ "leg(%u) is req hold.\n", leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ other_leg = call_leg_other(&leg->base);</span><br><span style="color: hsl(120, 100%, 40%);">+ other_leg->hold_call(other_leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_send(leg->conn, MNCC_HOLD_CNF, leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->state = MNCC_CC_HOLD;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static void check_retrieve_ind(struct mncc_connection *conn, const char *buf, int rc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm_mncc *data;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct mncc_call_leg *leg;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct call_leg *other_leg;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ leg = find_leg(conn, buf, rc, &data);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!leg)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMNCC, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ "leg(%u) is req unhold.\n", leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ other_leg = call_leg_other(&leg->base);</span><br><span style="color: hsl(120, 100%, 40%);">+ other_leg->retrieve_call(other_leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ mncc_send(leg->conn, MNCC_RETRIEVE_CNF, leg->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* In case of call waiting/swap, At this point we need to tell the MSC to send</span><br><span style="color: hsl(120, 100%, 40%);">+ * audio to the port of the original call</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->state = MNCC_CC_CONNECTED;</span><br><span style="color: hsl(120, 100%, 40%);">+ send_rtp_connect(leg, other_leg);</span><br><span> }</span><br><span> </span><br><span> static void check_stp_cnf(struct mncc_connection *conn, const char *buf, int rc)</span><br><span>@@ -938,6 +966,9 @@</span><br><span> case MNCC_HOLD_IND:</span><br><span> check_hold_ind(conn, buf, rc);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case MNCC_RETRIEVE_IND:</span><br><span style="color: hsl(120, 100%, 40%);">+ check_retrieve_ind(conn, buf, rc);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span> case MNCC_START_DTMF_IND:</span><br><span> check_dtmf_start(conn, buf, rc);</span><br><span> break;</span><br><span>diff --git a/src/sip.c b/src/sip.c</span><br><span>index 8a96bed..4e011bd 100644</span><br><span>--- a/src/sip.c</span><br><span>+++ b/src/sip.c</span><br><span>@@ -98,7 +98,7 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected.\n", leg);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "leg(%p) is now connected(%s).\n", leg, sip->sip_call_id->i_id);</span><br><span> leg->state = SIP_CC_CONNECTED;</span><br><span> other->connect_call(other);</span><br><span> nua_ack(leg->nua_handle, TAG_END());</span><br><span>@@ -111,7 +111,7 @@</span><br><span> struct sip_call_leg *leg;</span><br><span> const char *from = NULL, *to = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_DEBUG, "Incoming call handle(%p)\n", nh);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_DEBUG, "Incoming call(%s) handle(%p)\n", sip->sip_call_id->i_id, nh);</span><br><span> </span><br><span> if (!sdp_screen_sdp(sip)) {</span><br><span> LOGP(DSIP, LOGL_ERROR, "No supported codec.\n");</span><br><span>@@ -158,6 +158,11 @@</span><br><span> call_leg_release(&leg->base);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_DEBUG, "SDP Extracted: IP=(%s) PORT=(%u) PAYLOAD=(%u).\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntoa(net),</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->base.port,</span><br><span style="color: hsl(120, 100%, 40%);">+ leg->base.payload_type);</span><br><span> </span><br><span> leg->base.release_call = sip_release_call;</span><br><span> leg->base.ring_call = sip_ring_call;</span><br><span>@@ -179,6 +184,8 @@</span><br><span> </span><br><span> char *sdp;</span><br><span> sdp_mode_t mode = sdp_sendrecv;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint32_t ip = leg->base.ip;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t port = leg->base.port;</span><br><span> </span><br><span> LOGP(DSIP, LOGL_NOTICE, "re-INVITE for call %s\n", sip->sip_call_id->i_id);</span><br><span> </span><br><span>@@ -197,6 +204,9 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "pre re-INVITE have IP:port (%s:%u)\n", inet_ntoa(net), leg->base.port);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (mode == sdp_sendonly) {</span><br><span> /* SIP side places call on HOLD */</span><br><span> sdp = sdp_create_file(leg, other, sdp_recvonly);</span><br><span>@@ -210,9 +220,13 @@</span><br><span> call_leg_release(&leg->base);</span><br><span> return;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ struct in_addr net = { .s_addr = leg->base.ip };</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Media IP:port in re-INVITE: (%s:%u)\n", inet_ntoa(net), leg->base.port);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ip != leg->base.ip || port != leg->base.port) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "re-INVITE changes media connection.\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> if (other->update_rtp)</span><br><span> other->update_rtp(leg->base.call->remote);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> sdp = sdp_create_file(leg, other, sdp_sendrecv);</span><br><span> }</span><br><span> </span><br><span>@@ -297,8 +311,8 @@</span><br><span> </span><br><span> void nua_callback(nua_event_t event, int status, char const *phrase, nua_t *nua, nua_magic_t *magic, nua_handle_t *nh, nua_hmagic_t *hmagic, sip_t const *sip, tagi_t tags[])</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DSIP, LOGL_DEBUG, "SIP event(%u) status(%d) phrase(%s) %p\n",</span><br><span style="color: hsl(0, 100%, 40%);">- event, status, phrase, hmagic);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_DEBUG, "SIP event[%s] status(%d) phrase(%s) %p\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ nua_event_name(event), status, phrase, hmagic);</span><br><span> </span><br><span> if (event == nua_r_invite) {</span><br><span> struct sip_call_leg *leg;</span><br><span>@@ -361,6 +375,7 @@</span><br><span> other->release_call(other);</span><br><span> } else if (event == nua_i_invite) {</span><br><span> /* new incoming leg or re-INVITE */</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_NOTICE, "Processing INVITE Call-ID: %s\n", sip->sip_call_id->i_id);</span><br><span> </span><br><span> if (status == 100) {</span><br><span> struct sip_call_leg *leg = sip_find_leg(nh);</span><br><span>@@ -382,6 +397,8 @@</span><br><span> call_leg_release(&leg->base);</span><br><span> if (other)</span><br><span> other->release_call(other);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DSIP, LOGL_DEBUG, "Did not handle event[%s] status(%d)\n", nua_event_name(event), status);</span><br><span> }</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996">change 14996</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/+/14996"/><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: Ife7bdab20cde92b7ce550215bab28b36a0f302e9 </div>
<div style="display:none"> Gerrit-Change-Number: 14996 </div>
<div style="display:none"> Gerrit-PatchSet: 9 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>