dccp: API to query the current TX/RX CCID

This provides function to query the current TX/RX CCID dynamically,
without reliance on the minisock value, using dynamic information
available in the currently loaded CCID module.

This query function is then used to
 (a) provide the getsockopt part for getting/setting CCIDs via sockopts;
 (b) replace the current test for "which CCID is in use" in probe.c.

Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 0 deletions

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 445884cf1c29..ea85c423cdbd 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -662,6 +662,16 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname,
                 break;
         case DCCP_SOCKOPT_AVAILABLE_CCIDS:
                 return ccid_getsockopt_builtin_ccids(sk, len, optval, optlen);
+        case DCCP_SOCKOPT_TX_CCID:
+                val = ccid_get_current_tx_ccid(dp);
+                if (val < 0)
+                        return -ENOPROTOOPT;
+                break;
+        case DCCP_SOCKOPT_RX_CCID:
+                val = ccid_get_current_rx_ccid(dp);
+                if (val < 0)
+                        return -ENOPROTOOPT;
+                break;
         case DCCP_SOCKOPT_SERVER_TIMEWAIT:
                 val = dp->dccps_server_timewait;
                 break;