<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/10024">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gtp: Add new replacement cb_recovery2 for cb_recovery<br><br>Sometimes the originating pdp ctx causing the Recovery Procedure is<br>required, in order to drop all pdp ctx but this one, which specs specify<br>should be handled as valid:<br>"""<br>The SGSN receiving the Recovery information element shall handle it as when an<br>Echo Response message is received but shall consider the PDP context being created as active if the response indicates<br>successful context activation at the GGSN.<br>"""<br><br>Change-Id: I53e92298f2f6b84d662a3300d922e8c2ccb178bc<br>---<br>M gtp/gtp.c<br>M gtp/gtp.h<br>2 files changed, 45 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gtp/gtp.c b/gtp/gtp.c</span><br><span>index 95abbef..1d58088 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -190,6 +190,15 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void emit_cb_recovery(struct gsn_t *gsn, struct sockaddr_in * peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t * pdp, uint8_t recovery)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsn->cb_recovery)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_recovery(peer, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsn->cb_recovery2)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_recovery2(peer, pdp, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int gtp_set_cb_recovery(struct gsn_t *gsn,</span><br><span> int (*cb) (struct sockaddr_in * peer, uint8_t recovery))</span><br><span> {</span><br><span>@@ -197,6 +206,20 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* cb_recovery()</span><br><span style="color: hsl(120, 100%, 40%);">+ * pdp may be NULL if Recovery IE was received from a message independent</span><br><span style="color: hsl(120, 100%, 40%);">+ * of any PDP ctx (such as Echo Response), or because pdp ctx is unknown to the</span><br><span style="color: hsl(120, 100%, 40%);">+ * local setup. In case pdp is known, caller may want to keep that pdp alive to</span><br><span style="color: hsl(120, 100%, 40%);">+ * handle subsequent msg cb as this specific pdp ctx is still valid according to</span><br><span style="color: hsl(120, 100%, 40%);">+ * specs.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_set_cb_recovery2(struct gsn_t *gsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery))</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_recovery2 = cb_recovery2;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int gtp_set_cb_data_ind(struct gsn_t *gsn,</span><br><span> int (*cb_data_ind) (struct pdp_t * pdp,</span><br><span> void *pack, unsigned len))</span><br><span>@@ -977,8 +1000,7 @@</span><br><span> if (gsn->cb_conf)</span><br><span> gsn->cb_conf(type, recovery, NULL, cbp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_recovery)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_recovery(peer, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ emit_cb_recovery(gsn, peer, NULL, recovery);</span><br><span> </span><br><span> return 0;</span><br><span> }</span><br><span>@@ -1310,6 +1332,8 @@</span><br><span> struct pdp_t pdp_buf;</span><br><span> union gtpie_member *ie[GTPIE_SIZE];</span><br><span> uint8_t recovery;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool recovery_recvd = false;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span> </span><br><span> uint16_t seq = get_seq(pack);</span><br><span> int hlen = get_hlen(pack);</span><br><span>@@ -1410,8 +1434,8 @@</span><br><span> </span><br><span> /* Recovery (optional) */</span><br><span> if (!gtpie_gettv1(ie, GTPIE_RECOVERY, 0, &recovery)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_recovery)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_recovery(peer, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* we use recovery futher down after announcing new pdp ctx to user */</span><br><span style="color: hsl(120, 100%, 40%);">+ recovery_recvd = true;</span><br><span> }</span><br><span> </span><br><span> /* Selection mode (conditional) */</span><br><span>@@ -1612,6 +1636,9 @@</span><br><span> /* Switch to using the old pdp context */</span><br><span> pdp = pdp_old;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ if (recovery_recvd)</span><br><span style="color: hsl(120, 100%, 40%);">+ emit_cb_recovery(gsn, peer, pdp, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Confirm to peer that things were "successful" */</span><br><span> return gtp_create_pdp_resp(gsn, version, pdp,</span><br><span> GTPCAUSE_ACC_REQ);</span><br><span>@@ -1633,13 +1660,16 @@</span><br><span> </span><br><span> /* Callback function to validata login */</span><br><span> if (gsn->cb_create_context_ind != 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return gsn->cb_create_context_ind(pdp);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsn->cb_create_context_ind(pdp);</span><br><span> else {</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "No create_context_ind callback defined\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return gtp_create_pdp_resp(gsn, version, pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gtp_create_pdp_resp(gsn, version, pdp,</span><br><span> GTPCAUSE_NOT_SUPPORTED);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ if (recovery_recvd)</span><br><span style="color: hsl(120, 100%, 40%);">+ emit_cb_recovery(gsn, peer, pdp, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span> }</span><br><span> </span><br><span> /* Handle Create PDP Context Response */</span><br><span>@@ -1696,8 +1726,7 @@</span><br><span> </span><br><span> /* Extract recovery (optional) */</span><br><span> if (!gtpie_gettv1(ie, GTPIE_RECOVERY, 0, &recovery)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_recovery)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_recovery(peer, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ emit_cb_recovery(gsn, peer, pdp, recovery);</span><br><span> }</span><br><span> </span><br><span> /* Extract protocol configuration options (optional) */</span><br><span>@@ -2106,8 +2135,7 @@</span><br><span> </span><br><span> /* Recovery (optional) */</span><br><span> if (!gtpie_gettv1(ie, GTPIE_RECOVERY, 0, &recovery)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_recovery)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_recovery(peer, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ emit_cb_recovery(gsn, peer, pdp, recovery);</span><br><span> }</span><br><span> </span><br><span> if (version == 0) {</span><br><span>@@ -2267,8 +2295,7 @@</span><br><span> </span><br><span> /* Extract recovery (optional) */</span><br><span> if (!gtpie_gettv1(ie, GTPIE_RECOVERY, 0, &recovery)) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsn->cb_recovery)</span><br><span style="color: hsl(0, 100%, 40%);">- gsn->cb_recovery(peer, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ emit_cb_recovery(gsn, peer, pdp, recovery);</span><br><span> }</span><br><span> </span><br><span> /* Check all conditional information elements */</span><br><span>diff --git a/gtp/gtp.h b/gtp/gtp.h</span><br><span>index f185424..ed594f1 100644</span><br><span>--- a/gtp/gtp.h</span><br><span>+++ b/gtp/gtp.h</span><br><span>@@ -271,6 +271,7 @@</span><br><span> int (*cb_conf) (int type, int cause, struct pdp_t * pdp, void *cbp);</span><br><span> int (*cb_data_ind) (struct pdp_t * pdp, void *pack, unsigned len);</span><br><span> int (*cb_recovery) (struct sockaddr_in * peer, uint8_t recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery);</span><br><span> </span><br><span> /* Counters */</span><br><span> </span><br><span>@@ -361,6 +362,11 @@</span><br><span> </span><br><span> int gtp_set_cb_recovery(struct gsn_t *gsn,</span><br><span> int (*cb) (struct sockaddr_in * peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t recovery))</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_DEPRECATED("Use gtp_set_cb_recovery2() instead, to obtain pdp ctx originating the recovery");</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_set_cb_recovery2(struct gsn_t *gsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb) (struct sockaddr_in * peer,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t * pdp,</span><br><span> uint8_t recovery));</span><br><span> </span><br><span> /* Internal functions (not part of the API */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/10024">change 10024</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/10024"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ggsn </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I53e92298f2f6b84d662a3300d922e8c2ccb178bc </div>
<div style="display:none"> Gerrit-Change-Number: 10024 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>