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

Commit ae31c339 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by David S. Miller
Browse files

[DCCP]: Move the ack vector code to net/dccp/ackvec.[ch] 



Isolating it, that will be used when we introduce a CCID2 (TCP-Like)
implementation.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@mandriva.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21f130a2

include/linux/dccp.h

+5 −9
Original line number Diff line number Diff line
@@ -353,14 +353,8 @@ static inline struct dccp_request_sock *dccp_rsk(const struct request_sock *req) 


extern struct inet_timewait_death_row dccp_death_row;



/* Read about the ECN nonce to see why it is 253 */

#define DCCP_MAX_ACK_VECTOR_LEN 253



struct dccp_options_received {

	u32	dccpor_ndp:24,

		dccpor_ack_vector_len:8;

	u32	dccpor_ack_vector_idx:10;

	/* 22 bits hole, try to pack */

	u32	dccpor_ndp; /* only 24 bits */

	u32	dccpor_timestamp;

	u32	dccpor_timestamp_echo;

	u32	dccpor_elapsed_time;
@@ -394,6 +388,8 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl, 
	return 0;

}



struct dccp_ackvec;



/**

 * struct dccp_sock - DCCP socket state

 *
@@ -414,7 +410,7 @@ static inline int dccp_list_has_service(const struct dccp_service_list *sl, 
 * @dccps_packet_size - Set thru setsockopt

 * @dccps_role - Role of this sock, one of %dccp_role

 * @dccps_ndp_count - number of Non Data Packets since last data packet

 * @dccps_hc_rx_ackpkts - receiver half connection acked packets

 * @dccps_hc_rx_ackvec - rx half connection ack vector

 */

struct dccp_sock {

