<p>keith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-sip-connector/+/14996">View Change</a></p><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, 37 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-sip-connector refs/changes/96/14996/1</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 ab2bed6..3f93126 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -669,14 +669,39 @@</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 BTS to send audio to</span><br><span style="color: hsl(120, 100%, 40%);">+       // the port of the original call</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>@@ -919,6 +944,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 6507486..236c332 100644</span><br><span>--- a/src/sip.c</span><br><span>+++ b/src/sip.c</span><br><span>@@ -287,8 +287,13 @@</span><br><span> </span><br><span>           if (status == 180 || status == 183)</span><br><span>                  call_progress(leg, sip, status);</span><br><span style="color: hsl(0, 100%, 40%);">-                else if (status == 200)</span><br><span style="color: hsl(0, 100%, 40%);">-                 call_connect(leg, sip);</span><br><span style="color: hsl(120, 100%, 40%);">+               else if (status == 200) {</span><br><span style="color: hsl(120, 100%, 40%);">+                     struct sip_call_leg *leg = sip_find_leg(nh);</span><br><span style="color: hsl(120, 100%, 40%);">+                  if (leg)</span><br><span style="color: hsl(120, 100%, 40%);">+                              nua_ack(leg->nua_handle, TAG_END());</span><br><span style="color: hsl(120, 100%, 40%);">+                       else</span><br><span style="color: hsl(120, 100%, 40%);">+                          call_connect(leg, sip);</span><br><span style="color: hsl(120, 100%, 40%);">+               }</span><br><span>            else if (status >= 300) {</span><br><span>                         struct call_leg *other = call_leg_other(&leg->base);</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: 1 </div>
<div style="display:none"> Gerrit-Owner: keith <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>