BSD 4_4 release

[unix-history] / usr / src / usr.bin / netstat / unix.c

diff --git a/usr/src/usr.bin/netstat/unix.c b/usr/src/usr.bin/netstat/unix.c
index 9ff30eb..0310b68 100644 (file)
--- a/usr/src/usr.bin/netstat/unix.c
+++ b/usr/src/usr.bin/netstat/unix.c
@@ -1,12 +1,38 @@
 /*-
 /*-

- * Copyright (c) 1983, 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  *

- * %sccs.include.redist.c%
+ * 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
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)unix.c     5.12 (Berkeley) %G%";
+static char sccsid[] = "@(#)unix.c     8.1 (Berkeley) 6/6/93";

 #endif /* not lint */
 
 /*
 #endif /* not lint */
 
 /*


@@ -18,31 +44,36 @@ static char sccsid[] = "@(#)unix.c  5.12 (Berkeley) %G%";
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>

-#include <sys/kinfo.h>
+#include <sys/sysctl.h>

 #include <sys/un.h>
 #include <sys/unpcb.h>
 #define KERNEL
 struct uio;
 struct proc;
 #include <sys/file.h>
 #include <sys/un.h>
 #include <sys/unpcb.h>
 #define KERNEL
 struct uio;
 struct proc;
 #include <sys/file.h>

+
+#include <netinet/in.h>
+
+#include <stdio.h>

 #include <stdlib.h>
 #include "netstat.h"
 
 #include <stdlib.h>
 #include "netstat.h"
 

-static void unixdomainpr __P((struct socket *, caddr_t));
+static void unixdomainpr __P((struct socket *, caddr_t));

 
 

-struct file *file, *fileNFILE;
-int nfiles;
+static struct  file *file, *fileNFILE;
+static int     nfiles;

 extern kvm_t *kvmd;
 
 void
 extern kvm_t *kvmd;
 
 void

-unixpr(unixsw)
-       struct protosw *unixsw;
+unixpr(off)
+       u_long  off;

 {
        register struct file *fp;
        struct socket sock, *so = &sock;
        char *filebuf;
 {
        register struct file *fp;
        struct socket sock, *so = &sock;
        char *filebuf;

+       struct protosw *unixsw = (struct protosw *)off;

 
 

-       filebuf = (char *)kvm_getfiles(kvmd, KINFO_FILE, 0, &nfiles);
+       filebuf = (char *)kvm_getfiles(kvmd, KERN_FILE, 0, &nfiles);

        if (filebuf == 0) {
                printf("Out of memory (file table).\n");
                return;
        if (filebuf == 0) {
                printf("Out of memory (file table).\n");
                return;


@@ -52,7 +83,7 @@ unixpr(unixsw)
        for (fp = file; fp < fileNFILE; fp++) {
                if (fp->f_count == 0 || fp->f_type != DTYPE_SOCKET)
                        continue;
        for (fp = file; fp < fileNFILE; fp++) {
                if (fp->f_count == 0 || fp->f_type != DTYPE_SOCKET)
                        continue;

-               if (kread((off_t)fp->f_data, (char *)so, sizeof (*so)))
+               if (kread((u_long)fp->f_data, (char *)so, sizeof (*so)))

                        continue;
                /* kludge */
                if (so->so_proto >= unixsw && so->so_proto <= unixsw + 2)
                        continue;
                /* kludge */
                if (so->so_proto >= unixsw && so->so_proto <= unixsw + 2)


@@ -74,11 +105,11 @@ unixdomainpr(so, soaddr)
        struct sockaddr_un *sa;
        static int first = 1;
 
        struct sockaddr_un *sa;
        static int first = 1;
 

-       if (kread((off_t)so->so_pcb, (char *)unp, sizeof (*unp)))
+       if (kread((u_long)so->so_pcb, (char *)unp, sizeof (*unp)))

                return;
        if (unp->unp_addr) {
                m = &mbuf;
                return;
        if (unp->unp_addr) {
                m = &mbuf;

-               if (kread((off_t)unp->unp_addr, (char *)m, sizeof (*m)))
+               if (kread((u_long)unp->unp_addr, (char *)m, sizeof (*m)))

                        m = (struct mbuf *)0;
                sa = (struct sockaddr_un *)(m->m_dat);
        } else
                        m = (struct mbuf *)0;
                sa = (struct sockaddr_un *)(m->m_dat);
        } else


@@ -96,7 +127,8 @@ unixdomainpr(so, soaddr)
            unp->unp_vnode, unp->unp_conn,
            unp->unp_refs, unp->unp_nextref);
        if (m)
            unp->unp_vnode, unp->unp_conn,
            unp->unp_refs, unp->unp_nextref);
        if (m)

-               printf(" %.*s", m->m_len - sizeof(sa->sun_family),
+               printf(" %.*s",
+                   m->m_len - (int)(sizeof(*sa) - sizeof(sa->sun_path)),

                    sa->sun_path);
        putchar('\n');
 }
                    sa->sun_path);
        putchar('\n');
 }