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

[DCCP]: Only deliver to the CCID rx side in charge 



This is an optimisation to reduce CPU load. The received feedback is now
only directed to the active CCID component, without requiring processing
also by the inactive one.

As a consequence, a similar test in ccid3.c is now redundant and is
also removed.

Justification:

 Currently DCCP works as a unidirectional service, i.e. a listening server
 is not at the same time a connecting client.
 As far as I can see, several modifications are necessary until that
 becomes possible.
 At the present time, received feedback is both fed to the rx/tx CCID
 modules. In unidirectional service, only one of these is active at any
 one time.

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 avatarArnaldo Carvalho de Melo <acme@mandriva.com>
parent d63d8364

net/dccp/ccids/ccid3.c

+3 −3
Original line number Diff line number Diff line
@@ -543,7 +543,7 @@ static void ccid3_hc_tx_packet_recv(struct sock *sk, struct sk_buff *skb) 
		hctx->ccid3hctx_idle = 1;

		break;

	case TFRC_SSTATE_NO_SENT:

		if (dccp_sk(sk)->dccps_role == DCCP_ROLE_CLIENT)

		/* XXX when implementing bidirectional rx/tx check this again */

		DCCP_WARN("Illegal ACK received - no packet sent\n");

		/* fall through */

	case TFRC_SSTATE_TERM:		/* ignore feedback when closing */

net/dccp/input.c

+17 −4
Original line number Diff line number Diff line
@@ -248,7 +248,17 @@ int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 
			    DCCP_ACKVEC_STATE_RECEIVED))

		goto discard;



	/*

	 * Deliver to the CCID module in charge.

	 * FIXME: Currently DCCP operates one-directional only, i.e. a listening

	 *        server is not at the same time a connecting client. There is

	 *        not much sense in delivering to both rx/tx sides at the moment

	 *        (only one is active at a time); when moving to bidirectional

	 *        service, this needs to be revised.

	 */

	if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)

		ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);

	else

		ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);



	return __dccp_rcv_established(sk, skb, dh, len);
@@ -484,7 +494,10 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
 				    DCCP_ACKVEC_STATE_RECEIVED))

 			goto discard;



		/* XXX see the comments in dccp_rcv_established about this */

		if (dccp_sk(sk)->dccps_role == DCCP_ROLE_SERVER)

			ccid_hc_rx_packet_recv(dp->dccps_hc_rx_ccid, sk, skb);

		else

			ccid_hc_tx_packet_recv(dp->dccps_hc_tx_ccid, sk, skb);

	}