Index: stable/2.1/usr.bin/netstat/main.c =================================================================== --- stable/2.1/usr.bin/netstat/main.c (revision 10583) +++ stable/2.1/usr.bin/netstat/main.c (revision 10584) @@ -1,513 +1,513 @@ /* * Copyright (c) 1983, 1988, 1993 * Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON 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 ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #ifndef lint char copyright[] = "@(#) Copyright (c) 1983, 1988, 1993\n\ Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ #ifndef lint static char sccsid[] = "@(#)main.c 8.4 (Berkeley) 3/1/94"; #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "netstat.h" struct nlist nl[] = { #define N_MBSTAT 0 { "_mbstat" }, #define N_IPSTAT 1 { "_ipstat" }, #define N_TCB 2 { "_tcb" }, #define N_TCPSTAT 3 { "_tcpstat" }, #define N_UDB 4 { "_udb" }, #define N_UDPSTAT 5 { "_udpstat" }, #define N_IFNET 6 { "_ifnet" }, #define N_IMP 7 { "_imp_softc" }, #define N_ICMPSTAT 8 { "_icmpstat" }, #define N_RTSTAT 9 { "_rtstat" }, #define N_UNIXSW 10 { "_unixsw" }, #define N_IDP 11 { "_nspcb"}, #define N_IDPSTAT 12 { "_idpstat"}, #define N_SPPSTAT 13 { "_spp_istat"}, #define N_NSERR 14 { "_ns_errstat"}, #define N_CLNPSTAT 15 { "_clnp_stat"}, #define IN_NOTUSED 16 { "_tp_inpcb" }, #define ISO_TP 17 { "_tp_refinfo" }, #define N_TPSTAT 18 { "_tp_stat" }, #define N_ESISSTAT 19 { "_esis_stat"}, #define N_NIMP 20 { "_nimp"}, #define N_RTREE 21 { "_rt_tables"}, #define N_CLTP 22 { "_cltb"}, #define N_CLTPSTAT 23 { "_cltpstat"}, #define N_NFILE 24 { "_nfile" }, #define N_FILE 25 { "_file" }, #define N_IGMPSTAT 26 { "_igmpstat" }, #define N_MRTPROTO 27 { "_ip_mrtproto" }, #define N_MRTSTAT 28 { "_mrtstat" }, -#define N_MRTTABLE 29 - { "_mrttable" }, +#define N_MFCTABLE 29 + { "_mfctable" }, #define N_VIFTABLE 30 { "_viftable" }, "", }; struct protox { u_char pr_index; /* index into nlist of cb head */ u_char pr_sindex; /* index into nlist of stat block */ u_char pr_wanted; /* 1 if wanted, 0 otherwise */ void (*pr_cblocks)(); /* control blocks printing routine */ void (*pr_stats)(); /* statistics printing routine */ char *pr_name; /* well-known name */ } protox[] = { { N_TCB, N_TCPSTAT, 1, protopr, tcp_stats, "tcp" }, { N_UDB, N_UDPSTAT, 1, protopr, udp_stats, "udp" }, { -1, N_IPSTAT, 1, 0, ip_stats, "ip" }, { -1, N_ICMPSTAT, 1, 0, icmp_stats, "icmp" }, { -1, N_IGMPSTAT, 1, 0, igmp_stats, "igmp" }, { -1, -1, 0, 0, 0, 0 } }; struct protox nsprotox[] = { { N_IDP, N_IDPSTAT, 1, nsprotopr, idp_stats, "idp" }, { N_IDP, N_SPPSTAT, 1, nsprotopr, spp_stats, "spp" }, { -1, N_NSERR, 1, 0, nserr_stats, "ns_err" }, { -1, -1, 0, 0, 0, 0 } }; struct protox isoprotox[] = { { ISO_TP, N_TPSTAT, 1, iso_protopr, tp_stats, "tp" }, { N_CLTP, N_CLTPSTAT, 1, iso_protopr, cltp_stats, "cltp" }, { -1, N_CLNPSTAT, 1, 0, clnp_stats, "clnp"}, { -1, N_ESISSTAT, 1, 0, esis_stats, "esis"}, { -1, -1, 0, 0, 0, 0 } }; struct protox *protoprotox[] = { protox, nsprotox, isoprotox, NULL }; static void printproto __P((struct protox *, char *)); static void usage __P((void)); static struct protox *name2protox __P((char *)); static struct protox *knownname __P((char *)); kvm_t *kvmd; int main(argc, argv) int argc; char *argv[]; { extern char *optarg; extern int optind; register struct protoent *p; register struct protox *tp; /* for printing cblocks & stats */ register char *cp; int ch; char *nlistf = NULL, *memf = NULL; char buf[_POSIX2_LINE_MAX]; char buf2[_POSIX2_LINE_MAX]; if (cp = rindex(argv[0], '/')) prog = cp + 1; else prog = argv[0]; af = AF_UNSPEC; while ((ch = getopt(argc, argv, "Aabdf:ghI:iM:mN:np:rstuw:")) != EOF) switch(ch) { case 'A': Aflag = 1; break; case 'a': aflag = 1; break; case 'b': bflag = 1; break; case 'd': dflag = 1; break; case 'f': if (strcmp(optarg, "ns") == 0) af = AF_NS; else if (strcmp(optarg, "inet") == 0) af = AF_INET; else if (strcmp(optarg, "unix") == 0) af = AF_UNIX; else if (strcmp(optarg, "iso") == 0) af = AF_ISO; else { errx(1, "%s: unknown address family", optarg); } break; case 'g': gflag = 1; break; case 'I': { char *cp; iflag = 1; for (cp = interface = optarg; isalpha(*cp); cp++) continue; unit = atoi(cp); *cp = '\0'; break; } case 'i': iflag = 1; break; case 'M': memf = optarg; break; case 'm': mflag = 1; break; case 'N': nlistf = optarg; break; case 'n': nflag = 1; break; case 'p': if ((tp = name2protox(optarg)) == NULL) { - errx(1, + errx(1, "%s: unknown or uninstrumented protocol", optarg); } pflag = 1; break; case 'r': rflag = 1; break; case 's': ++sflag; break; case 't': tflag = 1; break; case 'u': af = AF_UNIX; break; case 'w': interval = atoi(optarg); iflag = 1; break; case '?': default: usage(); } argv += optind; argc -= optind; #define BACKWARD_COMPATIBILITY #ifdef BACKWARD_COMPATIBILITY if (*argv) { if (isdigit(**argv)) { interval = atoi(*argv); if (interval <= 0) usage(); ++argv; iflag = 1; } if (*argv) { nlistf = *argv; if (*++argv) memf = *argv; } } #endif /* * Discard setgid privileges if not the running kernel so that bad * guys can't print interesting stuff from kernel memory. */ if (nlistf != NULL || memf != NULL) setgid(getgid()); kvmd = kvm_openfiles(nlistf, memf, NULL, O_RDONLY, buf); if (kvmd == NULL) { errx(1, "kvm_open: %s", buf); } if (kvm_nlist(kvmd, nl) < 0) { if(nlistf) errx(1, "%s: kvm_nlist: %s", nlistf, kvm_geterr(kvmd)); else errx(1, "kvm_nlist: %s", kvm_geterr(kvmd)); } if (nl[0].n_type == 0) { if(nlistf) errx(1, "%s: no namelist", nlistf); else errx(1, "no namelist"); } if (mflag) { mbpr(nl[N_MBSTAT].n_value); exit(0); } if (pflag) { if (tp->pr_stats) (*tp->pr_stats)(nl[tp->pr_sindex].n_value, tp->pr_name); else printf("%s: no stats routine\n", tp->pr_name); exit(0); } /* * Keep file descriptors open to avoid overhead * of open/close on each call to get* routines. */ sethostent(1); setnetent(1); if (iflag) { intpr(interval, nl[N_IFNET].n_value); exit(0); } if (rflag) { if (sflag) rt_stats(nl[N_RTSTAT].n_value); else routepr(nl[N_RTREE].n_value); exit(0); } if (gflag) { if (sflag) mrt_stats(nl[N_MRTPROTO].n_value, nl[N_MRTSTAT].n_value); else mroutepr(nl[N_MRTPROTO].n_value, - nl[N_MRTTABLE].n_value, + nl[N_MFCTABLE].n_value, nl[N_VIFTABLE].n_value); exit(0); } if (af == AF_INET || af == AF_UNSPEC) { setprotoent(1); setservent(1); /* ugh, this is O(MN) ... why do we do this? */ while (p = getprotoent()) { for (tp = protox; tp->pr_name; tp++) if (strcmp(tp->pr_name, p->p_name) == 0) break; if (tp->pr_name == 0 || tp->pr_wanted == 0) continue; printproto(tp, p->p_name); } endprotoent(); } if (af == AF_NS || af == AF_UNSPEC) for (tp = nsprotox; tp->pr_name; tp++) printproto(tp, tp->pr_name); if (af == AF_ISO || af == AF_UNSPEC) for (tp = isoprotox; tp->pr_name; tp++) printproto(tp, tp->pr_name); if ((af == AF_UNIX || af == AF_UNSPEC) && !sflag) unixpr(nl[N_UNIXSW].n_value); exit(0); } /* * Print out protocol statistics or control blocks (per sflag). * If the interface was not specifically requested, and the symbol * is not in the namelist, ignore this one. */ static void printproto(tp, name) register struct protox *tp; char *name; { void (*pr)(); u_long off; if (sflag) { pr = tp->pr_stats; off = nl[tp->pr_sindex].n_value; } else { pr = tp->pr_cblocks; off = nl[tp->pr_index].n_value; } if (pr != NULL && (off || af != AF_UNSPEC)) (*pr)(off, name); } /* * Read kernel memory, return 0 on success. */ int kread(addr, buf, size) u_long addr; char *buf; int size; { if (kvm_read(kvmd, addr, buf, size) != size) { warnx("%s", kvm_geterr(kvmd)); return (-1); } return (0); } char * plural(n) int n; { return (n != 1 ? "s" : ""); } char * plurales(n) int n; { return (n != 1 ? "es" : ""); } /* * Find the protox for the given "well-known" name. */ static struct protox * knownname(name) char *name; { struct protox **tpp, *tp; for (tpp = protoprotox; *tpp; tpp++) for (tp = *tpp; tp->pr_name; tp++) if (strcmp(tp->pr_name, name) == 0) return (tp); return (NULL); } /* * Find the protox corresponding to name. */ static struct protox * name2protox(name) char *name; { struct protox *tp; char **alias; /* alias from p->aliases */ struct protoent *p; /* * Try to find the name in the list of "well-known" names. If that * fails, check if name is an alias for an Internet protocol. */ if (tp = knownname(name)) return (tp); setprotoent(1); /* make protocol lookup cheaper */ while (p = getprotoent()) { /* assert: name not same as p->name */ for (alias = p->p_aliases; *alias; alias++) if (strcmp(name, *alias) == 0) { endprotoent(); return (knownname(p->p_name)); } } endprotoent(); return (NULL); } static void usage() { (void)fprintf(stderr, "usage: %s [-Aan] [-f address_family] [-M core] [-N system]\n", prog); (void)fprintf(stderr, " %s [-bdghimnrs] [-f address_family] [-M core] [-N system]\n", prog); (void)fprintf(stderr, " %s [-bdn] [-I interface] [-M core] [-N system] [-w wait]\n", prog); (void)fprintf(stderr, " %s [-M core] [-N system] [-p protocol]\n", prog); exit(1); } Index: stable/2.1/usr.bin/netstat/mroute.c =================================================================== --- stable/2.1/usr.bin/netstat/mroute.c (revision 10583) +++ stable/2.1/usr.bin/netstat/mroute.c (revision 10584) @@ -1,237 +1,235 @@ /* * Copyright (c) 1989 Stephen Deering * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. * * This code is derived from software contributed to Berkeley by * Stephen Deering of Stanford University. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON 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 ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * @(#)mroute.c 8.1 (Berkeley) 6/6/93 */ /* * Print DVMRP multicast routing structures and statistics. * * MROUTING 1.0 */ #include #include #include #include +#include #include #include #include -#define KERNEL 1 +#include +#define KERNEL 1 /* XXX bogus! */ #include #undef KERNEL #include #include #include "netstat.h" void -mroutepr(mrpaddr, mrtaddr, vifaddr) - u_long mrpaddr, mrtaddr, vifaddr; +mroutepr(mrpaddr, mfcaddr, vifaddr) + u_long mrpaddr, mfcaddr, vifaddr; { -#if 0 u_int mrtproto; - struct mrt *mrttable[MRTHASHSIZ]; + struct mbuf *mfctable[MFCTBLSIZ]; struct vif viftable[MAXVIFS]; - register struct mrt *mrt; - struct mrt smrt; + struct mbuf mb, *m; + struct mfc smfc; register struct vif *v; register vifi_t vifi; register struct in_addr *grp; register int i, n; register int banner_printed; register int saved_nflag; + vifi_t maxvif; if (mrpaddr == 0) { printf("ip_mrtproto: symbol not in namelist\n"); return; } kread(mrpaddr, (char *)&mrtproto, sizeof(mrtproto)); switch (mrtproto) { case 0: printf("no multicast routing compiled into this system\n"); return; case IGMP_DVMRP: break; default: printf("multicast routing protocol %u, unknown\n", mrtproto); return; } - if (mrtaddr == 0) { - printf("mrttable: symbol not in namelist\n"); + if (mfcaddr == 0) { + printf("mfctable: symbol not in namelist\n"); return; } if (vifaddr == 0) { printf("viftable: symbol not in namelist\n"); return; } saved_nflag = nflag; nflag = 1; kread(vifaddr, (char *)&viftable, sizeof(viftable)); banner_printed = 0; for (vifi = 0, v = viftable; vifi < MAXVIFS; ++vifi, ++v) { if (v->v_lcl_addr.s_addr == 0) continue; + maxvif = vifi; if (!banner_printed) { - printf("\nVirtual Interface Table\n%s%s", - " Vif Threshold Local-Address ", - "Remote-Address Groups\n"); + printf("\nVirtual Interface Table\n" + " Vif Thresh Rate Local-Address " + "Remote-Address Pkts-In Pkts-Out\n"); banner_printed = 1; } - printf(" %2u %3u %-15.15s", - vifi, v->v_threshold, routename(v->v_lcl_addr.s_addr)); - printf(" %-15.15s\n", (v->v_flags & VIFF_TUNNEL) ? + printf(" %2u %6u %4d %-15.15s", + vifi, v->v_threshold, v->v_rate_limit, + routename(v->v_lcl_addr.s_addr)); + printf(" %-15.15s", (v->v_flags & VIFF_TUNNEL) ? routename(v->v_rmt_addr.s_addr) : ""); - n = v->v_lcl_grps_n; - grp = (struct in_addr *)malloc(n * sizeof(*grp)); - if (grp == NULL) { - printf("v_lcl_grps_n: malloc failed\n"); - return; - } - kread((u_long)v->v_lcl_grps, (caddr_t)grp, n * sizeof(*grp)); - for (i = 0; i < n; ++i) - printf("%51s %-15.15s\n", - "", routename((grp++)->s_addr)); - free(grp); + printf(" %9lu %9lu\n", v->v_pkt_in, v->v_pkt_out); } if (!banner_printed) printf("\nVirtual Interface Table is empty\n"); - kread(mrtaddr, (char *)&mrttable, sizeof(mrttable)); + kread(mfcaddr, (char *)&mfctable, sizeof(mfctable)); banner_printed = 0; - for (i = 0; i < MRTHASHSIZ; ++i) { - for (mrt = mrttable[i]; mrt != NULL; mrt = mrt->mrt_next) { + for (i = 0; i < MFCTBLSIZ; ++i) { + m = mfctable[i]; + while(m) { + kread((u_long)m, (char *)&mb, sizeof mb); + m = &mb; + if (!banner_printed) { - printf("\nMulticast Routing Table\n%s", - " Hash Origin-Subnet In-Vif Out-Vifs\n"); + printf("\nMulticast Forwarding Cache\n" + " Origin Group " + " Packets In-Vif Out-Vifs:Ttls\n"); banner_printed = 1; } - kread((u_long)mrt, (char *)&smrt, sizeof(*mrt)); - mrt = &smrt; - printf(" %3u %-15.15s %2u ", - i, netname(mrt->mrt_origin.s_addr, - ntohl(mrt->mrt_originmask.s_addr)), - mrt->mrt_parent); - for (vifi = 0; vifi < MAXVIFS; ++vifi) - if (VIFM_ISSET(vifi, mrt->mrt_children)) - printf(" %u%c", - vifi, - VIFM_ISSET(vifi, mrt->mrt_leaves) ? - '*' : ' '); + kread((u_long)mtod(m, char *), + (char *)&smfc, sizeof smfc); + printf(" %-15.15s", routename(smfc.mfc_origin.s_addr)); + printf(" %-15.15s", routename(smfc.mfc_mcastgrp.s_addr)); + printf(" %9lu", smfc.mfc_pkt_cnt); + printf(" %3d ", smfc.mfc_parent); + for (vifi = 0; vifi <= maxvif; vifi++) { + if (smfc.mfc_ttls[vifi] > 0) + printf(" %u:%u", vifi, + smfc.mfc_ttls[vifi]); + } printf("\n"); + m = m->m_act; } } if (!banner_printed) printf("\nMulticast Routing Table is empty\n"); printf("\n"); nflag = saved_nflag; -#else - printf("this isn't supported yet\n"); -#endif } void mrt_stats(mrpaddr, mstaddr) u_long mrpaddr, mstaddr; { u_int mrtproto; struct mrtstat mrtstat; if(mrpaddr == 0) { printf("ip_mrtproto: symbol not in namelist\n"); return; } kread(mrpaddr, (char *)&mrtproto, sizeof(mrtproto)); switch (mrtproto) { case 0: printf("no multicast routing compiled into this system\n"); return; case IGMP_DVMRP: break; default: printf("multicast routing protocol %u, unknown\n", mrtproto); return; } if (mstaddr == 0) { printf("mrtstat: symbol not in namelist\n"); return; } kread(mstaddr, (char *)&mrtstat, sizeof(mrtstat)); - printf("multicast routing:\n"); + printf("multicast forwarding:\n"); printf(" %10u multicast forwarding cache lookup%s\n", mrtstat.mrts_mfc_lookups, plural(mrtstat.mrts_mfc_lookups)); printf(" %10u multicast forwarding cache miss%s\n", mrtstat.mrts_mfc_misses, plurales(mrtstat.mrts_mfc_misses)); printf(" %10u upcall%s to mrouted\n", mrtstat.mrts_upcalls, plural(mrtstat.mrts_upcalls)); printf(" %10u upcall queue overflow%s\n", mrtstat.mrts_upq_ovflw, plural(mrtstat.mrts_upq_ovflw)); + printf(" %10u upcall%s dropped due to full socket buffer\n", + mrtstat.mrts_upq_sockfull, plural(mrtstat.mrts_upq_sockfull)); printf(" %10u cache cleanup%s\n", mrtstat.mrts_cache_cleanups, plural(mrtstat.mrts_cache_cleanups)); printf(" %10u datagram%s with no route for origin\n", mrtstat.mrts_no_route, plural(mrtstat.mrts_no_route)); - printf(" %10u datagram%s with malformed tunnel options\n", + printf(" %10u datagram%s arrived with bad tunneling\n", mrtstat.mrts_bad_tunnel, plural(mrtstat.mrts_bad_tunnel)); - printf(" %10u datagram%s with no room for tunnel options\n", + printf(" %10u datagram%s could not be tunneled\n", mrtstat.mrts_cant_tunnel, plural(mrtstat.mrts_cant_tunnel)); printf(" %10u datagram%s arrived on wrong interface\n", mrtstat.mrts_wrong_if, plural(mrtstat.mrts_wrong_if)); printf(" %10u datagram%s selectively dropped\n", mrtstat.mrts_drop_sel, plural(mrtstat.mrts_drop_sel)); printf(" %10u datagram%s dropped due to queue overflow\n", mrtstat.mrts_q_overflow, plural(mrtstat.mrts_q_overflow)); printf(" %10u datagram%s dropped for being too large\n", mrtstat.mrts_pkt2large, plural(mrtstat.mrts_pkt2large)); }