	/* inet_connection_sock has to be the first member of dccp_sock */
@@ -439,7 +435,7 @@ struct dccp_sock { 
	__u32				dccps_pmtu_cookie;

	__u32				dccps_mss_cache;

	struct dccp_options		dccps_options;

	struct dccp_ackpkts		*dccps_hc_rx_ackpkts;

	struct dccp_ackvec		*dccps_hc_rx_ackvec;

	void				*dccps_hc_rx_ccid_private;

	void				*dccps_hc_tx_ccid_private;

	struct ccid			*dccps_hc_rx_ccid;

net/dccp/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ obj-$(CONFIG_IP_DCCP) += dccp.o 
dccp-y := ccid.o input.o ipv4.o minisocks.o options.o output.o proto.o \

	  timer.o



dccp-$(CONFIG_IP_DCCP_ACKVEC) += ackvec.o



obj-$(CONFIG_INET_DCCP_DIAG) += dccp_diag.o



dccp_diag-y := diag.o

net/dccp/ackvec.c

0 → 100644
+419 −0
Original line number Diff line number Diff line 
/*

 *  net/dccp/ackvec.c

 *

 *  An implementation of the DCCP protocol

 *  Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

 *

 *      This program is free software; you can redistribute it and/or modify it

 *      under the terms of the GNU General Public License as published by the

 *      Free Software Foundation; version 2 of the License;

 */



#include "ackvec.h"

#include "dccp.h"



#include <linux/dccp.h>

#include <linux/skbuff.h>



#include <net/sock.h>



int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb)

{

	struct dccp_sock *dp = dccp_sk(sk);

	struct dccp_ackvec *av = dp->dccps_hc_rx_ackvec;

	int len = av->dccpav_vec_len + 2;

	struct timeval now;

	u32 elapsed_time;

	unsigned char *to, *from;



	dccp_timestamp(sk, &now);

	elapsed_time = timeval_delta(&now, &av->dccpav_time) / 10;



	if (elapsed_time != 0)

		dccp_insert_option_elapsed_time(sk, skb, elapsed_time);



	if (DCCP_SKB_CB(skb)->dccpd_opt_len + len > DCCP_MAX_OPT_LEN)

		return -1;



	/*

	 * XXX: now we have just one ack vector sent record, so

	 * we have to wait for it to be cleared.

	 *

	 * Of course this is not acceptable, but this is just for

	 * basic testing now.

	 */

	if (av->dccpav_ack_seqno != DCCP_MAX_SEQNO + 1)

		return -1;



	DCCP_SKB_CB(skb)->dccpd_opt_len += len;



	to    = skb_push(skb, len);

	*to++ = DCCPO_ACK_VECTOR_0;

	*to++ = len;



	len  = av->dccpav_vec_len;

	from = av->dccpav_buf + av->dccpav_buf_head;



	/* Check if buf_head wraps */

	if (av->dccpav_buf_head + len > av->dccpav_vec_len) {

		const u32 tailsize = (av->dccpav_vec_len - av->dccpav_buf_head);



		memcpy(to, from, tailsize);

		to   += tailsize;

		len  -= tailsize;

		from = av->dccpav_buf;

	}



	memcpy(to, from, len);

	/*

	 *	From draft-ietf-dccp-spec-11.txt:

	 *

	 *	For each acknowledgement it sends, the HC-Receiver will add an

	 *	acknowledgement record.  ack_seqno will equal the HC-Receiver

	 *	sequence number it used for the ack packet; ack_ptr will equal

	 *	buf_head; ack_ackno will equal buf_ackno; and ack_nonce will

	 *	equal buf_nonce.

	 *

	 * This implemention uses just one ack record for now.

	 */

	av->dccpav_ack_seqno = DCCP_SKB_CB(skb)->dccpd_seq;

	av->dccpav_ack_ptr   = av->dccpav_buf_head;

	av->dccpav_ack_ackno = av->dccpav_buf_ackno;

	av->dccpav_ack_nonce = av->dccpav_buf_nonce;

	av->dccpav_sent_len  = av->dccpav_vec_len;



	dccp_pr_debug("%sACK Vector 0, len=%d, ack_seqno=%llu, "

		      "ack_ackno=%llu\n",

		      debug_prefix, av->dccpav_sent_len,

		      (unsigned long long)av->dccpav_ack_seqno,

		      (unsigned long long)av->dccpav_ack_ackno);

	return -1;

}



struct dccp_ackvec *dccp_ackvec_alloc(const unsigned int len,

				      const unsigned int __nocast priority)

{

	struct dccp_ackvec *av = kmalloc(sizeof(*av) + len, priority);



	if (av != NULL) {

		av->dccpav_buf_len	= len;

		av->dccpav_buf_head	=

			av->dccpav_buf_tail = av->dccpav_buf_len - 1;

		av->dccpav_buf_ackno	=

			av->dccpav_ack_ackno = av->dccpav_ack_seqno = ~0LLU;

		av->dccpav_buf_nonce = av->dccpav_buf_nonce = 0;

		av->dccpav_ack_ptr	= 0;

		av->dccpav_time.tv_sec	= 0;

		av->dccpav_time.tv_usec	= 0;

		av->dccpav_sent_len	= av->dccpav_vec_len = 0;

	}



	return av;

}



void dccp_ackvec_free(struct dccp_ackvec *av)

{

	kfree(av);

}



static inline u8 dccp_ackvec_state(const struct dccp_ackvec *av,

				   const unsigned int index)

{

	return av->dccpav_buf[index] & DCCP_ACKVEC_STATE_MASK;

}



static inline u8 dccp_ackvec_len(const struct dccp_ackvec *av,

				 const unsigned int index)

{

	return av->dccpav_buf[index] & DCCP_ACKVEC_LEN_MASK;

}



/*

 * If several packets are missing, the HC-Receiver may prefer to enter multiple

 * bytes with run length 0, rather than a single byte with a larger run length;

 * this simplifies table updates if one of the missing packets arrives.

 */

static inline int dccp_ackvec_set_buf_head_state(struct dccp_ackvec *av,

						 const unsigned int packets,

						  const unsigned char state)

{

	unsigned int gap;

	signed long new_head;



	if (av->dccpav_vec_len + packets > av->dccpav_buf_len)

		return -ENOBUFS;



	gap	 = packets - 1;

	new_head = av->dccpav_buf_head - packets;



	if (new_head < 0) {

		if (gap > 0) {

			memset(av->dccpav_buf, DCCP_ACKVEC_STATE_NOT_RECEIVED,

			       gap + new_head + 1);

			gap = -new_head;

		}

		new_head += av->dccpav_buf_len;

	} 



	av->dccpav_buf_head = new_head;



	if (gap > 0)

		memset(av->dccpav_buf + av->dccpav_buf_head + 1,

		       DCCP_ACKVEC_STATE_NOT_RECEIVED, gap);



	av->dccpav_buf[av->dccpav_buf_head] = state;

	av->dccpav_vec_len += packets;

	return 0;

}



/*

 * Implements the draft-ietf-dccp-spec-11.txt Appendix A

 */

int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk,

