<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/23862">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gtp: Improve logging of failing pdp ctx resolution from TEI/TID<br><br>Change-Id: I4f2084ec7e3a830e0224dd998ff0fe6654cc23bd<br>---<br>M gtp/gtp.c<br>1 file changed, 31 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ggsn refs/changes/62/23862/1</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 1995d10..81b7e0f 100644</span><br><span>--- a/gtp/gtp.c</span><br><span>+++ b/gtp/gtp.c</span><br><span>@@ -2136,8 +2136,9 @@</span><br><span> /* Find the context in question */</span><br><span> if (gtp_pdp_tidget(gsn, &pdp, get_tid(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span style="color: hsl(0, 100%, 40%);">- len, "Unknown PDP context\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TID=0x%" PRIx64 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_tid(pack));</span><br><span> return gtp_update_pdp_resp(gsn, version, peer, fd, pack,</span><br><span> len, NULL,</span><br><span> GTPCAUSE_NON_EXIST);</span><br><span>@@ -2161,9 +2162,9 @@</span><br><span> /* Find the context in question */</span><br><span> if (gtp_pdp_getgtp1(gsn, &pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer,</span><br><span style="color: hsl(0, 100%, 40%);">- pack, len, "Unknown PDP context: %u\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_tei(pack));</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TEI=0x%" PRIx32 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_tei(pack));</span><br><span> return gtp_update_pdp_resp(gsn, version, peer,</span><br><span> fd, pack, len, NULL,</span><br><span> GTPCAUSE_NON_EXIST);</span><br><span>@@ -2172,8 +2173,9 @@</span><br><span> /* Find the context in question */</span><br><span> if (gtp_pdp_getimsi(gsn, &pdp, imsi, nsapi)) {</span><br><span> gsn->err_unknownpdp++;</span><br><span style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer,</span><br><span style="color: hsl(0, 100%, 40%);">- pack, len, "Unknown PDP context\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: IMSI=0x%" PRIx64</span><br><span style="color: hsl(120, 100%, 40%);">+ " NSAPI=%" PRIu8 "\n", imsi, nsapi);</span><br><span> return gtp_update_pdp_resp(gsn, version, peer,</span><br><span> fd, pack, len, NULL,</span><br><span> GTPCAUSE_NON_EXIST);</span><br><span>@@ -2366,7 +2368,7 @@</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- "Unknown PDP context: %u\n", get_tei(pack));</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TEI=0x%" PRIx32 "\n", get_tei(pack));</span><br><span> goto err_out;</span><br><span> }</span><br><span> }</span><br><span>@@ -2603,7 +2605,7 @@</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- "Unknown PDP context: %u\n", get_tei(pack));</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TEI=0x%" PRIx32 "\n", get_tei(pack));</span><br><span> return gtp_delete_pdp_resp(gsn, version, peer, fd, pack, len,</span><br><span> NULL, NULL, GTPCAUSE_NON_EXIST,</span><br><span> teardown);</span><br><span>@@ -2632,7 +2634,7 @@</span><br><span> if (gtpie_gettv1(ie, GTPIE_NSAPI, 0, &nsapi)) {</span><br><span> gsn->missing++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span style="color: hsl(0, 100%, 40%);">- len, "Missing mandatory information field\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ len, "Missing mandatory information field\n");</span><br><span> return gtp_delete_pdp_resp(gsn, version, peer, fd, pack,</span><br><span> len, NULL, NULL,</span><br><span> GTPCAUSE_MAN_IE_MISSING,</span><br><span>@@ -2642,8 +2644,9 @@</span><br><span> /* Find the context in question */</span><br><span> if (gtp_pdp_getgtp1(gsn, &pdp, linked_pdp->secondary_tei[nsapi & 0x0f])) {</span><br><span> gsn->err_unknownpdp++;</span><br><span style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span style="color: hsl(0, 100%, 40%);">- len, "Unknown PDP context\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: Secondary TEI=0x%" PRIx32 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ linked_pdp->secondary_tei[nsapi & 0x0f]);</span><br><span> return gtp_delete_pdp_resp(gsn, version, peer, fd, pack,</span><br><span> len, NULL, NULL,</span><br><span> GTPCAUSE_NON_EXIST,</span><br><span>@@ -2696,8 +2699,9 @@</span><br><span> 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 style="color: hsl(0, 100%, 40%);">- "Unknown PDP context: %u (expected if gtp_delete_context_req is used or pdp ctx was freed manually before response)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- get_tei(pack));</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TEI=0x%" PRIx32 " (expected if "</span><br><span style="color: hsl(120, 100%, 40%);">+ "gtp_delete_context_req is used or pdp ctx was freed "</span><br><span style="color: hsl(120, 100%, 40%);">+ "manually before response)\n", get_tei(pack));</span><br><span> if (gsn->cb_conf)</span><br><span> gsn->cb_conf(type, EOF, NULL, cbp);</span><br><span> return EOF;</span><br><span>@@ -2774,7 +2778,8 @@</span><br><span> if (gtp_pdp_tidget(gsn, &pdp, get_tid(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span> GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(0, 100%, 40%);">- "Unknown PDP context\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TID=0x%" PRIx64 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_tid(pack));</span><br><span> return EOF;</span><br><span> }</span><br><span> } else if (version == 1) {</span><br><span>@@ -2799,7 +2804,9 @@</span><br><span> </span><br><span> if (gtp_pdp_getgtp1_peer_d(gsn, &pdp, peer, teid_gn)) {</span><br><span> gsn->err_unknownpdp++;</span><br><span style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer, pack, len, "Unknown PDP context\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: Peer TEID=0x%" PRIx32 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ teid_gn);</span><br><span> return EOF;</span><br><span> }</span><br><span> } else {</span><br><span>@@ -2830,22 +2837,22 @@</span><br><span> </span><br><span> switch (version) {</span><br><span> case 0:</span><br><span style="color: hsl(0, 100%, 40%);">- if (gtp_pdp_getgtp0(gsn, &pdp,</span><br><span style="color: hsl(0, 100%, 40%);">- ntoh16(((union gtp_packet *)pack)->gtp0.h.flow))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gtp_pdp_getgtp0(gsn, &pdp, get_tei(pack))) {</span><br><span> gsn->err_unknownpdp++;</span><br><span style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span style="color: hsl(0, 100%, 40%);">- len, "Unknown PDP context, GTPv0\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TEI=0x%" PRIx32 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_tei(pack));</span><br><span> return gtp_error_ind_resp(gsn, version, peer, fd, pack,</span><br><span> len);</span><br><span> }</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 (gtp_pdp_getgtp1(gsn, &pdp,</span><br><span style="color: hsl(0, 100%, 40%);">- ntoh32(((union gtp_packet *)pack)->gtp1l.h.tei))) {</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 style="color: hsl(0, 100%, 40%);">- GTP_LOGPKG(LOGL_ERROR, peer, pack,</span><br><span style="color: hsl(0, 100%, 40%);">- len, "Unknown PDP context, GTPv1\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ GTP_LOGPKG(LOGL_ERROR, peer, pack, len,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Unknown PDP context: TEI=0x%" PRIx32 "\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ get_tei(pack));</span><br><span> return gtp_error_ind_resp(gsn, version, peer, fd, pack,</span><br><span> len);</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/23862">change 23862</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/+/23862"/><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: I4f2084ec7e3a830e0224dd998ff0fe6654cc23bd </div>
<div style="display:none"> Gerrit-Change-Number: 23862 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>