4.4BSD snapshot (revision 8.1); add 1993 to copyright

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

diff --git a/usr/src/usr.bin/netstat/inet.c b/usr/src/usr.bin/netstat/inet.c
index 0e284f1..c76bbdd 100644 (file)
--- a/usr/src/usr.bin/netstat/inet.c
+++ b/usr/src/usr.bin/netstat/inet.c
@@ -1,8 +1,15 @@
+/*
+ * Copyright (c) 1983, 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)inet.c     4.17 (Berkeley) 84/07/04";
-#endif
+static char sccsid[] = "@(#)inet.c     8.1 (Berkeley) %G%";
+#endif /* not lint */

 
 

-#include <sys/types.h>
+#include <sys/param.h>

 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/mbuf.h>


@@ -11,10 +18,11 @@ static char sccsid[] = "@(#)inet.c  4.17 (Berkeley) 84/07/04";
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>
 #include <net/route.h>
 #include <netinet/in.h>
 #include <netinet/in_systm.h>

-#include <netinet/in_pcb.h>

 #include <netinet/ip.h>
 #include <netinet/ip.h>

+#include <netinet/in_pcb.h>

 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>
 #include <netinet/ip_icmp.h>
 #include <netinet/icmp_var.h>

+#include <netinet/igmp_var.h>

 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>
 #include <netinet/ip_var.h>
 #include <netinet/tcp.h>
 #include <netinet/tcpip.h>


@@ -27,19 +35,19 @@ static char sccsid[] = "@(#)inet.c  4.17 (Berkeley) 84/07/04";
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 
 #include <netinet/udp.h>
 #include <netinet/udp_var.h>
 

+#include <arpa/inet.h>

 #include <netdb.h>
 #include <netdb.h>

+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include "netstat.h"

 
 struct inpcb inpcb;
 struct tcpcb tcpcb;
 
 struct inpcb inpcb;
 struct tcpcb tcpcb;

-struct socket socket;
-struct protosw proto;
-extern int kmem;
-extern int Aflag;
-extern int aflag;
-extern int nflag;
+struct socket sockb;

 
 

-static int first = 1;
-char   *inetname();
+char   *inetname __P((struct in_addr *));
+void   inetprint __P((struct in_addr *, int, char *));

 
 /*
  * Print a summary of connections related to an Internet
 
 /*
  * Print a summary of connections related to an Internet


@@ -47,62 +55,64 @@ char        *inetname();
  * Listening processes (aflag) are suppressed unless the
  * -a (all) flag is specified.
  */
  * Listening processes (aflag) are suppressed unless the
  * -a (all) flag is specified.
  */

+void

 protopr(off, name)
 protopr(off, name)

