[DCCP]: Introduce dccp_get_info
And also hc_tx and hc_rx get_info functions for the CCIDs to fill in information that is specific to them. For now reusing struct tcp_info, later I'll try to figure out a better solution, for now its really nice to get this kind of info: [root@qemu ~]# ./ss -danemi State Recv-Q Send-Q Local Addr:Port Peer Addr:Port LISTEN 0 0 *:5001 *:* ino:628 sk:c1340040 mem:(r0,w0,f0,t0) cwnd:0 ssthresh:0 ESTAB 0 0 172.20.0.2:5001 172.20.0.1:32785 ino:629 sk:c13409a0 mem:(r0,w0,f0,t0) ts rto:1000 rtt:0.004/0 cwnd:0 ssthresh:0 rcv_rtt:61.377 This, for instance, shows that we're not congestion controlling ACKs, as the above output is in the ttcp receiving host, and ttcp is a one way app, i.e. the received never calls sendmsg, so ccid_hc_tx_send_packet is never called, so the TX half connection stays in TFRC_SSTATE_NO_SENT state and hctx_rtt is never calculated, stays with the value set in ccid3_hc_tx_init, 4us, as show above in milliseconds (0.004ms), upcoming patches will fix this. rcv_rtt seems sane tho, matching ping results :-) Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:

committed by
David S. Miller

parent
4fded33b3e
commit
2babe1f6fe
@@ -14,19 +14,43 @@
|
||||
#include <linux/module.h>
|
||||
#include <linux/inet_diag.h>
|
||||
|
||||
#include "ccid.h"
|
||||
#include "dccp.h"
|
||||
|
||||
static void dccp_get_info(struct sock *sk, struct tcp_info *info)
|
||||
{
|
||||
struct dccp_sock *dp = dccp_sk(sk);
|
||||
const struct inet_connection_sock *icsk = inet_csk(sk);
|
||||
|
||||
memset(info, 0, sizeof(*info));
|
||||
|
||||
info->tcpi_state = sk->sk_state;
|
||||
info->tcpi_retransmits = icsk->icsk_retransmits;
|
||||
info->tcpi_probes = icsk->icsk_probes_out;
|
||||
info->tcpi_backoff = icsk->icsk_backoff;
|
||||
info->tcpi_pmtu = dp->dccps_pmtu_cookie;
|
||||
|
||||
if (dp->dccps_options.dccpo_send_ack_vector)
|
||||
info->tcpi_options |= TCPI_OPT_SACK;
|
||||
|
||||
ccid_hc_rx_get_info(dp->dccps_hc_rx_ccid, sk, info);
|
||||
ccid_hc_tx_get_info(dp->dccps_hc_tx_ccid, sk, info);
|
||||
}
|
||||
|
||||
static void dccp_diag_get_info(struct sock *sk, struct inet_diag_msg *r,
|
||||
void *_info)
|
||||
{
|
||||
r->idiag_rqueue = r->idiag_wqueue = 0;
|
||||
|
||||
if (_info != NULL)
|
||||
dccp_get_info(sk, _info);
|
||||
}
|
||||
|
||||
static struct inet_diag_handler dccp_diag_handler = {
|
||||
.idiag_hashinfo = &dccp_hashinfo,
|
||||
.idiag_get_info = dccp_diag_get_info,
|
||||
.idiag_type = DCCPDIAG_GETSOCK,
|
||||
.idiag_info_size = 0,
|
||||
.idiag_info_size = sizeof(struct tcp_info),
|
||||
};
|
||||
|
||||
static int __init dccp_diag_init(void)
|
||||
|
Reference in New Issue
Block a user