[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:

diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 7b859a7238269f1e55c61d7ecbf15307343ef94e..2990bfb12587ef3645bf2ecd440892d96e4f8f2c 100644 (file)
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -155,18 +155,7 @@ extern const char *dccp_state_name(const int state);
 extern void dccp_set_state(struct sock *sk, const int state);
 extern void dccp_done(struct sock *sk);
 
-static inline void dccp_openreq_init(struct request_sock *req,
-                                    struct dccp_sock *dp,
-                                    struct sk_buff *skb)
-{
-       /*
-        * FIXME: fill in the other req fields from the DCCP options
-        * received
-        */
-       inet_rsk(req)->rmt_port = dccp_hdr(skb)->dccph_sport;
-       inet_rsk(req)->acked    = 0;
-       req->rcv_wnd = 0;
-}
+extern void dccp_reqsk_init(struct request_sock *req, struct sk_buff *skb);
 
 extern int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb);
 

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index ed6202652bccd66d4bc1ef03059656c968f3eca7..d75ce8c7e488f677984dc47e8b1ab1241eddb6f6 100644 (file)
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -636,11 +636,8 @@ static struct request_sock_ops dccp_request_sock_ops __read_mostly = {
 int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
 {
        struct inet_request_sock *ireq;
-       struct dccp_sock dp;
        struct request_sock *req;
        struct dccp_request_sock *dreq;
-       const __be32 saddr = skb->nh.iph->saddr;
-       const __be32 daddr = skb->nh.iph->daddr;
        const __be32 service = dccp_hdr_request(skb)->dccph_req_service;
        struct dccp_skb_cb *dcb = DCCP_SKB_CB(skb);
        __u8 reset_code = DCCP_RESET_CODE_TOO_BUSY;
@@ -680,14 +677,14 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
        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;
 
        ireq = inet_rsk(req);
-       ireq->loc_addr = daddr;
-       ireq->rmt_addr = saddr;
+       ireq->loc_addr = skb->nh.iph->daddr;
+       ireq->rmt_addr = skb->nh.iph->saddr;
        req->rcv_wnd    = dccp_feat_default_sequence_window;
        ireq->opt       = NULL;
 

diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c
index ed4a502638023f40d5a8aa11d75cfda987c1a871..19a4f763099d81036027fc36ed4bc5d53152442b 100644 (file)
--- a/net/dccp/ipv6.c
+++ b/net/dccp/ipv6.c
@@ -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) ||

diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c
index 5f3e1a4c036b7cce6eb87ce49f230f05400bc84d..0f228ab5169d5acc111e0b7c68ad0492cfc6eccc 100644 (file)
--- a/net/dccp/minisocks.c
+++ b/net/dccp/minisocks.c
@@ -293,3 +293,12 @@ void dccp_reqsk_send_ack(struct sk_buff *skb, struct request_sock *rsk)
 }
 
 EXPORT_SYMBOL_GPL(dccp_reqsk_send_ack);
+
+void dccp_reqsk_init(struct request_sock *req, struct sk_buff *skb)
+{
+       inet_rsk(req)->rmt_port = dccp_hdr(skb)->dccph_sport;
+       inet_rsk(req)->acked    = 0;
+       req->rcv_wnd            = dccp_feat_default_sequence_window;
+}
+
+EXPORT_SYMBOL_GPL(dccp_reqsk_init);