diff options
| author | Eric Dumazet <edumazet@google.com> | 2015-09-29 07:42:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-29 16:53:08 -0700 |
| commit | f76b33c32b1913dd8909d8509f2726b1661aa6b1 (patch) | |
| tree | 6b2d005f324ed9aefdd446e533702d3c1484eba7 /net/dccp | |
| parent | 72ab4a86f7a260d4c2a320b49662da107ce77a81 (diff) | |
| download | op-kernel-dev-f76b33c32b1913dd8909d8509f2726b1661aa6b1.zip op-kernel-dev-f76b33c32b1913dd8909d8509f2726b1661aa6b1.tar.gz | |
dccp: use inet6_csk_route_req() helper
Before changing dccp_v6_request_recv_sock() sock argument
to const, we need to get rid of security_sk_classify_flow(),
and it seems doable by reusing inet6_csk_route_req() helper.
We need to add a proto parameter to inet6_csk_route_req(),
not assume it is TCP.
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/ipv6.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index aa719e7..0966bc0 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -462,22 +462,11 @@ static struct sock *dccp_v6_request_recv_sock(struct sock *sk, if (sk_acceptq_is_full(sk)) goto out_overflow; - if (dst == NULL) { - struct in6_addr *final_p, final; + if (!dst) { struct flowi6 fl6; - memset(&fl6, 0, sizeof(fl6)); - fl6.flowi6_proto = IPPROTO_DCCP; - fl6.daddr = ireq->ir_v6_rmt_addr; - final_p = fl6_update_dst(&fl6, np->opt, &final); - fl6.saddr = ireq->ir_v6_loc_addr; - fl6.flowi6_oif = sk->sk_bound_dev_if; - fl6.fl6_dport = ireq->ir_rmt_port; - fl6.fl6_sport = htons(ireq->ir_num); - security_sk_classify_flow(sk, flowi6_to_flowi(&fl6)); - - dst = ip6_dst_lookup_flow(sk, &fl6, final_p); - if (IS_ERR(dst)) + dst = inet6_csk_route_req(sk, &fl6, req, IPPROTO_DCCP); + if (!dst) goto out; } |
