<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/14294">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">pdp: Drop unused code for haship<br><br>Nowadays we have one tun device per APN, so we don't need this hash<br>table because we use the ippool of the APN to find the related PDP ctx<br>pointer.<br><br>Change-Id: Ife3f222daa87f0630ff34ffc3e63f4dad2ad914b<br>---<br>M gtp/pdp.c<br>M gtp/pdp.h<br>2 files changed, 0 insertions(+), 78 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/94/14294/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/gtp/pdp.c b/gtp/pdp.c</span><br><span>index 92fe5ec..a5146e9 100644</span><br><span>--- a/gtp/pdp.c</span><br><span>+++ b/gtp/pdp.c</span><br><span>@@ -38,7 +38,6 @@</span><br><span> </span><br><span> static struct pdp_t pdpa[PDP_MAX]; /* PDP storage */</span><br><span> static struct pdp_t *hashtid[PDP_MAX]; /* Hash table for IMSI + NSAPI */</span><br><span style="color: hsl(0, 100%, 40%);">-/* struct pdp_t* haship[PDP_MAX]; Hash table for IP and network interface */</span><br><span> </span><br><span> /* ***********************************************************</span><br><span> * Functions related to PDP storage</span><br><span>@@ -291,77 +290,7 @@</span><br><span> ((uint64_t) nsapi << 60));</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_iphash(void* ipif, struct ul66_t *eua) {</span><br><span style="color: hsl(0, 100%, 40%);">- /#printf("IPhash %ld\n", lookup(eua->v, eua->l, ipif) % PDP_MAX);#/</span><br><span style="color: hsl(0, 100%, 40%);">- return (lookup(eua->v, eua->l, ipif) % PDP_MAX);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_ipset(struct pdp_t *pdp, void* ipif, struct ul66_t *eua) {</span><br><span style="color: hsl(0, 100%, 40%);">- int hash;</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *pdp2;</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *pdp_prev = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (PDP_DEBUG) printf("Begin pdp_ipset %d %d %2x%2x%2x%2x\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (unsigned) ipif, eua->l,</span><br><span style="color: hsl(0, 100%, 40%);">- eua->v[2], eua->v[3],</span><br><span style="color: hsl(0, 100%, 40%);">- eua->v[4], eua->v[5]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->ipnext = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->ipif = ipif;</span><br><span style="color: hsl(0, 100%, 40%);">- pdp->eua.l = eua->l;</span><br><span style="color: hsl(0, 100%, 40%);">- memcpy(pdp->eua.v, eua->v, eua->l);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- hash = pdp_iphash(pdp->ipif, &pdp->eua);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- for (pdp2 = haship[hash]; pdp2; pdp2 = pdp2->ipnext)</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_prev = pdp2;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!pdp_prev)</span><br><span style="color: hsl(0, 100%, 40%);">- haship[hash] = pdp;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_prev->ipnext = pdp;</span><br><span style="color: hsl(0, 100%, 40%);">- if (PDP_DEBUG) printf("End pdp_ipset\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_ipdel(struct pdp_t *pdp) {</span><br><span style="color: hsl(0, 100%, 40%);">- int hash = pdp_iphash(pdp->ipif, &pdp->eua);</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *pdp2;</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *pdp_prev = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (PDP_DEBUG) printf("Begin pdp_ipdel\n");</span><br><span style="color: hsl(0, 100%, 40%);">- for (pdp2 = haship[hash]; pdp2; pdp2 = pdp2->ipnext) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (pdp2 == pdp) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!pdp_prev)</span><br><span style="color: hsl(0, 100%, 40%);">- haship[hash] = pdp2->ipnext;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_prev->ipnext = pdp2->ipnext;</span><br><span style="color: hsl(0, 100%, 40%);">- if (PDP_DEBUG) printf("End pdp_ipdel: PDP found\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- pdp_prev = pdp2;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (PDP_DEBUG) printf("End pdp_ipdel: PDP not found\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return EOF; /# End of linked list and not found #/</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_ipget(struct pdp_t **pdp, void* ipif, struct ul66_t *eua) {</span><br><span style="color: hsl(0, 100%, 40%);">- int hash = pdp_iphash(ipif, eua);</span><br><span style="color: hsl(0, 100%, 40%);">- struct pdp_t *pdp2;</span><br><span style="color: hsl(0, 100%, 40%);">- /#printf("Begin pdp_ipget %d %d %2x%2x%2x%2x\n", (unsigned)ipif, eua->l,</span><br><span style="color: hsl(0, 100%, 40%);">- eua->v[2],eua->v[3],eua->v[4],eua->v[5]);#/</span><br><span style="color: hsl(0, 100%, 40%);">- for (pdp2 = haship[hash]; pdp2; pdp2 = pdp2->ipnext) {</span><br><span style="color: hsl(0, 100%, 40%);">- if ((pdp2->ipif == ipif) && (pdp2->eua.l == eua->l) &&</span><br><span style="color: hsl(0, 100%, 40%);">- (memcmp(&pdp2->eua.v, &eua->v, eua->l) == 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">- *pdp = pdp2;</span><br><span style="color: hsl(0, 100%, 40%);">- /#printf("End pdp_ipget. Found\n");#/</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (PDP_DEBUG) printf("End pdp_ipget Notfound %d %d %2x%2x%2x%2x\n",</span><br><span style="color: hsl(0, 100%, 40%);">- (unsigned)ipif, eua->l, eua->v[2],eua->v[3],eua->v[4],eua->v[5]);</span><br><span style="color: hsl(0, 100%, 40%);">- return EOF; /# End of linked list and not found #/</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-*/</span><br><span> /* Various conversion functions */</span><br><span> </span><br><span> uint64_t pdp_gettid(uint64_t imsi, uint8_t nsapi)</span><br><span>diff --git a/gtp/pdp.h b/gtp/pdp.h</span><br><span>index e48f1a1..a287113 100644</span><br><span>--- a/gtp/pdp.h</span><br><span>+++ b/gtp/pdp.h</span><br><span>@@ -262,13 +262,6 @@</span><br><span> </span><br><span> unsigned int pdp_count_secondary(struct pdp_t *pdp);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_iphash(void* ipif, struct ul66_t *eua);</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_ipset(struct pdp_t *pdp, void* ipif, struct ul66_t *eua);</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_ipdel(struct pdp_t *pdp);</span><br><span style="color: hsl(0, 100%, 40%);">-int pdp_ipget(struct pdp_t **pdp, void* ipif, struct ul66_t *eua);</span><br><span style="color: hsl(0, 100%, 40%);">-*/</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> uint64_t pdp_gettid(uint64_t imsi, uint8_t nsapi);</span><br><span> </span><br><span> #endif /* !_PDP_H */</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/14294">change 14294</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/14294"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ife3f222daa87f0630ff34ffc3e63f4dad2ad914b </div>
<div style="display:none"> Gerrit-Change-Number: 14294 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>