aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/reassembly.c
diff options
context:
space:
mode:
authorPavel Emelyanov <xemul@openvz.org>2007-10-17 22:47:21 -0400
committerDavid S. Miller <davem@davemloft.net>2007-10-17 22:47:21 -0400
commitabd6523d15f40bfee14652619a31a7f65f77f581 (patch)
treead5692b3c115c4859b99a5e87db8d4b2d991e5a8 /net/ipv6/reassembly.c
parentc6fda282294da882f8d8cc4c513940277dd380f5 (diff)
[INET]: Consolidate xxx_find() in fragment management
Here we need another callback ->match to check whether the entry found in hash matches the key passed. The key used is the same as the creation argument for inet_frag_create. Yet again, this ->match is the same for netfilter and ipv6. Running a frew steps forward - this callback will later replace the ->equal one. Since the inet_frag_find() uses the already consolidated inet_frag_create() remove the xxx_frag_create from protocol codes. Signed-off-by: Pavel Emelyanov <xemul@openvz.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv6/reassembly.c')
-rw-r--r--net/ipv6/reassembly.c50
1 files changed, 19 insertions, 31 deletions
diff --git a/net/ipv6/reassembly.c b/net/ipv6/reassembly.c
index ce8734028d94..11fffe791fc4 100644
--- a/net/ipv6/reassembly.c
+++ b/net/ipv6/reassembly.c
@@ -155,6 +155,18 @@ int ip6_frag_equal(struct inet_frag_queue *q1, struct inet_frag_queue *q2)
155} 155}
156EXPORT_SYMBOL(ip6_frag_equal); 156EXPORT_SYMBOL(ip6_frag_equal);
157 157
158int ip6_frag_match(struct inet_frag_queue *q, void *a)
159{
160 struct frag_queue *fq;
161 struct ip6_create_arg *arg = a;
162
163 fq = container_of(q, struct frag_queue, q);
164 return (fq->id == arg->id &&
165 ipv6_addr_equal(&fq->saddr, arg->src) &&
166 ipv6_addr_equal(&fq->daddr, arg->dst));
167}
168EXPORT_SYMBOL(ip6_frag_match);
169
158/* Memory Tracking Functions. */ 170/* Memory Tracking Functions. */
159static inline void frag_kfree_skb(struct sk_buff *skb, int *work) 171static inline void frag_kfree_skb(struct sk_buff *skb, int *work)
160{ 172{
@@ -245,20 +257,20 @@ out:
245 fq_put(fq); 257 fq_put(fq);
246} 258}
247 259
248/* Creation primitives. */ 260static __inline__ struct frag_queue *
249 261fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst,
250static struct frag_queue * 262 struct inet6_dev *idev)
251ip6_frag_create(__be32 id, struct in6_addr *src, struct in6_addr *dst,
252 struct inet6_dev *idev, unsigned int hash)
253{ 263{
254 struct inet_frag_queue *q; 264 struct inet_frag_queue *q;
255 struct ip6_create_arg arg; 265 struct ip6_create_arg arg;
266 unsigned int hash;
256 267
257 arg.id = id; 268 arg.id = id;
258 arg.src = src; 269 arg.src = src;
259 arg.dst = dst; 270 arg.dst = dst;
271 hash = ip6qhashfn(id, src, dst);
260 272
261 q = inet_frag_create(&ip6_frags, &arg, hash); 273 q = inet_frag_find(&ip6_frags, &arg, hash);
262 if (q == NULL) 274 if (q == NULL)
263 goto oom; 275 goto oom;
264 276
@@ -269,31 +281,6 @@ oom:
269 return NULL; 281 return NULL;
270} 282}
271 283
272static __inline__ struct frag_queue *
273fq_find(__be32 id, struct in6_addr *src, struct in6_addr *dst,
274 struct inet6_dev *idev)
275{
276 struct frag_queue *fq;
277 struct hlist_node *n;
278 unsigned int hash;
279
280 read_lock(&ip6_frags.lock);
281 hash = ip6qhashfn(id, src, dst);
282 hlist_for_each_entry(fq, n, &ip6_frags.hash[hash], q.list) {
283 if (fq->id == id &&
284 ipv6_addr_equal(src, &fq->saddr) &&
285 ipv6_addr_equal(dst, &fq->daddr)) {
286 atomic_inc(&fq->q.refcnt);
287 read_unlock(&ip6_frags.lock);
288 return fq;
289 }
290 }
291 read_unlock(&ip6_frags.lock);
292
293 return ip6_frag_create(id, src, dst, idev, hash);
294}
295
296
297static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb, 284static int ip6_frag_queue(struct frag_queue *fq, struct sk_buff *skb,
298 struct frag_hdr *fhdr, int nhoff) 285 struct frag_hdr *fhdr, int nhoff)
299{ 286{
@@ -673,6 +660,7 @@ void __init ipv6_frag_init(void)
673 ip6_frags.destructor = ip6_frag_free; 660 ip6_frags.destructor = ip6_frag_free;
674 ip6_frags.skb_free = NULL; 661 ip6_frags.skb_free = NULL;
675 ip6_frags.qsize = sizeof(struct frag_queue); 662 ip6_frags.qsize = sizeof(struct frag_queue);
663 ip6_frags.match = ip6_frag_match;
676 ip6_frags.equal = ip6_frag_equal; 664 ip6_frags.equal = ip6_frag_equal;
677 ip6_frags.frag_expire = ip6_frag_expire; 665 ip6_frags.frag_expire = ip6_frag_expire;
678 inet_frags_init(&ip6_frags); 666 inet_frags_init(&ip6_frags);