dccp: Set per-connection CCIDs via socket options

With this patch, TX/RX CCIDs can now be changed on a per-connection basis, which
overrides the defaults set by the global sysctl variables for TX/RX CCIDs.

To make full use of this facility, the remaining patches of this patch set are
needed, which track dependencies and activate negotiated feature values.

Note on the maximum number of CCIDs that can be registered:
-----------------------------------------------------------
The maximum number of CCIDs that can be registered on the socket is constrained
by the space in a Confirm/Change feature negotiation option. 

The space in these in turn depends on the size of header options as defined
in RFC 4340, 5.8. Since this is a recurring constant, it has been moved from
ackvec.h into linux/dccp.h, clarifying its purpose.

Relative to this size, the maximum number of CCID identifiers that can be 
present in a Confirm option (which always consumes 1 byte more than a Change
option, cf. 6.1) is 2 bytes less than the maximum TLV size: one for the
CCID-feature-type and one for the selected value.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>

1 files changed, 34 insertions, 0 deletions

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index e29bbf914057..2cd56df44d8e 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -506,6 +506,36 @@ static int dccp_setsockopt_cscov(struct sock *sk, int cscov, bool rx)
         return rc;
 }
 
+static int dccp_setsockopt_ccid(struct sock *sk, int type,
+                                char __user *optval, int optlen)
+{
+        u8 *val;
+        int rc = 0;
+
+        if (optlen < 1 || optlen > DCCP_FEAT_MAX_SP_VALS)
+                return -EINVAL;
+
+        val = kmalloc(optlen, GFP_KERNEL);
+        if (val == NULL)
+                return -ENOMEM;
+
+        if (copy_from_user(val, optval, optlen)) {
+                kfree(val);
+                return -EFAULT;
+        }
+
+        lock_sock(sk);
+        if (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID)
+                rc = dccp_feat_register_sp(sk, DCCPF_CCID, 1, val, optlen);
+
+        if (!rc && (type == DCCP_SOCKOPT_RX_CCID || type == DCCP_SOCKOPT_CCID))
+                rc = dccp_feat_register_sp(sk, DCCPF_CCID, 0, val, optlen);
+        release_sock(sk);
+
+        kfree(val);
+        return rc;
+}
+
 static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
                 char __user *optval, int optlen)
 {
@@ -520,6 +550,10 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
         case DCCP_SOCKOPT_CHANGE_R:
                 DCCP_WARN("sockopt(CHANGE_L/R) is deprecated: fix your app\n");
                 return 0;
+        case DCCP_SOCKOPT_CCID:
+        case DCCP_SOCKOPT_RX_CCID:
+        case DCCP_SOCKOPT_TX_CCID:
+                return dccp_setsockopt_ccid(sk, optname, optval, optlen);
         }
 
         if (optlen < (int)sizeof(int))