[DCCP]: tidy up dccp_v{4,6}_conn_request
This is a code simplification to remove reduplicated code by concentrating and abstracting shared code. Detailed Changes:
This commit is contained in:

committed by
David S. Miller

parent
f45b3ec481
commit
cf557926f6
@@ -427,7 +427,6 @@ static struct sock *dccp_v6_hnd_req(struct sock *sk,struct sk_buff *skb)
|
||||
|
||||
static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
|
||||
{
|
||||
struct dccp_sock dp;
|
||||
struct request_sock *req;
|
||||
struct dccp_request_sock *dreq;
|
||||
struct inet6_request_sock *ireq6;
|
||||
@@ -459,9 +458,10 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
|
||||
if (req == NULL)
|
||||
goto drop;
|
||||
|
||||
/* FIXME: process options */
|
||||
if (dccp_parse_options(sk, skb))
|
||||
goto drop_and_free;
|
||||
|
||||
dccp_openreq_init(req, &dp, skb);
|
||||
dccp_reqsk_init(req, skb);
|
||||
|
||||
if (security_inet_conn_request(sk, skb, req))
|
||||
goto drop_and_free;
|
||||
@@ -469,7 +469,6 @@ static int dccp_v6_conn_request(struct sock *sk, struct sk_buff *skb)
|
||||
ireq6 = inet6_rsk(req);
|
||||
ipv6_addr_copy(&ireq6->rmt_addr, &skb->nh.ipv6h->saddr);
|
||||
ipv6_addr_copy(&ireq6->loc_addr, &skb->nh.ipv6h->daddr);
|
||||
req->rcv_wnd = dccp_feat_default_sequence_window;
|
||||
ireq6->pktopts = NULL;
|
||||
|
||||
if (ipv6_opt_accepted(sk, skb) ||
|
||||
|
Reference in New Issue
Block a user