patch-2.1.8 linux/net/ipv4/proc.c

Next file: linux/net/ipv4/protocol.c
Previous file: linux/net/ipv4/packet.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.7/linux/net/ipv4/proc.c linux/net/ipv4/proc.c
@@ -59,6 +59,7 @@
 {
 	struct sock **s_array;
 	struct sock *sp;
+	struct tcp_opt *tp;
 	int i;
 	int timer_active;
 	int timer_active1;
@@ -87,6 +88,7 @@
 	{
 	  	cli();
 		sp = s_array[i];
+
 		while(sp != NULL) 
 		{
 			pos += 128;
@@ -95,6 +97,9 @@
 				sp = sp->next;
 				continue;
 			}
+
+			tp = &(sp->tp_pinfo.af_tcp);
+
 			dest  = sp->daddr;
 			src   = sp->saddr;
 			destp = sp->dummy_th.dest;
@@ -122,13 +127,14 @@
 			sprintf(tmpbuf, "%4d: %08lX:%04X %08lX:%04X"
 				" %02X %08X:%08X %02X:%08lX %08X %5d %8d %ld",
 				i, src, srcp, dest, destp, sp->state, 
-				format==0?sp->write_seq-sp->rcv_ack_seq:sp->wmem_alloc, 
-				format==0?sp->acked_seq-sp->copied_seq:sp->rmem_alloc,
+				format==0?sp->write_seq-tp->snd_una:sp->wmem_alloc, 
+				format==0?tp->rcv_nxt-sp->copied_seq:sp->rmem_alloc,
 				timer_active, timer_expires-jiffies, (unsigned) sp->retransmits,
 				(sp->socket&&SOCK_INODE(sp->socket))?SOCK_INODE(sp->socket)->i_uid:0,
 				timer_active?sp->timeout:0,
 				sp->socket && SOCK_INODE(sp->socket) ?
 				SOCK_INODE(sp->socket)->i_ino : 0);
+
 			if (timer_active1) add_timer(&sp->retransmit_timer);
 			if (timer_active2) add_timer(&sp->timer);
 			len += sprintf(buffer+len, "%-127s\n", tmpbuf);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov