[DCCP]: Allow to parse options on Request Sockets

The option parsing code currently only parses on full sk's. This causes a problem for
options sent during the initial handshake (in particular timestamps and feature-negotiation
options). Therefore, this patch extends the option parsing code with an additional argument
for request_socks: if it is non-NULL, options are parsed on the request socket, otherwise
the normal path (parsing on the sk) is used.

Subsequent patches, which implement feature negotiation during connection setup, make use
of this facility.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 4 deletions

diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c
index db17b83e8d3e..02fc91ce2505 100644
--- a/net/dccp/ipv4.c
+++ b/net/dccp/ipv4.c
@@ -600,11 +600,12 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
         if (req == NULL)
                 goto drop;
 
-        if (dccp_parse_options(sk, skb))
-                goto drop_and_free;
-
         dccp_reqsk_init(req, skb);
 
+        dreq = dccp_rsk(req);
+        if (dccp_parse_options(sk, dreq, skb))
+                goto drop_and_free;
+
         if (security_inet_conn_request(sk, skb, req))
                 goto drop_and_free;
 
@@ -621,7 +622,6 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
          * In fact we defer setting S.GSR, S.SWL, S.SWH to
          * dccp_create_openreq_child.
          */
-        dreq = dccp_rsk(req);
         dreq->dreq_isr     = dcb->dccpd_seq;
         dreq->dreq_iss     = dccp_v4_init_sequence(skb);
         dreq->dreq_service = service;