d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update netstat(1) for recent conversion of netipx to queue(9) from

Browse Source 
home-brew linked lists.  Read in the ipxpcb_list structure first in
order to find the first pcb pointer.  Then follow the chain as
before, only the termination condition is a NULL next pointer
rather than a next pointer equal to the original offset.
This commit is contained in:
rwatson 2004-12-31 00:32:50 +00:00
parent ab5259a6dd
commit 066b66879a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
usr.bin/netstat/ipx.c
View File

@ -1,4 +1,5 @@
/*
* Copyright (c) 2004, Robert N. M. Watson
* Copyright (c) 1983, 1988, 1993
* The Regents of the University of California. All rights reserved.
*
@ -68,6 +69,8 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include "netstat.h"
struct ipxpcbhead ipxpcb_list;
int ipxpcb_list_read;
struct ipxpcb ipxpcb;
struct spxpcb spxpcb;
struct socket sockb;
@ -93,21 +96,38 @@ ipxprotopr(u_long off, const char *name, int af1 __unused)
if (off == 0)
return;
/*
* First time around, read in the pcb list header. After that, we
* walk sequential pcbs.
*/
if (ipxpcb_list_read == 0) {
kread(off, (char *)&ipxpcb_list, sizeof(ipxpcb_list));
off = (u_long)LIST_FIRST(&ipxpcb_list);
ipxpcb_list_read = 1;
}
isspx = strcmp(name, "spx") == 0;
kread(off, (char *)&cb, sizeof (struct ipxpcb));
ipxpcb = cb;
prev = (struct ipxpcb *)off;
if (ipxpcb.ipxp_next == (struct ipxpcb *)off)
if (LIST_NEXT(&ipxpcb, ipxp_list) == NULL)
return;
for (;ipxpcb.ipxp_next != (struct ipxpcb *)off; prev = next) {
for (;LIST_NEXT(&ipxpcb, ipxp_list) != NULL; prev = next) {
u_long ppcb;
next = ipxpcb.ipxp_next;
next = LIST_NEXT(&ipxpcb, ipxp_list);
kread((u_long)next, (char *)&ipxpcb, sizeof (ipxpcb));
#if 0
/*
* queue(9) macros do not give us a prev pointer, so skip
* sanity check for now.
*/
if (ipxpcb.ipxp_prev != prev) {
printf("???\n");
break;
}
#endif
if (!aflag && ipx_nullhost(ipxpcb.ipxp_faddr) ) {
continue;
}

2
usr.bin/netstat/main.c
View File

@ -83,7 +83,7 @@ static struct nlist nl[] = {
#define N_VIFTABLE 5
{ "_viftable" },
#define N_IPX 6
{ "_ipxpcb"},
{ "_ipxpcb_list"},
#define N_IPXSTAT 7
{ "_ipxstat"},
#define N_SPXSTAT 8