From c5c63975d538cf48ceb99ba48c341293676d15c0 Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 21 Oct 1999 09:06:11 +0000 Subject: Whistle's Netgraph link-layer (sometimes more) networking infrastructure. Been in production for 3 years now. Gives Instant Frame relay to if_sr and if_ar drivers, and PPPOE support soon. See: ftp://ftp.whistle.com/pub/archie/netgraph/index.html for on-line manual pages. Reviewed by: Doug Rabson (dfr@freebsd.org) Obtained from: Whistle CVS tree --- usr.bin/netstat/Makefile | 8 +- usr.bin/netstat/main.c | 21 ++++- usr.bin/netstat/netgraph.c | 188 +++++++++++++++++++++++++++++++++++++++++++++ usr.bin/netstat/netstat.1 | 5 ++ usr.bin/netstat/netstat.h | 3 + usr.bin/netstat/route.c | 9 +++ 6 files changed, 230 insertions(+), 4 deletions(-) create mode 100644 usr.bin/netstat/netgraph.c (limited to 'usr.bin/netstat') diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 280a34f..3c8092a 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -1,14 +1,16 @@ +# $FreeBSD$ # @(#)Makefile 8.1 (Berkeley) 6/12/93 PROG= netstat SRCS= if.c inet.c main.c mbuf.c mroute.c ipx.c route.c \ - unix.c atalk.c # iso.c ns.c tp_astring.c + unix.c atalk.c netgraph.c # iso.c ns.c tp_astring.c +CFLAGS+=-Wall #CFLAGS+=-g #.PATH: ${.CURDIR}/../../sys/netiso BINGRP= kmem BINMODE=2555 -DPADD= ${LIBKVM} ${LIBIPX} -LDADD= -lkvm -lipx +DPADD= ${LIBKVM} ${LIBIPX} ${LIBNETGRAPH} +LDADD= -lkvm -lipx -lnetgraph .include diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index f3c9563..1a5bc14 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -52,6 +52,8 @@ static const char rcsid[] = #include +#include + #include #include #include @@ -121,6 +123,8 @@ static struct nlist nl[] = { { "_ddpstat"}, #define N_DDPCB 26 { "_ddpcb"}, +#define N_NGSOCKS 27 + { "_ngsocklist"}, { "" }, }; @@ -158,6 +162,15 @@ struct protox atalkprotox[] = { 0, 0 } }; +struct protox netgraphprotox[] = { + { N_NGSOCKS, -1, 1, netgraphprotopr, + NULL, "ctrl" }, + { N_NGSOCKS, -1, 1, netgraphprotopr, + NULL, "data" }, + { -1, -1, 0, 0, + 0, 0 } +}; + struct protox ipxprotox[] = { { N_IPX, N_IPXSTAT, 1, ipxprotopr, ipx_stats, "ipx", 0 }, @@ -218,7 +231,7 @@ main(argc, argv) char *argv[]; { register struct protoent *p; - register struct protox *tp; /* for printing cblocks & stats */ + register struct protox *tp = NULL; /* for printing cblocks & stats */ int ch; af = AF_UNSPEC; @@ -251,6 +264,9 @@ main(argc, argv) af = AF_UNIX; else if (strcmp(optarg, "atalk") == 0) af = AF_APPLETALK; + else if (strcmp(optarg, "ng") == 0 + || strcmp(optarg, "netgraph") == 0) + af = AF_NETGRAPH; #ifdef ISO else if (strcmp(optarg, "iso") == 0) af = AF_ISO; @@ -418,6 +434,9 @@ main(argc, argv) if (af == AF_APPLETALK || af == AF_UNSPEC) for (tp = atalkprotox; tp->pr_name; tp++) printproto(tp, tp->pr_name); + if (af == AF_NETGRAPH || af == AF_UNSPEC) + for (tp = netgraphprotox; tp->pr_name; tp++) + printproto(tp, tp->pr_name); #ifdef NS if (af == AF_NS || af == AF_UNSPEC) for (tp = nsprotox; tp->pr_name; tp++) diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c new file mode 100644 index 0000000..33bc779 --- /dev/null +++ b/usr.bin/netstat/netgraph.c @@ -0,0 +1,188 @@ +/* + * Copyright (c) 1996-1999 Whistle Communications, Inc. + * All rights reserved. + * + * Subject to the following obligations and disclaimer of warranty, use and + * redistribution of this software, in source or object code forms, with or + * without modifications are expressly permitted by Whistle Communications; + * provided, however, that: + * 1. Any and all reproductions of the source or object code must include the + * copyright notice above and the following disclaimer of warranties; and + * 2. No rights are granted, in any manner or form, to use Whistle + * Communications, Inc. trademarks, including the mark "WHISTLE + * COMMUNICATIONS" on advertising, endorsements, or otherwise except as + * such appears in the above copyright notice or in the software. + * + * THIS SOFTWARE IS BEING PROVIDED BY WHISTLE COMMUNICATIONS "AS IS", AND + * TO THE MAXIMUM EXTENT PERMITTED BY LAW, WHISTLE COMMUNICATIONS MAKES NO + * REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, REGARDING THIS SOFTWARE, + * INCLUDING WITHOUT LIMITATION, ANY AND ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT. + * WHISTLE COMMUNICATIONS DOES NOT WARRANT, GUARANTEE, OR MAKE ANY + * REPRESENTATIONS REGARDING THE USE OF, OR THE RESULTS OF THE USE OF THIS + * SOFTWARE IN TERMS OF ITS CORRECTNESS, ACCURACY, RELIABILITY OR OTHERWISE. + * IN NO EVENT SHALL WHISTLE COMMUNICATIONS BE LIABLE FOR ANY DAMAGES + * RESULTING FROM OR ARISING OUT OF ANY USE OF THIS SOFTWARE, INCLUDING + * WITHOUT LIMITATION, ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, + * PUNITIVE, OR CONSEQUENTIAL DAMAGES, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES, LOSS OF USE, DATA OR PROFITS, HOWEVER CAUSED AND UNDER ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef lint +static const char rcsid[] = + "$Id: atalk.c,v 1.11 1998/07/06 21:01:22 bde Exp $"; +#endif /* not lint */ + +#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include "netstat.h" + +static int first = 1; +static int csock = -1; + +void +netgraphprotopr(u_long off, char *name) +{ + struct ngpcb *this, *next; + struct ngpcb ngpcb; + struct ngsock info; + struct socket sockb; + int debug = 1; + + /* If symbol not found, try looking in the KLD module */ + if (off == 0) { + const char *const modname = "ng_socket.ko"; +/* XXX We should get "mpath" from "sysctl kern.module_path" */ + const char *mpath[] = { "/", "/boot/", "/modules/", NULL }; + struct nlist sym[] = { { "_ngsocklist" }, { NULL } }; + const char **pre; + struct kld_file_stat ks; + int fileid; + + /* See if module is loaded */ + if ((fileid = kldfind(modname)) < 0) { + if (debug) + warn("kldfind(%s)", modname); + return; + } + + /* Get module info */ + memset(&ks, 0, sizeof(ks)); + ks.version = sizeof(struct kld_file_stat); + if (kldstat(fileid, &ks) < 0) { + if (debug) + warn("kldstat(%d)", fileid); + return; + } + + /* Get symbol table from module file */ + for (pre = mpath; *pre; pre++) { + char path[MAXPATHLEN]; + + snprintf(path, sizeof(path), "%s%s", *pre, modname); + if (nlist(path, sym) == 0) + break; + } + + /* Did we find it? */ + if (sym[0].n_value == 0) { + if (debug) + warnx("%s not found", modname); + return; + } + + /* Symbol found at load address plus symbol offset */ + off = (u_long) ks.address + sym[0].n_value; + } + + /* Get pointer to first socket */ + kread(off, (char *)&this, sizeof(this)); + + /* Get my own socket node */ + if (csock == -1) + NgMkSockNode(NULL, &csock, NULL); + + for (; this != NULL; this = next) { + u_char rbuf[sizeof(struct ng_mesg) + sizeof(struct nodeinfo)]; + struct ng_mesg *resp = (struct ng_mesg *) rbuf; + struct nodeinfo *ni = (struct nodeinfo *) resp->data; + char path[64]; + + /* Read in ngpcb structure */ + kread((u_long)this, (char *)&ngpcb, sizeof(ngpcb)); + next = ngpcb.socks.le_next; + + /* Read in socket structure */ + kread((u_long)ngpcb.ng_socket, (char *)&sockb, sizeof(sockb)); + + /* Check type of socket */ + if (strcmp(name, "ctrl") == 0 && ngpcb.type != NG_CONTROL) + continue; + if (strcmp(name, "data") == 0 && ngpcb.type != NG_DATA) + continue; + + /* Do headline */ + if (first) { + printf("Netgraph sockets\n"); + if (Aflag) + printf("%-8.8s ", "PCB"); + printf("%-5.5s %-6.6s %-6.6s %-14.14s %s\n", + "Type", "Recv-Q", "Send-Q", + "Node Address", "#Hooks"); + first = 0; + } + + /* Show socket */ + if (Aflag) + printf("%8lx ", (u_long) this); + printf("%-5.5s %6lu %6lu ", + name, sockb.so_rcv.sb_cc, sockb.so_snd.sb_cc); + + /* Get ngsock structure */ + if (ngpcb.sockdata == 0) /* unconnected data socket */ + goto finish; + kread((u_long)ngpcb.sockdata, (char *)&info, sizeof(info)); + + /* Get info on associated node */ + if (info.node == 0 || csock == -1) + goto finish; + snprintf(path, sizeof(path), "[%lx]:", (u_long) info.node); + if (NgSendMsg(csock, path, + NGM_GENERIC_COOKIE, NGM_NODEINFO, NULL, 0) < 0) + goto finish; + if (NgRecvMsg(csock, resp, sizeof(rbuf), NULL) < 0) + goto finish; + + /* Display associated node info */ + if (*ni->name != '\0') + snprintf(path, sizeof(path), "%s:", ni->name); + printf("%-14.14s %4d", path, ni->hooks); +finish: + putchar('\n'); + } +} + diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 55445f8..b6af8ce 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -118,6 +118,11 @@ for .Ar atalk , for .Dv AF_APPLETALK (ddp) , +.Ar netgraph +or +.Ar ng +for +.Dv AF_NETGRAPH , .\".Ar ns , .\"for .\".Dv AF_NS , diff --git a/usr.bin/netstat/netstat.h b/usr.bin/netstat/netstat.h index 6ae25d8..1e67517 100644 --- a/usr.bin/netstat/netstat.h +++ b/usr.bin/netstat/netstat.h @@ -31,6 +31,7 @@ * SUCH DAMAGE. * * @(#)netstat.h 8.2 (Berkeley) 1/4/94 + * $FreeBSD$ */ #include @@ -105,6 +106,8 @@ void nserr_stats __P((u_long, char *)); void atalkprotopr __P((u_long, char *)); void ddp_stats __P((u_long, char *)); +void netgraphprotopr __P((u_long, char *)); + void intpr __P((int, u_long)); void unixpr __P((void)); diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 129337b..158b3ff 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -53,6 +53,7 @@ static const char rcsid[] = #include #include #include +#include #ifdef NS #include @@ -196,6 +197,9 @@ pr_family(af) case AF_CCITT: afname = "X.25"; break; + case AF_NETGRAPH: + afname = "Netgraph"; + break; default: afname = NULL; break; @@ -427,6 +431,11 @@ p_sockaddr(sa, mask, flags, width) cp = atalk_print(sa,11); break; } + case AF_NETGRAPH: + { + printf("%s", ((struct sockaddr_ng *)sa)->sg_data); + break; + } #ifdef NS case AF_NS: cp = ns_print(sa); -- cgit v1.1