a302002516
The code used two different variables to count Acks, one of them redundant. This patch reduces the number of Ack counters to one. The type of the Ack counter has also been changed to u32 (twice the range of int); and the variable has been renamed into `packets_acked' - for consistency with RFC 3465 (and similarly named variables are used by TCP and SCTP). Lastly, a slightly less aggressive `maxincr' increment is used (for even Ack Ratios, maxincr was Ack Ratio/2 + 1 instead of Ack Ratio/2). Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Acked-by: Ian McDonald <ian.mcdonald@jandi.co.nz> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
85 lines
2.4 KiB
C
85 lines
2.4 KiB
C
/*
|
|
* net/dccp/ccids/ccid2.h
|
|
*
|
|
* Copyright (c) 2005 Andrea Bittau <a.bittau@cs.ucl.ac.uk>
|
|
*
|
|
* 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; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
#ifndef _DCCP_CCID2_H_
|
|
#define _DCCP_CCID2_H_
|
|
|
|
#include <linux/dccp.h>
|
|
#include <linux/timer.h>
|
|
#include <linux/types.h>
|
|
#include "../ccid.h"
|
|
/* NUMDUPACK parameter from RFC 4341, p. 6 */
|
|
#define NUMDUPACK 3
|
|
|
|
struct sock;
|
|
|
|
struct ccid2_seq {
|
|
u64 ccid2s_seq;
|
|
unsigned long ccid2s_sent;
|
|
int ccid2s_acked;
|
|
struct ccid2_seq *ccid2s_prev;
|
|
struct ccid2_seq *ccid2s_next;
|
|
};
|
|
|
|
#define CCID2_SEQBUF_LEN 1024
|
|
#define CCID2_SEQBUF_MAX 128
|
|
|
|
/** struct ccid2_hc_tx_sock - CCID2 TX half connection
|
|
*
|
|
* @ccid2hctx_{cwnd,ssthresh,pipe}: as per RFC 4341, section 5
|
|
* @ccid2hctx_packets_acked - Ack counter for deriving cwnd growth (RFC 3465)
|
|
* @ccid2hctx_lastrtt -time RTT was last measured
|
|
* @ccid2hctx_rpseq - last consecutive seqno
|
|
* @ccid2hctx_rpdupack - dupacks since rpseq
|
|
*/
|
|
struct ccid2_hc_tx_sock {
|
|
u32 ccid2hctx_cwnd;
|
|
u32 ccid2hctx_ssthresh;
|
|
u32 ccid2hctx_pipe;
|
|
u32 ccid2hctx_packets_acked;
|
|
struct ccid2_seq *ccid2hctx_seqbuf[CCID2_SEQBUF_MAX];
|
|
int ccid2hctx_seqbufc;
|
|
struct ccid2_seq *ccid2hctx_seqh;
|
|
struct ccid2_seq *ccid2hctx_seqt;
|
|
long ccid2hctx_rto;
|
|
long ccid2hctx_srtt;
|
|
long ccid2hctx_rttvar;
|
|
unsigned long ccid2hctx_lastrtt;
|
|
struct timer_list ccid2hctx_rtotimer;
|
|
u64 ccid2hctx_rpseq;
|
|
int ccid2hctx_rpdupack;
|
|
unsigned long ccid2hctx_last_cong;
|
|
u64 ccid2hctx_high_ack;
|
|
};
|
|
|
|
struct ccid2_hc_rx_sock {
|
|
int ccid2hcrx_data;
|
|
};
|
|
|
|
static inline struct ccid2_hc_tx_sock *ccid2_hc_tx_sk(const struct sock *sk)
|
|
{
|
|
return ccid_priv(dccp_sk(sk)->dccps_hc_tx_ccid);
|
|
}
|
|
|
|
static inline struct ccid2_hc_rx_sock *ccid2_hc_rx_sk(const struct sock *sk)
|
|
{
|
|
return ccid_priv(dccp_sk(sk)->dccps_hc_rx_ccid);
|
|
}
|
|
#endif /* _DCCP_CCID2_H_ */
|