-       off_t off;
+       u_long off;

        char *name;
 {
        struct inpcb cb;
        register struct inpcb *prev, *next;
        int istcp;
        char *name;
 {
        struct inpcb cb;
        register struct inpcb *prev, *next;
        int istcp;

+       static int first = 1;

 
 

-       if (off == 0) {
-               printf("%s control block: symbol not in namelist\n", name);
+       if (off == 0)

                return;
                return;

-       }

        istcp = strcmp(name, "tcp") == 0;
        istcp = strcmp(name, "tcp") == 0;

-       klseek(kmem, off, 0);
-       read(kmem, &cb, sizeof (struct inpcb));
+       kread(off, (char *)&cb, sizeof (struct inpcb));

        inpcb = cb;
        prev = (struct inpcb *)off;
        inpcb = cb;
        prev = (struct inpcb *)off;

-       if (first) {
-               printf("Active connections");
-               if (aflag)
-                       printf(" (including servers)");
-               putchar('\n');
-               if (Aflag)
-                       printf("%-8.8s ", "PCB");
-               printf("%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
-                       "Proto", "Recv-Q", "Send-Q",
-                       "Local Address", "Foreign Address", "(state)");
-               first = 0;
-       }
+       if (inpcb.inp_next == (struct inpcb *)off)
+               return;

        while (inpcb.inp_next != (struct inpcb *)off) {
        while (inpcb.inp_next != (struct inpcb *)off) {

-               char *cp;
-

                next = inpcb.inp_next;
                next = inpcb.inp_next;

-               klseek(kmem, (off_t)next, 0);
-               read(kmem, &inpcb, sizeof (inpcb));
+               kread((u_long)next, (char *)&inpcb, sizeof (inpcb));

                if (inpcb.inp_prev != prev) {
                        printf("???\n");
                        break;
                }
                if (!aflag &&
                if (inpcb.inp_prev != prev) {
                        printf("???\n");
                        break;
                }
                if (!aflag &&

-                 inet_lnaof(inpcb.inp_laddr.s_addr) == INADDR_ANY) {
+                 inet_lnaof(inpcb.inp_laddr) == INADDR_ANY) {

                        prev = next;
                        continue;
                }
                        prev = next;
                        continue;
                }

-               klseek(kmem, (off_t)inpcb.inp_socket, 0);
-               read(kmem, &socket, sizeof (socket));
+               kread((u_long)inpcb.inp_socket, (char *)&sockb, sizeof (sockb));

                if (istcp) {
                if (istcp) {

-                       klseek(kmem, (off_t)inpcb.inp_ppcb, 0);
-                       read(kmem, &tcpcb, sizeof (tcpcb));
+                       kread((u_long)inpcb.inp_ppcb,
+                           (char *)&tcpcb, sizeof (tcpcb));
+               }
+               if (first) {
+                       printf("Active Internet connections");
+                       if (aflag)
+                               printf(" (including servers)");
+                       putchar('\n');
+                       if (Aflag)
+                               printf("%-8.8s ", "PCB");
+                       printf(Aflag ?
+                               "%-5.5s %-6.6s %-6.6s  %-18.18s %-18.18s %s\n" :
+                               "%-5.5s %-6.6s %-6.6s  %-22.22s %-22.22s %s\n",
+                               "Proto", "Recv-Q", "Send-Q",
+                               "Local Address", "Foreign Address", "(state)");
+                       first = 0;

                }
                if (Aflag)
                }
                if (Aflag)

-                       printf("%8x ", inpcb.inp_ppcb);
-               printf("%-5.5s %6d %6d ", name, socket.so_rcv.sb_cc,
-                       socket.so_snd.sb_cc);
-               inetprint(&inpcb.inp_laddr, inpcb.inp_lport, name);
-               inetprint(&inpcb.inp_faddr, inpcb.inp_fport, name);
+                       if (istcp)
+                               printf("%8x ", inpcb.inp_ppcb);
+                       else
+                               printf("%8x ", next);
+               printf("%-5.5s %6d %6d ", name, sockb.so_rcv.sb_cc,
+                       sockb.so_snd.sb_cc);
+               inetprint(&inpcb.inp_laddr, (int)inpcb.inp_lport, name);
+               inetprint(&inpcb.inp_faddr, (int)inpcb.inp_fport, name);

                if (istcp) {
                        if (tcpcb.t_state < 0 || tcpcb.t_state >= TCP_NSTATES)
                                printf(" %d", tcpcb.t_state);
                if (istcp) {
                        if (tcpcb.t_state < 0 || tcpcb.t_state >= TCP_NSTATES)
                                printf(" %d", tcpcb.t_state);


@@ -117,76 +127,158 @@ protopr(off, name)
 /*
  * Dump TCP statistics structure.
  */
 /*
  * Dump TCP statistics structure.
  */

+void

 tcp_stats(off, name)
 tcp_stats(off, name)

-       off_t off;
+       u_long off;

        char *name;
 {
        struct tcpstat tcpstat;
 
        char *name;
 {
        struct tcpstat tcpstat;
 

-       if (off == 0) {
-               printf("%sstat: symbol not in namelist\n", name);
+       if (off == 0)

                return;
                return;

-       }
-       klseek(kmem, off, 0);
-       read(kmem, (char *)&tcpstat, sizeof (tcpstat));
-       printf("%s:\n\t%d bad header checksum%s\n", name,
-               tcpstat.tcps_badsum, plural(tcpstat.tcps_badsum));
-       printf("\t%d bad header offset field%s\n",
-               tcpstat.tcps_badoff, plural(tcpstat.tcps_badoff));
-       printf("\t%d incomplete header%s\n",
-               tcpstat.tcps_hdrops, plural(tcpstat.tcps_hdrops));
-#ifdef notdef
-       printf("\t%d bad segment%s\n",
-               tcpstat.tcps_badsegs, plural(tcpstat.badsegs));
-       printf("\t%d unacknowledged packet%s\n",
-               tcpstat.tcps_unack, plural(tcpstat.tcps_unack));
-#endif
+       printf ("%s:\n", name);
+       kread(off, (char *)&tcpstat, sizeof (tcpstat));
+
+#define        p(f, m) if (tcpstat.f || sflag <= 1) \
+    printf(m, tcpstat.f, plural(tcpstat.f))
+#define        p2(f1, f2, m) if (tcpstat.f1 || tcpstat.f2 || sflag <= 1) \
+    printf(m, tcpstat.f1, plural(tcpstat.f1), tcpstat.f2, plural(tcpstat.f2))
+
+       p(tcps_sndtotal, "\t%d packet%s sent\n");
+       p2(tcps_sndpack,tcps_sndbyte,
+               "\t\t%d data packet%s (%d byte%s)\n");
+       p2(tcps_sndrexmitpack, tcps_sndrexmitbyte,
+               "\t\t%d data packet%s (%d byte%s) retransmitted\n");
+       p2(tcps_sndacks, tcps_delack,
+               "\t\t%d ack-only packet%s (%d delayed)\n");
+       p(tcps_sndurg, "\t\t%d URG only packet%s\n");
+       p(tcps_sndprobe, "\t\t%d window probe packet%s\n");
+       p(tcps_sndwinup, "\t\t%d window update packet%s\n");
+       p(tcps_sndctrl, "\t\t%d control packet%s\n");
+       p(tcps_rcvtotal, "\t%d packet%s received\n");
+       p2(tcps_rcvackpack, tcps_rcvackbyte, "\t\t%d ack%s (for %d byte%s)\n");
+       p(tcps_rcvdupack, "\t\t%d duplicate ack%s\n");
+       p(tcps_rcvacktoomuch, "\t\t%d ack%s for unsent data\n");
+       p2(tcps_rcvpack, tcps_rcvbyte,
+               "\t\t%d packet%s (%d byte%s) received in-sequence\n");
+       p2(tcps_rcvduppack, tcps_rcvdupbyte,
+               "\t\t%d completely duplicate packet%s (%d byte%s)\n");
+       p(tcps_pawsdrop, "\t\t%d old duplicate packet%s\n");
+       p2(tcps_rcvpartduppack, tcps_rcvpartdupbyte,
+               "\t\t%d packet%s with some dup. data (%d byte%s duped)\n");
+       p2(tcps_rcvoopack, tcps_rcvoobyte,
+               "\t\t%d out-of-order packet%s (%d byte%s)\n");
+       p2(tcps_rcvpackafterwin, tcps_rcvbyteafterwin,
+               "\t\t%d packet%s (%d byte%s) of data after window\n");
+       p(tcps_rcvwinprobe, "\t\t%d window probe%s\n");
+       p(tcps_rcvwinupd, "\t\t%d window update packet%s\n");
+       p(tcps_rcvafterclose, "\t\t%d packet%s received after close\n");
+       p(tcps_rcvbadsum, "\t\t%d discarded for bad checksum%s\n");
+       p(tcps_rcvbadoff, "\t\t%d discarded for bad header offset field%s\n");
+       p(tcps_rcvshort, "\t\t%d discarded because packet too short\n");
+       p(tcps_connattempt, "\t%d connection request%s\n");
+       p(tcps_accepts, "\t%d connection accept%s\n");
+       p(tcps_connects, "\t%d connection%s established (including accepts)\n");
+       p2(tcps_closed, tcps_drops,
+               "\t%d connection%s closed (including %d drop%s)\n");
+       p(tcps_conndrops, "\t%d embryonic connection%s dropped\n");
+       p2(tcps_rttupdated, tcps_segstimed,
+               "\t%d segment%s updated rtt (of %d attempt%s)\n");
+       p(tcps_rexmttimeo, "\t%d retransmit timeout%s\n");
+       p(tcps_timeoutdrop, "\t\t%d connection%s dropped by rexmit timeout\n");
+       p(tcps_persisttimeo, "\t%d persist timeout%s\n");
+       p(tcps_keeptimeo, "\t%d keepalive timeout%s\n");
+       p(tcps_keepprobe, "\t\t%d keepalive probe%s sent\n");
+       p(tcps_keepdrops, "\t\t%d connection%s dropped by keepalive\n");
+#undef p
+#undef p2

 }
 
 /*
  * Dump UDP statistics structure.
  */
 }
 
 /*
  * Dump UDP statistics structure.
  */

+void

 udp_stats(off, name)
 udp_stats(off, name)

-       off_t off;
+       u_long off;

        char *name;
 {
        struct udpstat udpstat;
        char *name;
 {
        struct udpstat udpstat;

+       u_long delivered;

 
 

-       if (off == 0) {
-               printf("%sstat: symbol not in namelist\n", name);
+       if (off == 0)

                return;
                return;

-       }
-       klseek(kmem, off, 0);
-       read(kmem, (char *)&udpstat, sizeof (udpstat));
-       printf("%s:\n\t%d bad header checksum%s\n", name,
-               udpstat.udps_badsum, plural(udpstat.udps_badsum));
-       printf("\t%d incomplete header%s\n",
-               udpstat.udps_hdrops, plural(udpstat.udps_hdrops));
-       printf("\t%d bad data length field%s\n",
-               udpstat.udps_badlen, plural(udpstat.udps_badlen));
+       kread(off, (char *)&udpstat, sizeof (udpstat));
+       printf("%s:\n", name);
+#define        p(f, m) if (udpstat.f || sflag <= 1) \
+    printf(m, udpstat.f, plural(udpstat.f))
+       p(udps_ipackets, "\t%u datagram%s received\n");
+       p(udps_hdrops, "\t%u with incomplete header\n");
+       p(udps_badlen, "\t%u with bad data length field\n");
+       p(udps_badsum, "\t%u with bad checksum\n");
+       p(udps_noport, "\t%u dropped due to no socket\n");
+       p(udps_noportbcast, "\t%u broadcast/multicast datagram%s dropped due to no socket\n");
+       p(udps_fullsock, "\t%u dropped due to full socket buffers\n");
+       delivered = udpstat.udps_ipackets -
+                   udpstat.udps_hdrops -
+                   udpstat.udps_badlen -
+                   udpstat.udps_badsum -
+                   udpstat.udps_noport -
+                   udpstat.udps_noportbcast -
+                   udpstat.udps_fullsock;
+       if (delivered || sflag <= 1)
+               printf("\t%u delivered\n", delivered);
+       p(udps_opackets, "\t%u datagram%s output\n");
+#undef p
+#ifdef sun
+       printf("\t%d socket overflow%s\n",
+               udpstat.udps_fullsock, plural(udpstat.udps_fullsock));
+#endif

 }
 
 /*
  * Dump IP statistics structure.
  */
 }
 
 /*
  * Dump IP statistics structure.
  */

+void

 ip_stats(off, name)
 ip_stats(off, name)

-       off_t off;
+       u_long off;

        char *name;
 {
        struct ipstat ipstat;
 
        char *name;
 {
        struct ipstat ipstat;
 

-       if (off == 0) {
-               printf("%sstat: symbol not in namelist\n", name);
+       if (off == 0)

                return;
                return;

-       }
-       klseek(kmem, off, 0);
-       read(kmem, (char *)&ipstat, sizeof (ipstat));
-       printf("%s:\n\t%d bad header checksum%s\n", name,
-               ipstat.ips_badsum, plural(ipstat.ips_badsum));
-       printf("\t%d with size smaller than minimum\n", ipstat.ips_tooshort);
-       printf("\t%d with data size < data length\n", ipstat.ips_toosmall);
-       printf("\t%d with header length < data size\n", ipstat.ips_badhlen);
-       printf("\t%d with data length < header length\n", ipstat.ips_badlen);
+       kread(off, (char *)&ipstat, sizeof (ipstat));
+       printf("%s:\n", name);
+
+#define        p(f, m) if (ipstat.f || sflag <= 1) \
+    printf(m, ipstat.f, plural(ipstat.f))
+
+       p(ips_total, "\t%u total packet%s received\n");
+       p(ips_badsum, "\t%u bad header checksum%s\n");
+       p(ips_tooshort, "\t%u with size smaller than minimum\n");
+       p(ips_toosmall, "\t%u with data size < data length\n");
+       p(ips_badhlen, "\t%u with header length < data size\n");
+       p(ips_badlen, "\t%u with data length < header length\n");
+       p(ips_badoptions, "\t%u with bad options\n");
+       p(ips_badvers, "\t%u with incorrect version number\n");
+       p(ips_fragments, "\t%u fragment%s received\n");
+       p(ips_fragdropped, "\t%u fragment%s dropped (dup or out of space)\n");
+       p(ips_fragtimeout, "\t%u fragment%s dropped after timeout\n");
+       p(ips_reassembled, "\t%u packet%s reassembled ok\n");
+       p(ips_delivered, "\t%u packet%s for this host\n");
+       p(ips_noproto, "\t%u packet%s for unknown/unsupported protocol\n");
+       p(ips_forward, "\t%u packet%s forwarded\n");
+       p(ips_cantforward, "\t%u packet%s not forwardable\n");
+       p(ips_redirectsent, "\t%u redirect%s sent\n");
+       p(ips_localout, "\t%u packet%s sent from this host\n");
+       p(ips_rawout, "\t%u packet%s sent with fabricated ip header\n");
+       p(ips_odropped, "\t%u output packet%s dropped due to no bufs, etc.\n");
+       p(ips_noroute, "\t%u output packet%s discarded due to no route\n");
+       p(ips_fragmented, "\t%u output datagram%s fragmented\n");
+       p(ips_ofragments, "\t%u fragment%s created\n");
+       p(ips_cantfrag, "\t%u datagram%s that can't be fragmented\n");
+#undef p
+#endif

 }
 
 static char *icmpnames[] = {
 }
 
 static char *icmpnames[] = {


@@ -206,130 +298,170 @@ static  char *icmpnames[] = {
        "time stamp",
        "time stamp reply",
        "information request",
        "time stamp",
        "time stamp reply",
        "information request",

-       "information request reply"
+       "information request reply",
+       "address mask request",
+       "address mask reply",

 };
 
 /*
  * Dump ICMP statistics.
  */
 };
 
 /*
  * Dump ICMP statistics.
  */

+void

 icmp_stats(off, name)
 icmp_stats(off, name)

-       off_t off;
+       u_long off;

        char *name;
 {
        struct icmpstat icmpstat;
        register int i, first;
 
        char *name;
 {
        struct icmpstat icmpstat;
        register int i, first;
 

-       if (off == 0) {
-               printf("%sstat: symbol not in namelist\n", name);
+       if (off == 0)

                return;
                return;

-       }
-       klseek(kmem, off, 0);
-       read(kmem, (char *)&icmpstat, sizeof (icmpstat));
-       printf("%s:\n\t%d call%s to icmp_error\n", name,
-               icmpstat.icps_error, plural(icmpstat.icps_error));
-       printf("\t%d error%s not generated 'cuz old message too short\n",
-               icmpstat.icps_oldshort, plural(icmpstat.icps_oldshort));
-       printf("\t%d error%s not generated 'cuz old message was icmp\n",
-               icmpstat.icps_oldicmp, plural(icmpstat.icps_oldicmp));
-       for (first = 1, i = 0; i < ICMP_IREQREPLY + 1; i++)
+       kread(off, (char *)&icmpstat, sizeof (icmpstat));
+       printf("%s:\n", name);
+
+#define        p(f, m) if (icmpstat.f || sflag <= 1) \
+    printf(m, icmpstat.f, plural(icmpstat.f))
+
+       p(icps_error, "\t%u call%s to icmp_error\n");
+       p(icps_oldicmp,
+           "\t%u error%s not generated 'cuz old message was icmp\n");
+       for (first = 1, i = 0; i < ICMP_MAXTYPE + 1; i++)

                if (icmpstat.icps_outhist[i] != 0) {
                        if (first) {
                                printf("\tOutput histogram:\n");
                                first = 0;
                        }
                if (icmpstat.icps_outhist[i] != 0) {
                        if (first) {
                                printf("\tOutput histogram:\n");
                                first = 0;
                        }

-                       printf("\t\t%s: %d\n", icmpnames[i],
+                       printf("\t\t%s: %u\n", icmpnames[i],

                                icmpstat.icps_outhist[i]);
                }
                                icmpstat.icps_outhist[i]);
                }

-       printf("\t%d message%s with bad code fields\n",
-               icmpstat.icps_badcode, plural(icmpstat.icps_badcode));
-       printf("\t%d message%s < minimum length\n",
-               icmpstat.icps_tooshort, plural(icmpstat.icps_tooshort));
-       printf("\t%d bad checksum%s\n",
-               icmpstat.icps_checksum, plural(icmpstat.icps_checksum));
-       printf("\t%d message%s with bad length\n",
-               icmpstat.icps_badlen, plural(icmpstat.icps_badlen));
-       printf("\t%d message response%s generated\n",
-               icmpstat.icps_reflect, plural(icmpstat.icps_reflect));
-       for (first = 1, i = 0; i < ICMP_IREQREPLY + 1; i++)
+       p(icps_badcode, "\t%u message%s with bad code fields\n");
+       p(icps_tooshort, "\t%u message%s < minimum length\n");
+       p(icps_checksum, "\t%u bad checksum%s\n");
+       p(icps_badlen, "\t%u message%s with bad length\n");
+       for (first = 1, i = 0; i < ICMP_MAXTYPE + 1; i++)

                if (icmpstat.icps_inhist[i] != 0) {
                        if (first) {
                                printf("\tInput histogram:\n");
                                first = 0;
                        }
                if (icmpstat.icps_inhist[i] != 0) {
                        if (first) {
                                printf("\tInput histogram:\n");
                                first = 0;
                        }

-                       printf("\t\t%s: %d\n", icmpnames[i],
+                       printf("\t\t%s: %u\n", icmpnames[i],

                                icmpstat.icps_inhist[i]);
                }
                                icmpstat.icps_inhist[i]);
                }

+       p(icps_reflect, "\t%u message response%s generated\n");
+#undef p
+}
+
+/*
+ * Dump IGMP statistics structure.
+ */
+void
+igmp_stats(off, name)
+       u_long off;
+       char *name;
+{
+       struct igmpstat igmpstat;
+
+       if (off == 0)
+               return;
+       kread(off, (char *)&igmpstat, sizeof (igmpstat));
+       printf("%s:\n", name);
+
+#define        p(f, m) if (igmpstat.f || sflag <= 1) \
+    printf(m, igmpstat.f, plural(igmpstat.f))
+#define        py(f, m) if (igmpstat.f || sflag <= 1) \
+    printf(m, igmpstat.f, igmpstat.f != 1 ? "ies" : "y")
+       p(igps_rcv_total, "\t%u message%s received\n");
+        p(igps_rcv_tooshort, "\t%u message%s received with too few bytes\n");
+        p(igps_rcv_badsum, "\t%u message%s received with bad checksum\n");
+        py(igps_rcv_queries, "\t%u membership quer%s received\n");
+        py(igps_rcv_badqueries, "\t%u membership quer%s received with invalid field(s)\n");
+        p(igps_rcv_reports, "\t%u membership report%s received\n");
+        p(igps_rcv_badreports, "\t%u membership report%s received with invalid field(s)\n");
+        p(igps_rcv_ourreports, "\t%u membership report%s received for groups to which we belong\n");
+        p(igps_snd_reports, "\t%u membership report%s sent\n");
+#undef p
+#undef py

 }
 
 /*
  * Pretty print an Internet address (net address + port).
  * If the nflag was specified, use numbers instead of names.
  */
 }
 
 /*
  * Pretty print an Internet address (net address + port).
  * If the nflag was specified, use numbers instead of names.
  */

+void

 inetprint(in, port, proto)
        register struct in_addr *in;
        int port;
        char *proto;
 {
        struct servent *sp = 0;
 inetprint(in, port, proto)
        register struct in_addr *in;
        int port;
        char *proto;
 {
        struct servent *sp = 0;

-       char line[80], *cp, *index();
+       char line[80], *cp;
+       int width;

 
 

-       sprintf(line, "%.16s.", inetname(*in));
+       sprintf(line, "%.*s.", (Aflag && !nflag) ? 12 : 16, inetname(in));

        cp = index(line, '\0');
        if (!nflag && port)
        cp = index(line, '\0');
        if (!nflag && port)

-               sp = getservbyport(port, proto);
+               sp = getservbyport((int)port, proto);

        if (sp || port == 0)
                sprintf(cp, "%.8s", sp ? sp->s_name : "*");
        else
                sprintf(cp, "%d", ntohs((u_short)port));
        if (sp || port == 0)
                sprintf(cp, "%.8s", sp ? sp->s_name : "*");
        else
                sprintf(cp, "%d", ntohs((u_short)port));

-       printf(" %-22.22s", line);
+       width = Aflag ? 18 : 22;
+       printf(" %-*.*s", width, width, line);

 }
 
 /*
  * Construct an Internet address representation.
 }
 
 /*
  * Construct an Internet address representation.

- * If the nflag has been supplied, give 
+ * If the nflag has been supplied, give

  * numeric value, otherwise try for symbolic name.
  */
 char *
  * numeric value, otherwise try for symbolic name.
  */
 char *

-inetname(in)
-       struct in_addr in;
+inetname(inp)
+       struct in_addr *inp;

 {
 {

-       char *cp = 0;
+       register char *cp;

        static char line[50];
        struct hostent *hp;
        struct netent *np;
        static char line[50];
        struct hostent *hp;
        struct netent *np;

+       static char domain[MAXHOSTNAMELEN + 1];
+       static int first = 1;

 
 

-       if (!nflag && in.s_addr != INADDR_ANY) {
-               int net = inet_netof(in), subnet = inet_subnetof(in);
-               int lna = inet_lnaof(in);
+       if (first && !nflag) {
+               first = 0;
+               if (gethostname(domain, MAXHOSTNAMELEN) == 0 &&
+                   (cp = index(domain, '.')))
+                       (void) strcpy(domain, cp + 1);
+               else
+                       domain[0] = 0;
+       }
+       cp = 0;
+       if (!nflag && inp->s_addr != INADDR_ANY) {
+               int net = inet_netof(*inp);
+               int lna = inet_lnaof(*inp);

 
                if (lna == INADDR_ANY) {
                        np = getnetbyaddr(net, AF_INET);
                        if (np)
                                cp = np->n_name;
 
                if (lna == INADDR_ANY) {
                        np = getnetbyaddr(net, AF_INET);
                        if (np)
                                cp = np->n_name;

-               } else if (subnet != net && (lna & 0xff) == 0 &&
-                   (np = getnetbyaddr(subnet, AF_INET))) {
-                       struct in_addr subnaddr, inet_makeaddr();
-
-                       subnaddr = inet_makeaddr(subnet, INADDR_ANY);
-                       if (bcmp(&in, &subnaddr, sizeof (in)) == 0)
-                               cp = np->n_name;
-                       else
-                               goto host;
-               } else {
-host:
-                       hp = gethostbyaddr(&in, sizeof (in), AF_INET);
-                       if (hp)
+               }
+               if (cp == 0) {
+                       hp = gethostbyaddr((char *)inp, sizeof (*inp), AF_INET);
+                       if (hp) {
+                               if ((cp = index(hp->h_name, '.')) &&
+                                   !strcmp(cp + 1, domain))
+                                       *cp = 0;

                                cp = hp->h_name;
                                cp = hp->h_name;

+                       }

                }
        }
                }
        }

-       if (in.s_addr == INADDR_ANY)
+       if (inp->s_addr == INADDR_ANY)

                strcpy(line, "*");
        else if (cp)
                strcpy(line, cp);
        else {
                strcpy(line, "*");
        else if (cp)
                strcpy(line, cp);
        else {

-               u_char *ucp = (u_char *)&in;
-
-               sprintf(line, "%u.%u.%u.%u", ucp[0], ucp[1], ucp[2], ucp[3]);
+               inp->s_addr = ntohl(inp->s_addr);
+#define C(x)   ((x) & 0xff)
+               sprintf(line, "%u.%u.%u.%u", C(inp->s_addr >> 24),
+                   C(inp->s_addr >> 16), C(inp->s_addr >> 8), C(inp->s_addr));

        }
        return (line);
 }
        }
        return (line);
 }