Skip to content

L
linux-davinci
Commit 388d5e99 authored by Gerrit Renker's avatar Gerrit Renker Committed by David S. Miller
Browse files
Options

dccp ccid-3: Overhaul CCID naming convention 2/2 

This implements the new naming scheme also for CCID-3.
Signed-off-by: default avatarGerrit Renker <gerrit@erg.abdn.ac.uk>
Acked-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1c00fe3
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 213 additions and 238 deletions
net/dccp/ccids/ccid3.c
View file @ 388d5e99
This diff is collapsed.
net/dccp/ccids/ccid3.h
View file @ 388d5e99
...@@ -75,44 +75,44 @@ enum ccid3_hc_tx_states { ...@@ -75,44 +75,44 @@ enum ccid3_hc_tx_states {
/** /**
* struct ccid3_hc_tx_sock - CCID3 sender half-connection socket * struct ccid3_hc_tx_sock - CCID3 sender half-connection socket
* @ccid3hctx_x - Current sending rate in 64 * bytes per second * @tx_x: Current sending rate in 64 * bytes per second
* @ccid3hctx_x_recv - Receive rate in 64 * bytes per second * @tx_x_recv: Receive rate in 64 * bytes per second
* @ccid3hctx_x_calc - Calculated rate in bytes per second * @tx_x_calc: Calculated rate in bytes per second
* @ccid3hctx_rtt - Estimate of current round trip time in usecs * @tx_rtt: Estimate of current round trip time in usecs
* @ccid3hctx_p - Current loss event rate (0-1) scaled by 1000000 * @tx_p: Current loss event rate (0-1) scaled by 1000000
* @ccid3hctx_s - Packet size in bytes * @tx_s: Packet size in bytes
* @ccid3hctx_t_rto - Nofeedback Timer setting in usecs * @tx_t_rto: Nofeedback Timer setting in usecs
* @ccid3hctx_t_ipi - Interpacket (send) interval (RFC 3448, 4.6) in usecs * @tx_t_ipi: Interpacket (send) interval (RFC 3448, 4.6) in usecs
* @ccid3hctx_state - Sender state, one of %ccid3_hc_tx_states * @tx_state: Sender state, one of %ccid3_hc_tx_states
* @ccid3hctx_last_win_count - Last window counter sent * @tx_last_win_count: Last window counter sent
* @ccid3hctx_t_last_win_count - Timestamp of earliest packet * @tx_t_last_win_count: Timestamp of earliest packet
* with last_win_count value sent * with last_win_count value sent
* @ccid3hctx_no_feedback_timer - Handle to no feedback timer * @tx_no_feedback_timer: Handle to no feedback timer
* @ccid3hctx_t_ld - Time last doubled during slow start * @tx_t_ld: Time last doubled during slow start
* @ccid3hctx_t_nom - Nominal send time of next packet * @tx_t_nom: Nominal send time of next packet
* @ccid3hctx_delta - Send timer delta (RFC 3448, 4.6) in usecs * @tx_delta: Send timer delta (RFC 3448, 4.6) in usecs
* @ccid3hctx_hist - Packet history * @tx_hist: Packet history
* @ccid3hctx_options_received - Parsed set of retrieved options * @tx_options_received: Parsed set of retrieved options
*/ */
struct ccid3_hc_tx_sock { struct ccid3_hc_tx_sock {
struct tfrc_tx_info ccid3hctx_tfrc; struct tfrc_tx_info tx_tfrc;
#define ccid3hctx_x ccid3hctx_tfrc.tfrctx_x #define tx_x tx_tfrc.tfrctx_x
#define ccid3hctx_x_recv ccid3hctx_tfrc.tfrctx_x_recv #define tx_x_recv tx_tfrc.tfrctx_x_recv
#define ccid3hctx_x_calc ccid3hctx_tfrc.tfrctx_x_calc #define tx_x_calc tx_tfrc.tfrctx_x_calc
#define ccid3hctx_rtt ccid3hctx_tfrc.tfrctx_rtt #define tx_rtt tx_tfrc.tfrctx_rtt
#define ccid3hctx_p ccid3hctx_tfrc.tfrctx_p #define tx_p tx_tfrc.tfrctx_p
#define ccid3hctx_t_rto ccid3hctx_tfrc.tfrctx_rto #define tx_t_rto tx_tfrc.tfrctx_rto
#define ccid3hctx_t_ipi ccid3hctx_tfrc.tfrctx_ipi #define tx_t_ipi tx_tfrc.tfrctx_ipi
u16 ccid3hctx_s; u16 tx_s;
enum ccid3_hc_tx_states ccid3hctx_state:8; enum ccid3_hc_tx_states tx_state:8;
u8 ccid3hctx_last_win_count; u8 tx_last_win_count;
ktime_t ccid3hctx_t_last_win_count; ktime_t tx_t_last_win_count;
struct timer_list ccid3hctx_no_feedback_timer; struct timer_list tx_no_feedback_timer;
ktime_t ccid3hctx_t_ld; ktime_t tx_t_ld;
ktime_t ccid3hctx_t_nom; ktime_t tx_t_nom;
u32 ccid3hctx_delta; u32 tx_delta;
struct tfrc_tx_hist_entry *ccid3hctx_hist; struct tfrc_tx_hist_entry *tx_hist;
struct ccid3_options_received ccid3hctx_options_received; struct ccid3_options_received tx_options_received;
}; };
static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk) static inline struct ccid3_hc_tx_sock *ccid3_hc_tx_sk(const struct sock *sk)
...@@ -131,32 +131,32 @@ enum ccid3_hc_rx_states { ...@@ -131,32 +131,32 @@ enum ccid3_hc_rx_states {
/** /**
* struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket * struct ccid3_hc_rx_sock - CCID3 receiver half-connection socket
* @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448 4.3) * @rx_x_recv: Receiver estimate of send rate (RFC 3448 4.3)
* @ccid3hcrx_rtt - Receiver estimate of rtt (non-standard) * @rx_rtt: Receiver estimate of rtt (non-standard)
* @ccid3hcrx_p - Current loss event rate (RFC 3448 5.4) * @rx_p: Current loss event rate (RFC 3448 5.4)
* @ccid3hcrx_last_counter - Tracks window counter (RFC 4342, 8.1) * @rx_last_counter: Tracks window counter (RFC 4342, 8.1)
* @ccid3hcrx_state - Receiver state, one of %ccid3_hc_rx_states * @rx_state: Receiver state, one of %ccid3_hc_rx_states
* @ccid3hcrx_bytes_recv - Total sum of DCCP payload bytes * @rx_bytes_recv: Total sum of DCCP payload bytes
* @ccid3hcrx_x_recv - Receiver estimate of send rate (RFC 3448, sec. 4.3) * @rx_x_recv: Receiver estimate of send rate (RFC 3448, sec. 4.3)
* @ccid3hcrx_rtt - Receiver estimate of RTT * @rx_rtt: Receiver estimate of RTT
* @ccid3hcrx_tstamp_last_feedback - Time at which last feedback was sent * @rx_tstamp_last_feedback: Time at which last feedback was sent
* @ccid3hcrx_tstamp_last_ack - Time at which last feedback was sent * @rx_tstamp_last_ack: Time at which last feedback was sent
* @ccid3hcrx_hist - Packet history (loss detection + RTT sampling) * @rx_hist: Packet history (loss detection + RTT sampling)
* @ccid3hcrx_li_hist - Loss Interval database * @rx_li_hist: Loss Interval database
* @ccid3hcrx_s - Received packet size in bytes * @rx_s: Received packet size in bytes
* @ccid3hcrx_pinv - Inverse of Loss Event Rate (RFC 4342, sec. 8.5) * @rx_pinv: Inverse of Loss Event Rate (RFC 4342, sec. 8.5)
*/ */
struct ccid3_hc_rx_sock { struct ccid3_hc_rx_sock {
u8 ccid3hcrx_last_counter:4; u8 rx_last_counter:4;
enum ccid3_hc_rx_states ccid3hcrx_state:8; enum ccid3_hc_rx_states rx_state:8;
u32 ccid3hcrx_bytes_recv; u32 rx_bytes_recv;
u32 ccid3hcrx_x_recv; u32 rx_x_recv;
u32 ccid3hcrx_rtt; u32 rx_rtt;
ktime_t ccid3hcrx_tstamp_last_feedback; ktime_t rx_tstamp_last_feedback;
struct tfrc_rx_hist ccid3hcrx_hist; struct tfrc_rx_hist rx_hist;
struct tfrc_loss_hist ccid3hcrx_li_hist; struct tfrc_loss_hist rx_li_hist;
u16 ccid3hcrx_s; u16 rx_s;
#define ccid3hcrx_pinv ccid3hcrx_li_hist.i_mean #define rx_pinv rx_li_hist.i_mean
}; };
static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk) static inline struct ccid3_hc_rx_sock *ccid3_hc_rx_sk(const struct sock *sk)
......
net/dccp/probe.c
View file @ 388d5e99
...@@ -83,14 +83,12 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk, ...@@ -83,14 +83,12 @@ static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
if (port == 0 || ntohs(inet->dport) == port || if (port == 0 || ntohs(inet->dport) == port ||
ntohs(inet->sport) == port) { ntohs(inet->sport) == port) {
if (hctx) if (hctx)
printl("%pI4:%u %pI4:%u %d %d %d %d %u " printl("%pI4:%u %pI4:%u %d %d %d %d %u %llu %llu %d\n",
"%llu %llu %d\n",
&inet->saddr, ntohs(inet->sport), &inet->saddr, ntohs(inet->sport),
&inet->daddr, ntohs(inet->dport), size, &inet->daddr, ntohs(inet->dport), size,
hctx->ccid3hctx_s, hctx->ccid3hctx_rtt, hctx->tx_s, hctx->tx_rtt, hctx->tx_p,
hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc, hctx->tx_x_calc, hctx->tx_x_recv >> 6,
hctx->ccid3hctx_x_recv >> 6, hctx->tx_x >> 6, hctx->tx_t_ipi);
hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
else else
printl("%pI4:%u %pI4:%u %d\n", printl("%pI4:%u %pI4:%u %d\n",
&inet->saddr, ntohs(inet->sport), &inet->saddr, ntohs(inet->sport),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment