<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/23861">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
lynxis lazus: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">ggsn: Improve logging on incoming DL data packets<br><br>Change-Id: I3617c8f68d8f18617871c070e28cc6ae5c6a925b<br>---<br>M ggsn/ggsn.c<br>1 file changed, 33 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c</span><br><span>index bde7f4b..0cde543 100644</span><br><span>--- a/ggsn/ggsn.c</span><br><span>+++ b/ggsn/ggsn.c</span><br><span>@@ -593,7 +593,7 @@</span><br><span> struct iphdr *iph = (struct iphdr *)pack;</span><br><span> struct ip6_hdr *ip6h = (struct ip6_hdr *)pack;</span><br><span> struct ippool_t *pool;</span><br><span style="color: hsl(0, 100%, 40%);">- char straddr[INET6_ADDRSTRLEN];</span><br><span style="color: hsl(120, 100%, 40%);">+ char straddr[2][INET6_ADDRSTRLEN];</span><br><span> uint8_t pref_offset;</span><br><span> </span><br><span> switch (iph->version) {</span><br><span>@@ -626,17 +626,41 @@</span><br><span> return 0;</span><br><span> </span><br><span> if (ippool_getip(pool, &ipm, &dst)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGTUN(LOGL_DEBUG, tun, "Received packet for APN(%s) with no PDP contex! (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- apn->cfg.name,</span><br><span style="color: hsl(0, 100%, 40%);">- iph->version == 4 ?</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntop(AF_INET, &iph->saddr, straddr, sizeof(straddr)) :</span><br><span style="color: hsl(0, 100%, 40%);">- inet_ntop(AF_INET6, &ip6h->ip6_src, straddr, sizeof(straddr)));</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGTUN(LOGL_DEBUG, tun, "APN(%s) Rx DL data packet for IP address outside "</span><br><span style="color: hsl(120, 100%, 40%);">+ "pool of managed addresses: %s <- %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ apn->cfg.name,</span><br><span style="color: hsl(120, 100%, 40%);">+ iph->version == 4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &iph->daddr, straddr[0], sizeof(straddr[0])) :</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, &ip6h->ip6_dst, straddr[0], sizeof(straddr[0])),</span><br><span style="color: hsl(120, 100%, 40%);">+ iph->version == 4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &iph->saddr, straddr[1], sizeof(straddr[1])) :</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, &ip6h->ip6_src, straddr[1], sizeof(straddr[1])));</span><br><span> return 0;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- LOGTUN(LOGL_DEBUG, tun, "Received packet for APN(%s)\n", apn->cfg.name);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (ipm->peer) /* Check if a peer protocol is defined */</span><br><span style="color: hsl(0, 100%, 40%);">- gtp_data_req(apn->ggsn->gsn, (struct pdp_t *)ipm->peer, pack, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (ipm->peer) { /* Check if a peer protocol is defined */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct pdp_t *pdp = (struct pdp_t *)ipm->peer;</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGTUN(LOGL_DEBUG, tun, "APN(%s) Rx DL data packet for PDP(%s:%u): %s <- %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ apn->cfg.name,</span><br><span style="color: hsl(120, 100%, 40%);">+ imsi_gtp2str(&(pdp)->imsi), (pdp)->nsapi,</span><br><span style="color: hsl(120, 100%, 40%);">+ iph->version == 4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &iph->daddr, straddr[0], sizeof(straddr[0])) :</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, &ip6h->ip6_dst, straddr[0], sizeof(straddr[0])),</span><br><span style="color: hsl(120, 100%, 40%);">+ iph->version == 4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &iph->saddr, straddr[1], sizeof(straddr[1])) :</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, &ip6h->ip6_src, straddr[1], sizeof(straddr[1])));</span><br><span style="color: hsl(120, 100%, 40%);">+ gtp_data_req(apn->ggsn->gsn, pdp, pack, len);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGTUN(LOGL_DEBUG, tun, "APN(%s) Rx DL data packet for IP address with no "</span><br><span style="color: hsl(120, 100%, 40%);">+ "associated PDP Ctx: %s <- %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ apn->cfg.name,</span><br><span style="color: hsl(120, 100%, 40%);">+ iph->version == 4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &iph->daddr, straddr[0], sizeof(straddr[0])) :</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, &ip6h->ip6_dst, straddr[0], sizeof(straddr[0])),</span><br><span style="color: hsl(120, 100%, 40%);">+ iph->version == 4 ?</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET, &iph->saddr, straddr[1], sizeof(straddr[1])) :</span><br><span style="color: hsl(120, 100%, 40%);">+ inet_ntop(AF_INET6, &ip6h->ip6_src, straddr[1], sizeof(straddr[1])));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ggsn/+/23861">change 23861</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/+/23861"/><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: I3617c8f68d8f18617871c070e28cc6ae5c6a925b </div>
<div style="display:none"> Gerrit-Change-Number: 23861 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </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@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: lynxis lazus <lynxis@fe80.eu> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>