<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14297">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: Make use of new libgtp APIs with multi-gsn support<br><br>Drop use of deprecated APIs everywhere in libgtp and use the new ones instead.<br><br>Related: OS#2873<br>Change-Id: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa<br>---<br>M gtp/gtp.c<br>1 file changed, 22 insertions(+), 23 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 84b8844..94c3245 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -156,9 +156,8 @@</span><br><span> </span><br><span> for (n = 0; n < PDP_MAXNSAPI; n++) {</span><br><span> if (pdp->secondary_tei[n]) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1</span><br><span style="color: hsl(0, 100%, 40%);">- (&secondary_pdp,</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->secondary_tei[n])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &secondary_pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ pdp->secondary_tei[n])) {</span><br><span> LOGP(DLGTP, LOGL_ERROR,</span><br><span> "Unknown secondary PDP context\n");</span><br><span> continue;</span><br><span>@@ -1150,7 +1149,7 @@</span><br><span> Protocol Configuration Options */</span><br><span> </span><br><span> if (pdp->secondary) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&linked_pdp, pdp->teic_own)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &linked_pdp, pdp->teic_own)) {</span><br><span> LOGP(DLGTP, LOGL_ERROR,</span><br><span> "Unknown linked PDP context: %u\n", pdp->teic_own);</span><br><span> return EOF;</span><br><span>@@ -1430,7 +1429,7 @@</span><br><span> if (!gtpie_gettv1(ie, GTPIE_NSAPI, 1, &linked_nsapi)) {</span><br><span> </span><br><span> /* Find the primary PDP context */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&linked_pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &linked_pdp, get_tei(pack))) {</span><br><span> gsn->incorrect++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer,</span><br><span> pack, len,</span><br><span>@@ -1613,9 +1612,9 @@</span><br><span> in_addr2gsna(&pdp->gsnlc, &gsn->gsnc);</span><br><span> in_addr2gsna(&pdp->gsnlu, &gsn->gsnu);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- DEBUGP(DLGTP, "gtp_create_pdp_ind: Before pdp_tidget\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ DEBUGP(DLGTP, "gtp_create_pdp_ind: Before gtp_pdp_tidget\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!pdp_getimsi(&pdp_old, pdp->imsi, pdp->nsapi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!gtp_pdp_getimsi(gsn, &pdp_old, pdp->imsi, pdp->nsapi)) {</span><br><span> /* Found old pdp with same tid. Now the voodoo begins! */</span><br><span> /* 09.60 / 29.060 allows create on existing context to "steal" */</span><br><span> /* the context which was allready established */</span><br><span>@@ -1709,7 +1708,7 @@</span><br><span> return EOF;</span><br><span> </span><br><span> /* Find the context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Unknown PDP context: %u\n", get_tei(pack));</span><br><span>@@ -2091,7 +2090,7 @@</span><br><span> pdp_set_imsi_nsapi(pdp, tid);</span><br><span> </span><br><span> /* Find the context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getimsi(&pdp, imsi, nsapi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span> len, "Unknown PDP context\n");</span><br><span>@@ -2113,7 +2112,7 @@</span><br><span> /* IMSI (conditional) */</span><br><span> if (gtpie_gettv0(ie, GTPIE_IMSI, 0, &imsi, sizeof(imsi))) {</span><br><span> /* Find the context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer,</span><br><span> pack, len, "Unknown PDP context: %u\n",</span><br><span>@@ -2124,7 +2123,7 @@</span><br><span> }</span><br><span> } else {</span><br><span> /* Find the context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getimsi(&pdp, imsi, nsapi)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer,</span><br><span> pack, len, "Unknown PDP context\n");</span><br><span>@@ -2290,7 +2289,7 @@</span><br><span> return EOF;</span><br><span> </span><br><span> /* Find the context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Unknown PDP context: %u\n", get_tei(pack));</span><br><span>@@ -2391,7 +2390,7 @@</span><br><span> {</span><br><span> struct pdp_t *linked_pdp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&linked_pdp, pdp->teic_own)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &linked_pdp, pdp->teic_own)) {</span><br><span> LOGP(DLGTP, LOGL_ERROR,</span><br><span> "Unknown linked PDP context: %u\n", pdp->teic_own);</span><br><span> return EOF;</span><br><span>@@ -2447,7 +2446,7 @@</span><br><span> return EOF;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&linked_pdp, pdp->teic_own)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &linked_pdp, pdp->teic_own)) {</span><br><span> LOGP(DLGTP, LOGL_ERROR,</span><br><span> "Unknown linked PDP context: %u\n", pdp->teic_own);</span><br><span> return EOF;</span><br><span>@@ -2543,7 +2542,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Find the linked context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&linked_pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &linked_pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Unknown PDP context: %u\n", get_tei(pack));</span><br><span>@@ -2583,7 +2582,7 @@</span><br><span> }</span><br><span> </span><br><span> /* Find the context in question */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&pdp, linked_pdp->secondary_tei[nsapi & 0x0f])) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &pdp, linked_pdp->secondary_tei[nsapi & 0x0f])) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span> len, "Unknown PDP context\n");</span><br><span>@@ -2636,7 +2635,7 @@</span><br><span> </span><br><span> /* Find the context in question. It may not be available if gtp_delete_context_req</span><br><span> * was used and as a result the PDP ctx was already freed */</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1(&pdp, get_tei(pack))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_NOTICE, peer, pack, len,</span><br><span> "Unknown PDP context: %u (expected if gtp_delete_context_req is used or pdp ctx was freed manually before response)\n",</span><br><span>@@ -2714,7 +2713,7 @@</span><br><span> </span><br><span> /* Find the context in question */</span><br><span> if (version == 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_tidget(&pdp, be64toh(((union gtp_packet *)pack)->gtp0.h.tid))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_tidget(gsn, &pdp, be64toh(((union gtp_packet *)pack)->gtp0.h.tid))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span> "Unknown PDP context\n");</span><br><span>@@ -2740,7 +2739,7 @@</span><br><span> return EOF;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1_peer_d(&pdp, peer, teid_gn)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1_peer_d(gsn, &pdp, peer, teid_gn)) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown PDP context\n");</span><br><span> return EOF;</span><br><span>@@ -2770,8 +2769,8 @@</span><br><span> </span><br><span> switch (version) {</span><br><span> case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp0</span><br><span style="color: hsl(0, 100%, 40%);">- (&pdp, ntoh16(((union gtp_packet *)pack)->gtp0.h.flow))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp0(gsn, &pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ ntoh16(((union gtp_packet *)pack)->gtp0.h.flow))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span> len, "Unknown PDP context, GTPv0\n");</span><br><span>@@ -2781,8 +2780,8 @@</span><br><span> hlen = GTP0_HEADER_SIZE;</span><br><span> break;</span><br><span> case 1:</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp_getgtp1</span><br><span style="color: hsl(0, 100%, 40%);">- (&pdp, ntoh32(((union gtp_packet *)pack)->gtp1l.h.tei))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp1(gsn, &pdp,</span><br><span style="color: hsl(120, 100%, 40%);">+ ntoh32(((union gtp_packet *)pack)->gtp1l.h.tei))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span> len, "Unknown PDP context, GTPv1\n");</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/14297">change 14297</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/+/14297"/><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: Ibf56a063f01d1f95a2a3271416da6e062e85fdfa </div>
<div style="display:none"> Gerrit-Change-Number: 14297 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: pespin <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: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>