Commit 71c262a3 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files

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: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarIan McDonald <ian.mcdonald@jandi.co.nz>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b20a9c24

net/dccp/ccid.h

+18 −0
Original line number Diff line number Diff line
@@ -116,6 +116,24 @@ extern struct ccid *ccid_hc_rx_new(unsigned char id, struct sock *sk, 
extern struct ccid *ccid_hc_tx_new(unsigned char id, struct sock *sk,

				   gfp_t gfp);



static inline int ccid_get_current_rx_ccid(struct dccp_sock *dp)

{

	struct ccid *ccid = dp->dccps_hc_rx_ccid;



	if (ccid == NULL || ccid->ccid_ops == NULL)

		return -1;

	return ccid->ccid_ops->ccid_id;

}



static inline int ccid_get_current_tx_ccid(struct dccp_sock *dp)

{

	struct ccid *ccid = dp->dccps_hc_tx_ccid;



	if (ccid == NULL || ccid->ccid_ops == NULL)

		return -1;

	return ccid->ccid_ops->ccid_id;

}



extern void ccid_hc_rx_delete(struct ccid *ccid, struct sock *sk);

extern void ccid_hc_tx_delete(struct ccid *ccid, struct sock *sk);

net/dccp/probe.c

+2 −5
Original line number Diff line number Diff line
@@ -74,14 +74,11 @@ static void printl(const char *fmt, ...) 
static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,

			 struct msghdr *msg, size_t size)

{

	const struct dccp_minisock *dmsk = dccp_msk(sk);

	const struct inet_sock *inet = inet_sk(sk);

	const struct ccid3_hc_tx_sock *hctx;

	struct ccid3_hc_tx_sock *hctx = NULL;



	if (dmsk->dccpms_tx_ccid == DCCPC_CCID3)

	if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)

		hctx = ccid3_hc_tx_sk(sk);

	else

		hctx = NULL;



	if (port == 0 || ntohs(inet->dport) == port ||

	    ntohs(inet->sport) == port) {

net/dccp/proto.c

+10 −0
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE