Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5ee3afba88f5a79d0bff07ddd87af45919259f91
Commit:     5ee3afba88f5a79d0bff07ddd87af45919259f91
Parent:     768f3591e2b1cc309fd6f10d6579b216026d7817
Author:     Rick Jones <[EMAIL PROTECTED]>
AuthorDate: Tue Sep 18 13:26:31 2007 -0700
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Wed Oct 10 16:51:35 2007 -0700

    [TCP]: Return useful listenq info in tcp_info and INET_DIAG_INFO.
    
    Return some useful information such as the maximum listen backlog and
    the current listen backlog in the tcp_info structure and
    INET_DIAG_INFO.
    
    Signed-off-by: Rick Jones <[EMAIL PROTECTED]>
    Signed-off-by: Eric Dumazet <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/tcp.c      |    9 +++++++--
 net/ipv4/tcp_diag.c |    8 +++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 18c64c7..4f32200 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2031,8 +2031,13 @@ void tcp_get_info(struct sock *sk, struct tcp_info *info)
        info->tcpi_snd_mss = tp->mss_cache;
        info->tcpi_rcv_mss = icsk->icsk_ack.rcv_mss;
 
-       info->tcpi_unacked = tp->packets_out;
-       info->tcpi_sacked = tp->sacked_out;
+       if (sk->sk_state == TCP_LISTEN) {
+               info->tcpi_unacked = sk->sk_ack_backlog;
+               info->tcpi_sacked = sk->sk_max_ack_backlog;
+       } else {
+               info->tcpi_unacked = tp->packets_out;
+               info->tcpi_sacked = tp->sacked_out;
+       }
        info->tcpi_lost = tp->lost_out;
        info->tcpi_retrans = tp->retrans_out;
        info->tcpi_fackets = tp->fackets_out;
diff --git a/net/ipv4/tcp_diag.c b/net/ipv4/tcp_diag.c
index 57c5f0b..3904d21 100644
--- a/net/ipv4/tcp_diag.c
+++ b/net/ipv4/tcp_diag.c
@@ -25,11 +25,13 @@ static void tcp_diag_get_info(struct sock *sk, struct 
inet_diag_msg *r,
        const struct tcp_sock *tp = tcp_sk(sk);
        struct tcp_info *info = _info;
 
-       if (sk->sk_state == TCP_LISTEN)
+       if (sk->sk_state == TCP_LISTEN) {
                r->idiag_rqueue = sk->sk_ack_backlog;
-       else
+               r->idiag_wqueue = sk->sk_max_ack_backlog;
+       } else {
                r->idiag_rqueue = tp->rcv_nxt - tp->copied_seq;
-       r->idiag_wqueue = tp->write_seq - tp->snd_una;
+               r->idiag_wqueue = tp->write_seq - tp->snd_una;
+       }
        if (info != NULL)
                tcp_get_info(sk, info);
 }
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to