patch-2.3.10 linux/net/ipv6/proc.c

• Lines: 150
• Date: Sat Jul 3 17:57:23 1999
• Orig file: v2.3.9/linux/net/ipv6/proc.c
• Orig date: Wed May 26 18:14:38 1999

diff -u --recursive --new-file v2.3.9/linux/net/ipv6/proc.c linux/net/ipv6/proc.c
@@ -7,7 +7,7 @@
  *		PROC file system.  This is very similar to the IPv4 version,
  *		except it reports the sockets in the INET6 address family.
  *
- * Version:	$Id: proc.c,v 1.10 1999/05/27 00:38:14 davem Exp $
+ * Version:	$Id: proc.c,v 1.11 1999/07/02 11:26:45 davem Exp $
  *
  * Authors:	David S. Miller (davem@caip.rutgers.edu)
  *
@@ -25,140 +25,6 @@
 #include <net/tcp.h>
 #include <net/transp_v6.h>
 #include <net/ipv6.h>
-
-/* This is the main implementation workhorse of all these routines. */
-static int get__netinfo6(struct proto *pro, char *buffer, int format, char **start,
-			 off_t offset, int length)
-{
-	struct sock *sp;
-	struct tcp_opt *tp;
-	int timer_active, timer_active1, timer_active2;
-	unsigned long timer_expires;
-	struct in6_addr *dest, *src;
-	unsigned short destp, srcp;
-	int len = 0, i = 0;
-	off_t pos = 0;
-	off_t begin;
-	char tmpbuf[150];
-
-	if(offset < 149)
-		len += sprintf(buffer, "%-148s\n",
-			       "  sl  "						/* 6 */
-			       "local_address                         "		/* 38 */
-			       "remote_address                        "		/* 38 */
-			       "st tx_queue rx_queue tr tm->when retrnsmt"	/* 41 */
-			       "   uid  timeout inode");			/* 21 */
-										/*----*/
-										/*144 */
-
-	pos = 149;
-	SOCKHASH_LOCK_READ();
-	sp = pro->sklist_next;
-	while(sp != (struct sock *)pro) {
-		struct tcp_tw_bucket *tw = (struct tcp_tw_bucket *)sp;
-		int tw_bucket = 0;
-
-		pos += 149;
-		if(pos < offset)
-			goto next;
-		tp = &(sp->tp_pinfo.af_tcp);
-		if((format == 0) && (sp->state == TCP_TIME_WAIT)) {
-			tw_bucket = 1;
-			dest  = &tw->v6_daddr;
-			src   = &tw->v6_rcv_saddr;
-		} else {
-			dest  = &sp->net_pinfo.af_inet6.daddr;
-			src   = &sp->net_pinfo.af_inet6.rcv_saddr;
-		}
-		destp = ntohs(sp->dport);
-		srcp  = ntohs(sp->sport);
-
-		if((format == 0) && (sp->state == TCP_TIME_WAIT)) {
-			extern int tcp_tw_death_row_slot;
-			int slot_dist;
-
-			timer_active1	= timer_active2 = 0;
-			timer_active	= 3;
-			slot_dist	= tw->death_slot;
-			if(slot_dist > tcp_tw_death_row_slot)
-				slot_dist = (TCP_TWKILL_SLOTS - slot_dist) + tcp_tw_death_row_slot;
-			else
-				slot_dist = tcp_tw_death_row_slot - slot_dist;
-			timer_expires	= jiffies + (slot_dist * TCP_TWKILL_PERIOD);
-		} else {
-			timer_active1 = tp->retransmit_timer.prev != NULL;
-			timer_active2 = sp->timer.prev != NULL;
-			timer_active = 0;
-			timer_expires = (unsigned) -1;
-		}
-		if(timer_active1 && tp->retransmit_timer.expires < timer_expires) {
-			timer_active = timer_active1;
-			timer_expires = tp->retransmit_timer.expires;
-		}
-		if(timer_active2 && sp->timer.expires < timer_expires) {
-			timer_active = timer_active2;
-			timer_expires = sp->timer.expires;
-		}
-		if(timer_active == 0)
-			timer_expires = jiffies;
-		sprintf(tmpbuf, "%4d: %08X%08X%08X%08X:%04X %08X%08X%08X%08X:%04X "
-			"%02X %08X:%08X %02X:%08lX %08X %5d %8d %ld",
-			i,
-			src->s6_addr32[0], src->s6_addr32[1],
-			src->s6_addr32[2], src->s6_addr32[3], srcp,
-			dest->s6_addr32[0], dest->s6_addr32[1],
-			dest->s6_addr32[2], dest->s6_addr32[3], destp,
-			sp->state,
-			(tw_bucket ?
-			 0 :
-			 (format == 0) ?
-			 tp->write_seq-tp->snd_una :
-			 atomic_read(&sp->wmem_alloc)),
-			(tw_bucket ?
-			 0 :
-			 (format == 0) ?
-			 tp->rcv_nxt-tp->copied_seq :
-			 atomic_read(&sp->rmem_alloc)),
-			timer_active, timer_expires-jiffies,
-			(tw_bucket ? 0 : tp->retransmits),
-			((!tw_bucket && sp->socket) ?
-			 sp->socket->inode->i_uid : 0),
-			(!tw_bucket && timer_active) ? sp->timeout : 0,
-			((!tw_bucket && sp->socket) ?
-			 sp->socket->inode->i_ino : 0));
-
-		len += sprintf(buffer+len, "%-148s\n", tmpbuf);
-		if(len >= length)
-			break;
-	next:
-		sp = sp->sklist_next;
-		i++;
-	}
-	SOCKHASH_UNLOCK_READ();
-
-	begin = len - (pos - offset);
-	*start = buffer + begin;
-	len -= begin;
-	if(len > length)
-		len = length;
-	return len;
-}
-
-/* These get exported and registered with procfs in af_inet6.c at init time. */
-int tcp6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
-{
-	return get__netinfo6(&tcpv6_prot, buffer, 0, start, offset, length);
-}
-
-int udp6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
-{
-	return get__netinfo6(&udpv6_prot, buffer, 1, start, offset, length);
-}
-
-int raw6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
-{
-	return get__netinfo6(&rawv6_prot, buffer, 1, start, offset, length);
-}
 
 int afinet6_get_info(char *buffer, char **start, off_t offset, int length, int dummy)
 {