		    const u64 ackno, const u8 state)

{

	/*

	 * Check at the right places if the buffer is full, if it is, tell the

	 * caller to start dropping packets till the HC-Sender acks our ACK

	 * vectors, when we will free up space in dccpav_buf.

	 *

	 * We may well decide to do buffer compression, etc, but for now lets

	 * just drop.

	 *

	 * From Appendix A:

	 *

	 *	Of course, the circular buffer may overflow, either when the

	 *	HC-Sender is sending data at a very high rate, when the

	 *	HC-Receiver's acknowledgements are not reaching the HC-Sender,

	 *	or when the HC-Sender is forgetting to acknowledge those acks

	 *	(so the HC-Receiver is unable to clean up old state). In this

	 *	case, the HC-Receiver should either compress the buffer (by

	 *	increasing run lengths when possible), transfer its state to

	 *	a larger buffer, or, as a last resort, drop all received

	 *	packets, without processing them whatsoever, until its buffer

	 *	shrinks again.

	 */



	/* See if this is the first ackno being inserted */

	if (av->dccpav_vec_len == 0) {

		av->dccpav_buf[av->dccpav_buf_head] = state;

		av->dccpav_vec_len = 1;

	} else if (after48(ackno, av->dccpav_buf_ackno)) {

		const u64 delta = dccp_delta_seqno(av->dccpav_buf_ackno,

						   ackno);



		/*

		 * Look if the state of this packet is the same as the

		 * previous ackno and if so if we can bump the head len.

		 */

		if (delta == 1 &&

		    dccp_ackvec_state(av, av->dccpav_buf_head) == state &&

		    (dccp_ackvec_len(av, av->dccpav_buf_head) <

		     DCCP_ACKVEC_LEN_MASK))

			av->dccpav_buf[av->dccpav_buf_head]++;

		else if (dccp_ackvec_set_buf_head_state(av, delta, state))

			return -ENOBUFS;

	} else {

		/*

		 * A.1.2.  Old Packets

		 *

		 *	When a packet with Sequence Number S arrives, and

		 *	S <= buf_ackno, the HC-Receiver will scan the table

		 *	for the byte corresponding to S. (Indexing structures

		 *	could reduce the complexity of this scan.)

		 */

		u64 delta = dccp_delta_seqno(ackno, av->dccpav_buf_ackno);

		unsigned int index = av->dccpav_buf_head;



		while (1) {

			const u8 len = dccp_ackvec_len(av, index);

			const u8 state = dccp_ackvec_state(av, index);

			/*

			 * valid packets not yet in dccpav_buf have a reserved

			 * entry, with a len equal to 0.

			 */

			if (state == DCCP_ACKVEC_STATE_NOT_RECEIVED &&

			    len == 0 && delta == 0) { /* Found our

							 reserved seat! */

				dccp_pr_debug("Found %llu reserved seat!\n",

					      (unsigned long long)ackno);

				av->dccpav_buf[index] = state;

				goto out;

			}

			/* len == 0 means one packet */

			if (delta < len + 1)

				goto out_duplicate;



			delta -= len + 1;

			if (++index == av->dccpav_buf_len)

				index = 0;

		}

	}



	av->dccpav_buf_ackno = ackno;

	dccp_timestamp(sk, &av->dccpav_time);

out:

	dccp_pr_debug("");

	return 0;



out_duplicate:

	/* Duplicate packet */

	dccp_pr_debug("Received a dup or already considered lost "

		      "packet: %llu\n", (unsigned long long)ackno);

	return -EILSEQ;

}



#ifdef CONFIG_IP_DCCP_DEBUG

void dccp_ackvector_print(const u64 ackno, const unsigned char *vector, int len)

{

	if (!dccp_debug)

		return;



	printk("ACK vector len=%d, ackno=%llu |", len,

	       (unsigned long long)ackno);



	while (len--) {

		const u8 state = (*vector & DCCP_ACKVEC_STATE_MASK) >> 6;

		const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK;



		printk("%d,%d|", state, rl);

		++vector;

	}



	printk("\n");

}



void dccp_ackvec_print(const struct dccp_ackvec *av)

{

	dccp_ackvector_print(av->dccpav_buf_ackno,

			     av->dccpav_buf + av->dccpav_buf_head,

			     av->dccpav_vec_len);

}

#endif



static void dccp_ackvec_trow_away_ack_record(struct dccp_ackvec *av)

{

	/*

	 * As we're keeping track of the ack vector size (dccpav_vec_len) and

	 * the sent ack vector size (dccpav_sent_len) we don't need

	 * dccpav_buf_tail at all, but keep this code here as in the future

	 * we'll implement a vector of ack records, as suggested in

	 * draft-ietf-dccp-spec-11.txt Appendix A. -acme

	 */

#if 0

	av->dccpav_buf_tail = av->dccpav_ack_ptr + 1;

	if (av->dccpav_buf_tail >= av->dccpav_vec_len)

		av->dccpav_buf_tail -= av->dccpav_vec_len;

#endif

	av->dccpav_vec_len -= av->dccpav_sent_len;

}



void dccp_ackvec_check_rcv_ackno(struct dccp_ackvec *av, struct sock *sk,

				 const u64 ackno)

{

	/* Check if we actually sent an ACK vector */

	if (av->dccpav_ack_seqno == DCCP_MAX_SEQNO + 1)

		return;



	if (ackno == av->dccpav_ack_seqno) {

#ifdef CONFIG_IP_DCCP_DEBUG

		struct dccp_sock *dp = dccp_sk(sk);

		const char *debug_prefix = dp->dccps_role == DCCP_ROLE_CLIENT ?

					"CLIENT rx ack: " : "server rx ack: ";

#endif

		dccp_pr_debug("%sACK packet 0, len=%d, ack_seqno=%llu, "

			      "ack_ackno=%llu, ACKED!\n",

			      debug_prefix, 1,

			      (unsigned long long)av->dccpav_ack_seqno,

			      (unsigned long long)av->dccpav_ack_ackno);

		dccp_ackvec_trow_away_ack_record(av);

		av->dccpav_ack_seqno = DCCP_MAX_SEQNO + 1;

	}

}



static void dccp_ackvec_check_rcv_ackvector(struct dccp_ackvec *av,

					    struct sock *sk, u64 ackno,

					    const unsigned char len,

					    const unsigned char *vector)

{

	unsigned char i;



	/* Check if we actually sent an ACK vector */

	if (av->dccpav_ack_seqno == DCCP_MAX_SEQNO + 1)

		return;

	/*

	 * We're in the receiver half connection, so if the received an ACK

	 * vector ackno (e.g. 50) before dccpav_ack_seqno (e.g. 52), we're

	 * not interested.

	 *

	 * Extra explanation with example:

	 * 

	 * if we received an ACK vector with ackno 50, it can only be acking

	 * 50, 49, 48, etc, not 52 (the seqno for the ACK vector we sent).

	 */

	/* dccp_pr_debug("is %llu < %llu? ", ackno, av->dccpav_ack_seqno); */

	if (before48(ackno, av->dccpav_ack_seqno)) {

		/* dccp_pr_debug_cat("yes\n"); */

		return;

	}

	/* dccp_pr_debug_cat("no\n"); */



	i = len;

	while (i--) {

		const u8 rl = *vector & DCCP_ACKVEC_LEN_MASK;

		u64 ackno_end_rl;



		dccp_set_seqno(&ackno_end_rl, ackno - rl);



		/*

		 * dccp_pr_debug("is %llu <= %llu <= %llu? ", ackno_end_rl,

		 * av->dccpav_ack_seqno, ackno);

		 */

		if (between48(av->dccpav_ack_seqno, ackno_end_rl, ackno)) {

			const u8 state = (*vector &

					  DCCP_ACKVEC_STATE_MASK) >> 6;

			/* dccp_pr_debug_cat("yes\n"); */



			if (state != DCCP_ACKVEC_STATE_NOT_RECEIVED) {

#ifdef CONFIG_IP_DCCP_DEBUG

				struct dccp_sock *dp = dccp_sk(sk);

				const char *debug_prefix =

					dp->dccps_role == DCCP_ROLE_CLIENT ?

					"CLIENT rx ack: " : "server rx ack: ";

#endif

				dccp_pr_debug("%sACK vector 0, len=%d, "

					      "ack_seqno=%llu, ack_ackno=%llu, "

					      "ACKED!\n",

					      debug_prefix, len,

					      (unsigned long long)

					      av->dccpav_ack_seqno,

					      (unsigned long long)

					      av->dccpav_ack_ackno);

				dccp_ackvec_trow_away_ack_record(av);

			}

			/*

			 * If dccpav_ack_seqno was not received, no problem

			 * we'll send another ACK vector.

			 */

			av->dccpav_ack_seqno = DCCP_MAX_SEQNO + 1;

			break;

		}

		/* dccp_pr_debug_cat("no\n"); */



		dccp_set_seqno(&ackno, ackno_end_rl - 1);

		++vector;

	}

}



int dccp_ackvec_parse(struct sock *sk, const struct sk_buff *skb,

		      const u8 opt, const u8 *value, const u8 len)

{

	if (len > DCCP_MAX_ACKVEC_LEN)

		return -1;



	/* dccp_ackvector_print(DCCP_SKB_CB(skb)->dccpd_ack_seq, value, len); */

	dccp_ackvec_check_rcv_ackvector(dccp_sk(sk)->dccps_hc_rx_ackvec, sk,

					DCCP_SKB_CB(skb)->dccpd_ack_seq,

				        len, value);

	return 0;

}

net/dccp/ackvec.h

0 → 100644
+133 −0
Original line number Diff line number Diff line 
#ifndef _ACKVEC_H

#define _ACKVEC_H

/*

 *  net/dccp/ackvec.h

 *

 *  An implementation of the DCCP protocol

 *  Copyright (c) 2005 Arnaldo Carvalho de Melo <acme@mandriva.com>

 *

 *	This program is free software; you can redistribute it and/or modify it

 *	under the terms of the GNU General Public License version 2 as

 *	published by the Free Software Foundation.

 */



#include <linux/config.h>

#include <linux/compiler.h>

#include <linux/time.h>

#include <linux/types.h>



/* Read about the ECN nonce to see why it is 253 */

#define DCCP_MAX_ACKVEC_LEN 253



#define DCCP_ACKVEC_STATE_RECEIVED	0

#define DCCP_ACKVEC_STATE_ECN_MARKED	(1 << 6)

#define DCCP_ACKVEC_STATE_NOT_RECEIVED	(3 << 6)



#define DCCP_ACKVEC_STATE_MASK		0xC0 /* 11000000 */

#define DCCP_ACKVEC_LEN_MASK		0x3F /* 00111111 */



/** struct dccp_ackvec - ack vector

 *

 * This data structure is the one defined in the DCCP draft

 * Appendix A.

 *

 * @dccpav_buf_head - circular buffer head

 * @dccpav_buf_tail - circular buffer tail

 * @dccpav_buf_ackno - ack # of the most recent packet acknowledgeable in the

 * 		       buffer (i.e. %dccpav_buf_head)

 * @dccpav_buf_nonce - the one-bit sum of the ECN Nonces on all packets acked

 * 		       by the buffer with State 0

 *

 * Additionally, the HC-Receiver must keep some information about the

 * Ack Vectors it has recently sent. For each packet sent carrying an

 * Ack Vector, it remembers four variables:

 *

 * @dccpav_ack_seqno - the Sequence Number used for the packet

 * 		       (HC-Receiver seqno)

 * @dccpav_ack_ptr - the value of buf_head at the time of acknowledgement.

 * @dccpav_ack_ackno - the Acknowledgement Number used for the packet

 * 		       (HC-Sender seqno)

 * @dccpav_ack_nonce - the one-bit sum of the ECN Nonces for all State 0.

 *

 * @dccpav_buf_len	- circular buffer length

 * @dccpav_time		- the time in usecs

 * @dccpav_buf - circular buffer of acknowledgeable packets

 */

struct dccp_ackvec {

	unsigned int	dccpav_buf_head;

	unsigned int	dccpav_buf_tail;

	u64		dccpav_buf_ackno;

	u64		dccpav_ack_seqno;

	u64		dccpav_ack_ackno;

	unsigned int	dccpav_ack_ptr;

	unsigned int	dccpav_sent_len;

	unsigned int	dccpav_vec_len;

	unsigned int	dccpav_buf_len;

	struct timeval	dccpav_time;

	u8		dccpav_buf_nonce;

	u8		dccpav_ack_nonce;

	u8		dccpav_buf[0];

};



struct sock;

struct sk_buff;



#ifdef CONFIG_IP_DCCP_ACKVEC

extern struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len,

					  const unsigned int __nocast priority);

extern void dccp_ackvec_free(struct dccp_ackvec *av);



extern int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk,

			   const u64 ackno, const u8 state);



extern void dccp_ackvec_check_rcv_ackno(struct dccp_ackvec *av,

					struct sock *sk, const u64 ackno);

extern int dccp_ackvec_parse(struct sock *sk, const struct sk_buff *skb,

			     const u8 opt, const u8 *value, const u8 len);



extern int dccp_insert_option_ackvec(struct sock *sk, struct sk_buff *skb);



static inline int dccp_ackvec_pending(const struct dccp_ackvec *av)

{

	return av->dccpav_sent_len != av->dccpav_vec_len;

}

#else /* CONFIG_IP_DCCP_ACKVEC */

static inline struct dccp_ackvec *dccp_ackvec_alloc(unsigned int len,

					   const unsigned int __nocast priority)

{

	return NULL;

}



static inline void dccp_ackvec_free(struct dccp_ackvec *av)

{

}



static inline int dccp_ackvec_add(struct dccp_ackvec *av, const struct sock *sk,

				  const u64 ackno, const u8 state)

{

	return -1;

}



static inline void dccp_ackvec_check_rcv_ackno(struct dccp_ackvec *av,

					       struct sock *sk, const u64 ackno)

{

}



static inline int dccp_ackvec_parse(struct sock *sk, const struct sk_buff *skb,

				    const u8 opt, const u8 *value, const u8 len)

{

	return -1;

}



static inline int dccp_insert_option_ackvec(const struct sock *sk,

					    const struct sk_buff *skb)

{

	return -1;

}



static inline int dccp_ackvec_pending(const struct dccp_ackvec *av)

{

	return 0;

}

#endif /* CONFIG_IP_DCCP_ACKVEC */

#endif /* _ACKVEC_H */

net/dccp/dccp.h

+12 −70
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <net/snmp.h>

#include <net/sock.h>

#include <net/tcp.h>

#include "ackvec.h"



#ifdef CONFIG_IP_DCCP_DEBUG

extern int dccp_debug;
@@ -359,6 +360,17 @@ static inline void dccp_update_gss(struct sock *sk, u64 seq) 
			dp->dccps_options.dccpo_sequence_window + 1));

}

				

static inline int dccp_ack_pending(const struct sock *sk)

{

	const struct dccp_sock *dp = dccp_sk(sk);

	return dp->dccps_timestamp_echo != 0 ||

#ifdef CONFIG_IP_DCCP_ACKVEC

	       (dp->dccps_options.dccpo_send_ack_vector &&

		dccp_ackvec_pending(dp->dccps_hc_rx_ackvec)) ||

#endif

	       inet_csk_ack_scheduled(sk);

}



