<p>Keith Whyte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12682">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Support Emergency Calling<br><br>LCR supports emergency calling by sending the string 'emergency' as callee to<br>the SIP side.<br><br>This does the same<br><br>Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1<br>---<br>M src/mncc.c<br>1 file changed, 19 insertions(+), 5 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 0f003bd..b7977c4 100644</span><br><span>--- a/src/mncc.c</span><br><span>+++ b/src/mncc.c</span><br><span>@@ -409,10 +409,17 @@</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static const struct gsm_mncc_number emergency_number = {</span><br><span style="color: hsl(120, 100%, 40%);">+  .type = CALL_TYPE_MNCC,</span><br><span style="color: hsl(120, 100%, 40%);">+       .plan = GSM48_NPI_UNKNOWN,</span><br><span style="color: hsl(120, 100%, 40%);">+    .number = "emergency",</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Check + Process MNCC_SETUP_IND (MO call) */</span><br><span> static void check_setup(struct mncc_connection *conn, const char *buf, int rc)</span><br><span> {</span><br><span>      const struct gsm_mncc *data;</span><br><span style="color: hsl(120, 100%, 40%);">+  const struct gsm_mncc_number *called;</span><br><span>        struct call *call;</span><br><span>   struct mncc_call_leg *leg;</span><br><span> </span><br><span>@@ -423,14 +430,21 @@</span><br><span>       }</span><br><span> </span><br><span>        data = (const struct gsm_mncc *) buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ called = &data->called;</span><br><span> </span><br><span>   /* screen arguments */</span><br><span>       if ((data->fields & MNCC_F_CALLED) == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-               LOGP(DMNCC, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">-                 "MNCC leg(%u) without called addr fields(%u)\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                      data->callref, data->fields);</span><br><span style="color: hsl(0, 100%, 40%);">-             return mncc_send(conn, MNCC_REJ_REQ, data->callref);</span><br><span style="color: hsl(120, 100%, 40%);">+               if (!data->emergency) {</span><br><span style="color: hsl(120, 100%, 40%);">+                    LOGP(DMNCC, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+                               "MNCC leg(%u) without called addr fields(%u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+                            data->callref, data->fields);</span><br><span style="color: hsl(120, 100%, 40%);">+                   return mncc_send(conn, MNCC_REJ_REQ, data->callref);</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%);">+           /* Emergency without a called number present. Use the standard "emergency" number. */</span><br><span style="color: hsl(120, 100%, 40%);">+               called = &emergency_number;</span><br><span>      }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>  if ((data->fields & MNCC_F_CALLING) == 0) {</span><br><span>           LOGP(DMNCC, LOGL_ERROR,</span><br><span>                      "MNCC leg(%u) without calling addr fields(%u)\n",</span><br><span>@@ -461,7 +475,7 @@</span><br><span>    leg->conn = conn;</span><br><span>         leg->state = MNCC_CC_INITIAL;</span><br><span>     leg->dir = MNCC_DIR_MO;</span><br><span style="color: hsl(0, 100%, 40%);">-      memcpy(&leg->called, &data->called, sizeof(leg->called));</span><br><span style="color: hsl(120, 100%, 40%);">+    memcpy(&leg->called, called, sizeof(leg->called));</span><br><span>         memcpy(&leg->calling, &data->calling, sizeof(leg->calling));</span><br><span>        memcpy(&leg->imsi, data->imsi, sizeof(leg->imsi));</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12682">change 12682</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/12682"/><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-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I5d0adb61dfa82e7ded5f41d9bc773d546112c9f1 </div>
<div style="display:none"> Gerrit-Change-Number: 12682 </div>
<div style="display:none"> Gerrit-PatchSet: 13 </div>
<div style="display:none"> Gerrit-Owner: Keith Whyte <keith@rhizomatica.org> </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: Keith Whyte <keith@rhizomatica.org> </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>