<p>laforge <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/15266">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
osmith: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">libgtp: Introduce cb_recovery3<br><br>Since osmo-ggsn can manage several GSN structures simultaneously, it<br>needs the gsn_t pointer to know the ggsn it should forward the call to.<br><br>Related: OS#4165<br>Change-Id: I33b4fe594d5833993af01cce34737e61e597b320<br>---<br>M gtp/gtp.c<br>M gtp/gtp.h<br>2 files changed, 23 insertions(+), 0 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 f0318f7..f70f534 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -219,6 +219,8 @@</span><br><span> gsn->cb_recovery(peer, recovery);</span><br><span> if (gsn->cb_recovery2)</span><br><span> gsn->cb_recovery2(peer, pdp, recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsn->cb_recovery3)</span><br><span style="color: hsl(120, 100%, 40%);">+ gsn->cb_recovery3(gsn, peer, pdp, recovery);</span><br><span> }</span><br><span> </span><br><span> int gtp_set_cb_recovery(struct gsn_t *gsn,</span><br><span>@@ -242,6 +244,21 @@</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_recovery3(struct gsn_t *gsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb_recovery3) (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%);">+ gsn->cb_recovery3 = cb_recovery3;</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>diff --git a/gtp/gtp.h b/gtp/gtp.h</span><br><span>index c2c5122..f2a4e1d 100644</span><br><span>--- a/gtp/gtp.h</span><br><span>+++ b/gtp/gtp.h</span><br><span>@@ -277,6 +277,7 @@</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> int (*cb_recovery2) (struct sockaddr_in * peer, struct pdp_t * pdp, uint8_t recovery);</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb_recovery3) (struct gsn_t *gsn, struct sockaddr_in *peer, struct pdp_t *pdp, uint8_t recovery);</span><br><span> </span><br><span> /* Counters */</span><br><span> </span><br><span>@@ -373,6 +374,11 @@</span><br><span> int gtp_set_cb_recovery2(struct gsn_t *gsn,</span><br><span> int (*cb) (struct sockaddr_in * peer,</span><br><span> struct pdp_t * pdp,</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_recovery3() instead, to obtain gsn handling the recovery");;</span><br><span style="color: hsl(120, 100%, 40%);">+int gtp_set_cb_recovery3(struct gsn_t *gsn,</span><br><span style="color: hsl(120, 100%, 40%);">+ int (*cb) (struct gsn_t * gsn, 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> void gtp_clear_queues(struct gsn_t *gsn);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/15266">change 15266</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-ggsn/+/15266"/><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-Change-Id: I33b4fe594d5833993af01cce34737e61e597b320 </div>
<div style="display:none"> Gerrit-Change-Number: 15266 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>