Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 283fb4a5 authored by Gerrit Renker's avatar Gerrit Renker
Browse files

dccp ccid-2: Consolidate Ack-Vector processing within main DCCP module 



This aggregates Ack Vector processing (handling input and clearing old state)
into one function, for the following reasons and benefits:
 * all Ack Vector-specific processing is now in one place;
 * duplicated code is removed;
 * ensuring sanity: from an Ack Vector point of view, it is better to clear the
                    old state first before entering new state;
 * Ack Event handling happens mostly within the CCIDs, not the main DCCP module.

Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
parent e28fe59f

net/dccp/input.c

+9 −22
Original line number Diff line number Diff line
@@ -159,13 +159,15 @@ static void dccp_rcv_reset(struct sock *sk, struct sk_buff *skb) 
	dccp_time_wait(sk, DCCP_TIME_WAIT, 0);

}



static void dccp_event_ack_recv(struct sock *sk, struct sk_buff *skb)

static void dccp_handle_ackvec_processing(struct sock *sk, struct sk_buff *skb)

{

	struct dccp_sock *dp = dccp_sk(sk);

	struct dccp_ackvec *av = dccp_sk(sk)->dccps_hc_rx_ackvec;



	if (dp->dccps_hc_rx_ackvec != NULL)

		dccp_ackvec_clear_state(dp->dccps_hc_rx_ackvec,

					DCCP_SKB_CB(skb)->dccpd_ack_seq);

	if (av == NULL)

		return;

	if (DCCP_SKB_CB(skb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)

		dccp_ackvec_clear_state(av, DCCP_SKB_CB(skb)->dccpd_ack_seq);

	dccp_ackvec_input(av, skb);

}



static void dccp_deliver_input_to_ccids(struct sock *sk, struct sk_buff *skb)
@@ -364,21 +366,13 @@ static int __dccp_rcv_established(struct sock *sk, struct sk_buff *skb, 
int dccp_rcv_established(struct sock *sk, struct sk_buff *skb,

			 const struct dccp_hdr *dh, const unsigned len)

{

	struct dccp_sock *dp = dccp_sk(sk);



	if (dccp_check_seqno(sk, skb))

		goto discard;



	if (dccp_parse_options(sk, NULL, skb))

		return 1;



	if (DCCP_SKB_CB(skb)->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)

		dccp_event_ack_recv(sk, skb);



	if (dp->dccps_hc_rx_ackvec != NULL &&

	    dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk,

			    DCCP_SKB_CB(skb)->dccpd_seq, DCCPAV_RECEIVED))

		goto discard;

	dccp_handle_ackvec_processing(sk, skb);

	dccp_deliver_input_to_ccids(sk, skb);



	return __dccp_rcv_established(sk, skb, dh, len);
@@ -621,14 +615,7 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, 
		if (dccp_parse_options(sk, NULL, skb))

			return 1;



		if (dcb->dccpd_ack_seq != DCCP_PKT_WITHOUT_ACK_SEQ)

			dccp_event_ack_recv(sk, skb);



		if (dp->dccps_hc_rx_ackvec != NULL &&

		    dccp_ackvec_add(dp->dccps_hc_rx_ackvec, sk,

				    DCCP_SKB_CB(skb)->dccpd_seq, DCCPAV_RECEIVED))

			goto discard;



		dccp_handle_ackvec_processing(sk, skb);

		dccp_deliver_input_to_ccids(sk, skb);

	}