extern void dccp_insert_options(struct sock *sk, struct sk_buff *skb);

extern void dccp_insert_option_elapsed_time(struct sock *sk,

					    struct sk_buff *skb,
@@ -371,65 +383,6 @@ extern void dccp_insert_option(struct sock *sk, struct sk_buff *skb, 


extern struct socket *dccp_ctl_socket;



#define DCCP_ACKPKTS_STATE_RECEIVED	0

#define DCCP_ACKPKTS_STATE_ECN_MARKED	(1 << 6)

#define DCCP_ACKPKTS_STATE_NOT_RECEIVED	(3 << 6)



#define DCCP_ACKPKTS_STATE_MASK		0xC0 /* 11000000 */

#define DCCP_ACKPKTS_LEN_MASK		0x3F /* 00111111 */



/** struct dccp_ackpkts - acknowledgeable packets

 *

 * This data structure is the one defined in the DCCP draft

 * Appendix A.

 *

 * @dccpap_buf_head - circular buffer head

 * @dccpap_buf_tail - circular buffer tail

 * @dccpap_buf_ackno - ack # of the most recent packet acknowledgeable in the

 * 		       buffer (i.e. %dccpap_buf_head)

 * @dccpap_buf_nonce - the one-bit sum of the ECN Nonces on all packets acked

 * 		       by the buffer with State 0

 *

 * Additionally, the HC-Receiver must keep some information about the

 * Ack Vectors it has recently sent. For each packet sent carrying an

 * Ack Vector, it remembers four variables:

 *

 * @dccpap_ack_seqno - the Sequence Number used for the packet

 * 		       (HC-Receiver seqno)

 * @dccpap_ack_ptr - the value of buf_head at the time of acknowledgement.

 * @dccpap_ack_ackno - the Acknowledgement Number used for the packet

 * 		       (HC-Sender seqno)

 * @dccpap_ack_nonce - the one-bit sum of the ECN Nonces for all State 0.

 *

 * @dccpap_buf_len - circular buffer length

 * @dccpap_time		- the time in usecs

 * @dccpap_buf - circular buffer of acknowledgeable packets

 */

struct dccp_ackpkts {

	unsigned int		dccpap_buf_head;

	unsigned int		dccpap_buf_tail;

	u64			dccpap_buf_ackno;

	u64			dccpap_ack_seqno;

	u64			dccpap_ack_ackno;

	unsigned int		dccpap_ack_ptr;

	unsigned int		dccpap_buf_vector_len;

	unsigned int		dccpap_ack_vector_len;

	unsigned int		dccpap_buf_len;

	struct timeval		dccpap_time;

	u8			dccpap_buf_nonce;

	u8			dccpap_ack_nonce;

	u8			dccpap_buf[0];

};



extern struct dccp_ackpkts *

		dccp_ackpkts_alloc(unsigned int len,

				  const unsigned int __nocast priority);

extern void dccp_ackpkts_free(struct dccp_ackpkts *ap);

extern int dccp_ackpkts_add(struct dccp_ackpkts *ap, const struct sock *sk,

			    u64 ackno, u8 state);

extern void dccp_ackpkts_check_rcv_ackno(struct dccp_ackpkts *ap,

					 struct sock *sk, u64 ackno);



extern void dccp_timestamp(const struct sock *sk, struct timeval *tv);



static inline suseconds_t timeval_usecs(const struct timeval *tv)
@@ -470,15 +423,4 @@ static inline void timeval_sub_usecs(struct timeval *tv, 
	}

}



#ifdef CONFIG_IP_DCCP_DEBUG

extern void dccp_ackvector_print(const u64 ackno,

				 const unsigned char *vector, int len);

extern void dccp_ackpkts_print(const struct dccp_ackpkts *ap);

#else

static inline void dccp_ackvector_print(const u64 ackno,

					const unsigned char *vector,

					int len) { }

static inline void dccp_ackpkts_print(const struct dccp_ackpkts *ap) { }

#endif



#endif /* _DCCP_H */