<p>lynxis lazus has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/15494">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Introduce multiple paging attempts<br><br>Some MS/UE might not be reachable on the first attempt.<br>E.g. when the MS/UE is moving between channels it might not<br>respond to paging.<br><br>Change-Id: I32c47958939a4a29292832289f9d29905731d7f3<br>---<br>M include/osmocom/msc/gsm_data.h<br>M include/osmocom/msc/paging.h<br>M src/libmsc/msc_net_init.c<br>M src/libmsc/msc_vty.c<br>M src/libmsc/paging.c<br>5 files changed, 39 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/94/15494/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/gsm_data.h b/include/osmocom/msc/gsm_data.h</span><br><span>index 11b6e82..faabb88 100644</span><br><span>--- a/include/osmocom/msc/gsm_data.h</span><br><span>+++ b/include/osmocom/msc/gsm_data.h</span><br><span>@@ -124,6 +124,7 @@</span><br><span> };</span><br><span> </span><br><span> #define MSC_PAGING_RESPONSE_TIMER_DEFAULT 10</span><br><span style="color: hsl(120, 100%, 40%);">+#define MSC_PAGING_ATTEMPTS 3</span><br><span> </span><br><span> struct gsm_tz {</span><br><span> int override; /* if 0, use system's time zone instead. */</span><br><span>@@ -171,6 +172,8 @@</span><br><span> struct llist_head trans_list;</span><br><span> </span><br><span> unsigned int paging_response_timer;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* how often a paging should be attempted */</span><br><span style="color: hsl(120, 100%, 40%);">+ unsigned int paging_attempts;</span><br><span> </span><br><span> /* Radio Resource Location Protocol (TS 04.31) */</span><br><span> struct {</span><br><span>diff --git a/include/osmocom/msc/paging.h b/include/osmocom/msc/paging.h</span><br><span>index 4de679d..bbe455c 100644</span><br><span>--- a/include/osmocom/msc/paging.h</span><br><span>+++ b/include/osmocom/msc/paging.h</span><br><span>@@ -35,6 +35,7 @@</span><br><span> /* the callback data */</span><br><span> paging_cb_t paging_cb;</span><br><span> struct gsm_trans *trans;</span><br><span style="color: hsl(120, 100%, 40%);">+ int attempts;</span><br><span> };</span><br><span> </span><br><span> struct paging_request *paging_request_start(struct vlr_subscr *vsub, enum paging_cause cause,</span><br><span>diff --git a/src/libmsc/msc_net_init.c b/src/libmsc/msc_net_init.c</span><br><span>index 91b6165..4ab974c 100644</span><br><span>--- a/src/libmsc/msc_net_init.c</span><br><span>+++ b/src/libmsc/msc_net_init.c</span><br><span>@@ -58,6 +58,7 @@</span><br><span> net->ncss_guard_timeout = 30;</span><br><span> </span><br><span> net->paging_response_timer = MSC_PAGING_RESPONSE_TIMER_DEFAULT;</span><br><span style="color: hsl(120, 100%, 40%);">+ net->paging_attempts = MSC_PAGING_RESPONSE_TIMER_DEFAULT;</span><br><span> </span><br><span> INIT_LLIST_HEAD(&net->trans_list);</span><br><span> INIT_LLIST_HEAD(&net->upqueue);</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index 09aef91..6db2bb1 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -564,6 +564,21 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_msc_paging_attempts, cfg_msc_paging_attempts_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "paging attempts (default|<1-10>)",</span><br><span style="color: hsl(120, 100%, 40%);">+ "Configure Paging\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set Paging attempts, how often the paging should be attempted before giving up"</span><br><span style="color: hsl(120, 100%, 40%);">+ " BSS or RNC\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set to default attempts (" OSMO_STRINGIFY_VAL(MSC_PAGING_ATTEMPTS) " seconds)\n"</span><br><span style="color: hsl(120, 100%, 40%);">+ "Set paging attempts\n")</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!strcmp(argv[1], "default"))</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->paging_attempts = MSC_PAGING_ATTEMPTS;</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ gsmnet->paging_attempts = atoi(argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> DEFUN(cfg_msc_emergency_msisdn, cfg_msc_emergency_msisdn_cmd,</span><br><span> "emergency-call route-to-msisdn MSISDN",</span><br><span> "Configure Emergency Call Behaviour\n"</span><br><span>@@ -691,6 +706,9 @@</span><br><span> if (gsmnet->paging_response_timer != MSC_PAGING_RESPONSE_TIMER_DEFAULT)</span><br><span> vty_out(vty, " paging response-timer %u%s", gsmnet->paging_response_timer, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsmnet->paging_attempts != MSC_PAGING_ATTEMPTS)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " paging attempts %u%s", gsmnet->paging_attempts, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (gsmnet->emergency.route_to_msisdn) {</span><br><span> vty_out(vty, " emergency-call route-to-msisdn %s%s",</span><br><span> gsmnet->emergency.route_to_msisdn, VTY_NEWLINE);</span><br><span>@@ -1990,6 +2008,7 @@</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_instance_a_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_cs7_instance_iu_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_paging_response_timer_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(MSC_NODE, &cfg_msc_paging_attempts_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_emergency_msisdn_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_sms_over_gsup_cmd);</span><br><span> install_element(MSC_NODE, &cfg_msc_no_sms_over_gsup_cmd);</span><br><span>diff --git a/src/libmsc/paging.c b/src/libmsc/paging.c</span><br><span>index 182b036..15481ff 100644</span><br><span>--- a/src/libmsc/paging.c</span><br><span>+++ b/src/libmsc/paging.c</span><br><span>@@ -89,6 +89,7 @@</span><br><span> .cause = cause,</span><br><span> .paging_cb = paging_cb,</span><br><span> .trans = trans,</span><br><span style="color: hsl(120, 100%, 40%);">+ .attempts = 0,</span><br><span> };</span><br><span> </span><br><span> if (vsub->cs.is_paging) {</span><br><span>@@ -130,6 +131,7 @@</span><br><span> </span><br><span> static void paging_concludes(struct vlr_subscr *vsub, struct msc_a *msc_a)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_network *net = vsub->vlr->user_ctx;</span><br><span> struct paging_request *pr, *pr_next;</span><br><span> struct paging_signal_data sig_data;</span><br><span> </span><br><span>@@ -138,10 +140,21 @@</span><br><span> llist_for_each_entry_safe(pr, pr_next, &vsub->cs.requests, entry) {</span><br><span> struct gsm_trans *trans = pr->trans;</span><br><span> paging_cb_t paging_cb = pr->paging_cb;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *retry_str = "";</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOG_PAGING(vsub, pr, LOGL_DEBUG, "Paging Response action (%s)%s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ pr->attempts++;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc_a && pr->attempts < net->paging_attempts)</span><br><span style="color: hsl(120, 100%, 40%);">+ retry_str = "(retrying)";</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_PAGING(vsub, pr, LOGL_DEBUG, "Paging Response action (%s)%s%s\n",</span><br><span> msc_a ? "success" : "expired",</span><br><span style="color: hsl(0, 100%, 40%);">- paging_cb ? "" : " (no action defined)");</span><br><span style="color: hsl(120, 100%, 40%);">+ paging_cb ? "" : " (no action defined)",</span><br><span style="color: hsl(120, 100%, 40%);">+ retry_str);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!msc_a && pr->attempts < net->paging_attempts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ msc_paging_request(pr, vsub);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> /* Remove the paging request before the paging_cb could deallocate e.g. the trans */</span><br><span> paging_request_remove(pr);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/15494">change 15494</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-msc/+/15494"/><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-Change-Id: I32c47958939a4a29292832289f9d29905731d7f3 </div>
<div style="display:none"> Gerrit-Change-Number: 15494 </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-MessageType: newchange </div>