X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/6b9930b0f3474c6cdeef1fe8f97a2b8c96329176..326544bada07ffb64f8ae336ff22d393cf092281:/usr/src/usr.bin/netstat/route.c

diff --git a/usr/src/usr.bin/netstat/route.c b/usr/src/usr.bin/netstat/route.c
index c7455da2bf..13aec773e1 100644
--- a/usr/src/usr.bin/netstat/route.c
+++ b/usr/src/usr.bin/netstat/route.c
@@ -1,28 +1,39 @@
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+ * Copyright (c) 1983, 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * %sccs.include.redist.c%
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)route.c	5.5 85/09/18";
-#endif
+static char sccsid[] = "@(#)route.c	8.4 (Berkeley) %G%";
+#endif /* not lint */
 
 #include <sys/param.h>
+#include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 
 #include <net/if.h>
+#include <net/if_dl.h>
+#include <net/if_types.h>
+#define  KERNEL
 #include <net/route.h>
+#undef KERNEL
 #include <netinet/in.h>
 
 #include <netns/ns.h>
 
+#include <sys/sysctl.h>
+
 #include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "netstat.h"
 
-extern	int kmem;
-extern	int nflag;
-extern	char *routename(), *netname(), *ns_print();
+#define kget(p, d) (kread((u_long)(p), (char *)&(d), sizeof (d)))
 
 /*
  * Definitions for showing gateway flags.
@@ -34,119 +45,405 @@ struct bits {
 	{ RTF_UP,	'U' },
 	{ RTF_GATEWAY,	'G' },
 	{ RTF_HOST,	'H' },
+	{ RTF_REJECT,	'R' },
 	{ RTF_DYNAMIC,	'D' },
+	{ RTF_MODIFIED,	'M' },
+	{ RTF_DONE,	'd' }, /* Completed -- for routing messages only */
+	{ RTF_MASK,	'm' }, /* Mask Present -- for routing messages only */
+	{ RTF_CLONING,	'C' },
+	{ RTF_XRESOLVE,	'X' },
+	{ RTF_LLINFO,	'L' },
+	{ RTF_STATIC,	'S' },
+	{ RTF_PROTO1,	'1' },
+	{ RTF_PROTO2,	'2' },
 	{ 0 }
 };
 
+static union {
+	struct	sockaddr u_sa;
+	u_short	u_data[128];
+} pt_u;
+
+int	do_rtent = 0;
+struct	rtentry rtentry;
+struct	radix_node rnode;
+struct	radix_mask rmask;
+
+int	NewTree = 0;
+
+static struct sockaddr *kgetsa __P((struct sockaddr *));
+static void p_tree __P((struct radix_node *));
+static void p_rtnode __P(());
+static void ntreestuff __P(());
+static void np_rtentry __P((struct rt_msghdr *));
+static void p_sockaddr __P((struct sockaddr *, int, int));
+static void p_flags __P((int, char *));
+static void p_rtentry __P((struct rtentry *));
+
 /*
  * Print routing tables.
  */
-routepr(hostaddr, netaddr, hashsizeaddr)
-	off_t hostaddr, netaddr, hashsizeaddr;
+void
+routepr(rtree)
+	u_long rtree;
 {
-	struct mbuf mb;
-	register struct rtentry *rt;
-	register struct mbuf *m;
-	register struct bits *p;
-	char name[16], *flags;
-	struct mbuf **routehash;
-	struct ifnet ifnet;
-	int hashsize;
-	int i, doinghost = 1;
-
-	if (hostaddr == 0) {
-		printf("rthost: symbol not in namelist\n");
-		return;
-	}
-	if (netaddr == 0) {
-		printf("rtnet: symbol not in namelist\n");
-		return;
+	struct radix_node_head *rnh, head;
+	int i;
+
+	printf("Routing tables\n");
+
+	if (Aflag == 0 && NewTree)
+		ntreestuff();
+	else {
+		if (rtree == 0) {
+			printf("rt_tables: symbol not in namelist\n");
+			return;
+		}
+
+		kget(rtree, rt_tables);
+		for (i = 0; i <= AF_MAX; i++) {
+			if ((rnh = rt_tables[i]) == 0)
+				continue;
+			kget(rnh, head);
+			if (i == AF_UNSPEC) {
+				if (Aflag && af == 0) {
+					printf("Netmasks:\n");
+					p_tree(head.rnh_treetop);
+				}
+			} else if (af == AF_UNSPEC || af == i) {
+				pr_family(i);
+				do_rtent = 1;
+				pr_rthdr();
+				p_tree(head.rnh_treetop);
+			}
+		}
 	}
-	if (hashsizeaddr == 0) {
-		printf("rthashsize: symbol not in namelist\n");
-		return;
+}
+
+/*
+ * Print address family header before a section of the routing table.
+ */
+void
+pr_family(af)
+	int af;
+{
+	char *afname;
+
+	switch (af) {
+	case AF_INET:
+		afname = "Internet";
+		break;
+	case AF_NS:
+		afname = "XNS";
+		break;
+	case AF_ISO:
+		afname = "ISO";
+		break;
+	case AF_CCITT:
+		afname = "X.25";
+		break;
+	default:
+		afname = NULL;
+		break;
 	}
-	klseek(kmem, hashsizeaddr, 0);
-	read(kmem, &hashsize, sizeof (hashsize));
-	routehash = (struct mbuf **)malloc( hashsize*sizeof (struct mbuf *) );
-	klseek(kmem, hostaddr, 0);
-	read(kmem, routehash, hashsize*sizeof (struct mbuf *));
-	printf("Routing tables\n");
-	printf("%-15.15s %-15.15s %-8.8s %-6.6s %-10.10s %s\n",
-		"Destination", "Gateway",
-		"Flags", "Refcnt", "Use", "Interface");
+	if (afname)
+		printf("\n%s:\n", afname);
+	else
+		printf("\nProtocol Family %d:\n", af);
+}
+
+/* column widths; each followed by one space */
+#define	WID_DST		16	/* width of destination column */
+#define	WID_GW		18	/* width of gateway column */
+
+/*
+ * Print header for routing table columns.
+ */
+void
+pr_rthdr()
+{
+
+	if (Aflag)
+		printf("%-8.8s ","Address");
+	printf("%-*.*s %-*.*s %-6.6s  %6.6s%8.8s  %s\n",
+		WID_DST, WID_DST, "Destination",
+		WID_GW, WID_GW, "Gateway",
+		"Flags", "Refs", "Use", "Interface");
+}
+
+static struct sockaddr *
+kgetsa(dst)
+	register struct sockaddr *dst;
+{
+
+	kget(dst, pt_u.u_sa);
+	if (pt_u.u_sa.sa_len > sizeof (pt_u.u_sa))
+		kread((u_long)dst, (char *)pt_u.u_data, pt_u.u_sa.sa_len);
+	return (&pt_u.u_sa);
+}
+
+static void
+p_tree(rn)
+	struct radix_node *rn;
+{
+
 again:
-	for (i = 0; i < hashsize; i++) {
-		if (routehash[i] == 0)
-			continue;
-		m = routehash[i];
-		while (m) {
-			struct sockaddr_in *sin;
-			struct sockaddr_ns *sns;
-			long *l = (long *)&rt->rt_dst;
-
-			klseek(kmem, m, 0);
-			read(kmem, &mb, sizeof (mb));
-			rt = mtod(&mb, struct rtentry *);
-			switch(rt->rt_dst.sa_family) {
-		case AF_INET:
-			sin = (struct sockaddr_in *)&rt->rt_dst;
-			printf("%-15.15s ",
-			    (sin->sin_addr.s_addr == 0) ? "default" :
-			    (rt->rt_flags & RTF_HOST) ?
-			    routename(sin->sin_addr) : netname(sin->sin_addr, 0));
-			sin = (struct sockaddr_in *)&rt->rt_gateway;
-			printf("%-15.15s ", routename(sin->sin_addr));
-			break;
-		case AF_NS:
-			printf("%-15s ",
-			    ns_print((struct sockaddr_ns *)&rt->rt_dst));
-			printf("%-15s ",
-			    ns_print((struct sockaddr_ns *)&rt->rt_gateway));
+	kget(rn, rnode);
+	if (rnode.rn_b < 0) {
+		if (Aflag)
+			printf("%-8.8x ", rn);
+		if (rnode.rn_flags & RNF_ROOT) {
+			if (Aflag)
+				printf("(root node)%s",
+				    rnode.rn_dupedkey ? " =>\n" : "\n");
+		} else if (do_rtent) {
+			kget(rn, rtentry);
+			p_rtentry(&rtentry);
+			if (Aflag)
+				p_rtnode();
+		} else {
+			p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_key),
+			    0, 44);
+			putchar('\n');
+		}
+		if (rn = rnode.rn_dupedkey)
+			goto again;
+	} else {
+		if (Aflag && do_rtent) {
+			printf("%-8.8x ", rn);
+			p_rtnode();
+		}
+		rn = rnode.rn_r;
+		p_tree(rnode.rn_l);
+		p_tree(rn);
+	}
+}
+
+char	nbuf[20];
+
+static void
+p_rtnode()
+{
+	struct radix_mask *rm = rnode.rn_mklist;
+
+	if (rnode.rn_b < 0) {
+		if (rnode.rn_mask) {
+			printf("\t  mask ");
+			p_sockaddr(kgetsa((struct sockaddr *)rnode.rn_mask),
+				    0, -1);
+		} else if (rm == 0)
+			return;
+	} else {
+		sprintf(nbuf, "(%d)", rnode.rn_b);
+		printf("%6.6s %8.8x : %8.8x", nbuf, rnode.rn_l, rnode.rn_r);
+	}
+	while (rm) {
+		kget(rm, rmask);
+		sprintf(nbuf, " %d refs, ", rmask.rm_refs);
+		printf(" mk = %8.8x {(%d),%s",
+			rm, -1 - rmask.rm_b, rmask.rm_refs ? nbuf : " ");
+		p_sockaddr(kgetsa((struct sockaddr *)rmask.rm_mask), 0, -1);
+		putchar('}');
+		if (rm = rmask.rm_mklist)
+			printf(" ->");
+	}
+	putchar('\n');
+}
+
+static void
+ntreestuff()
+{
+	size_t needed;
+	int mib[6];
+	char *buf, *next, *lim;
+	register struct rt_msghdr *rtm;
+
+        mib[0] = CTL_NET;
+        mib[1] = PF_ROUTE;
+        mib[2] = 0;
+        mib[3] = 0;
+        mib[4] = NET_RT_DUMP;
+        mib[5] = 0;
+        if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
+		{ perror("route-sysctl-estimate"); exit(1);}
+	if ((buf = malloc(needed)) == 0)
+		{ printf("out of space\n"); exit(1);}
+        if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
+		{ perror("sysctl of routing table"); exit(1);}
+	lim  = buf + needed;
+	for (next = buf; next < lim; next += rtm->rtm_msglen) {
+		rtm = (struct rt_msghdr *)next;
+		np_rtentry(rtm);
+	}
+}
+
+static void
+np_rtentry(rtm)
+	register struct rt_msghdr *rtm;
+{
+	register struct sockaddr *sa = (struct sockaddr *)(rtm + 1);
+#ifdef notdef
+	static int masks_done, banner_printed;
+#endif
+	static int old_af;
+	int af = 0, interesting = RTF_UP | RTF_GATEWAY | RTF_HOST;
+
+#ifdef notdef
+	/* for the moment, netmasks are skipped over */
+	if (!banner_printed) {
+		printf("Netmasks:\n");
+		banner_printed = 1;
+	}
+	if (masks_done == 0) {
+		if (rtm->rtm_addrs != RTA_DST ) {
+			masks_done = 1;
+			af = sa->sa_family;
+		}
+	} else
+#endif
+		af = sa->sa_family;
+	if (af != old_af) {
+		pr_family(af);
+		old_af = af;
+	}
+	if (rtm->rtm_addrs == RTA_DST)
+		p_sockaddr(sa, 0, 36);
+	else {
+		p_sockaddr(sa, rtm->rtm_flags, 16);
+		if (sa->sa_len == 0)
+			sa->sa_len = sizeof(long);
+		sa = (struct sockaddr *)(sa->sa_len + (char *)sa);
+		p_sockaddr(sa, 0, 18);
+	}
+	p_flags(rtm->rtm_flags & interesting, "%-6.6s ");
+	putchar('\n');
+}
+
+static void
+p_sockaddr(sa, flags, width)
+	struct sockaddr *sa;
+	int flags, width;
+{
+	char workbuf[128], *cplim;
+	register char *cp = workbuf;
+
+	switch(sa->sa_family) {
+	case AF_INET:
+	    {
+		register struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+
+		cp = (sin->sin_addr.s_addr == 0) ? "default" :
+		      ((flags & RTF_HOST) ?
+			routename(sin->sin_addr.s_addr) :
+			netname(sin->sin_addr.s_addr, 0L));
+		break;
+	    }
+
+	case AF_NS:
+		cp = ns_print(sa);
+		break;
+
+	case AF_LINK:
+	    {
+		register struct sockaddr_dl *sdl = (struct sockaddr_dl *)sa;
+
+		if (sdl->sdl_nlen == 0 && sdl->sdl_alen == 0 &&
+		    sdl->sdl_slen == 0)
+			(void) sprintf(workbuf, "link#%d", sdl->sdl_index);
+		else switch (sdl->sdl_type) {
+		case IFT_ETHER:
+		    {
+			register int i;
+			register u_char *lla = (u_char *)sdl->sdl_data +
+			    sdl->sdl_nlen;
+
+			cplim = "";
+			for (i = 0; i < sdl->sdl_alen; i++, lla++) {
+				cp += sprintf(cp, "%s%x", cplim, *lla);
+				cplim = ":";
+			}
+			cp = workbuf;
 			break;
+		    }
 		default:
-			printf("%8.8x %8.8x %8.8x %8.8x",*l, l[1], l[2], l[3]);
-			l = (long *)&rt->rt_gateway;
-			printf("%8.8x %8.8x %8.8x %8.8x",*l, l[1], l[2], l[3]);
-			}
-			for (flags = name, p = bits; p->b_mask; p++)
-				if (p->b_mask & rt->rt_flags)
-					*flags++ = p->b_val;
-			*flags = '\0';
-			printf("%-8.8s %-6d %-10d ", name,
-				rt->rt_refcnt, rt->rt_use);
-			if (rt->rt_ifp == 0) {
-				putchar('\n');
-				m = mb.m_next;
-				continue;
-			}
-			klseek(kmem, rt->rt_ifp, 0);
-			read(kmem, &ifnet, sizeof (ifnet));
-			klseek(kmem, (int)ifnet.if_name, 0);
-			read(kmem, name, 16);
-			printf("%s%d\n", name, ifnet.if_unit);
-			m = mb.m_next;
+			cp = link_ntoa(sdl);
+			break;
+		}
+		break;
+	    }
+
+	default:
+	    {
+		register u_char *s = (u_char *)sa->sa_data, *slim;
+
+		slim =  sa->sa_len + (u_char *) sa;
+		cplim = cp + sizeof(workbuf) - 6;
+		cp += sprintf(cp, "(%d)", sa->sa_family);
+		while (s < slim && cp < cplim) {
+			cp += sprintf(cp, " %02x", *s++);
+			if (s < slim)
+			    cp += sprintf(cp, "%02x", *s++);
 		}
+		cp = workbuf;
+	    }
 	}
-	if (doinghost) {
-		klseek(kmem, netaddr, 0);
-		read(kmem, routehash, hashsize*sizeof (struct mbuf *));
-		doinghost = 0;
-		goto again;
+	if (width < 0 )
+		printf("%s ", cp);
+	else {
+		if (nflag)
+			printf("%-*s ", width, cp);
+		else
+			printf("%-*.*s ", width, width, cp);
 	}
-	free(routehash);
+}
+
+static void
+p_flags(f, format)
+	register int f;
+	char *format;
+{
+	char name[33], *flags;
+	register struct bits *p = bits;
+
+	for (flags = name; p->b_mask; p++)
+		if (p->b_mask & f)
+			*flags++ = p->b_val;
+	*flags = '\0';
+	printf(format, name);
+}
+
+static void
+p_rtentry(rt)
+	register struct rtentry *rt;
+{
+	static struct ifnet ifnet, *lastif;
+	static char name[16];
+
+	p_sockaddr(kgetsa(rt_key(rt)), rt->rt_flags, WID_DST);
+	p_sockaddr(kgetsa(rt->rt_gateway), RTF_HOST, WID_GW);
+	p_flags(rt->rt_flags, "%-6.6s ");
+	printf("%6d %8d ", rt->rt_refcnt, rt->rt_use);
+	if (rt->rt_ifp) {
+		if (rt->rt_ifp != lastif) {
+			kget(rt->rt_ifp, ifnet);
+			kread((u_long)ifnet.if_name, name, 16);
+			lastif = rt->rt_ifp;
+		}
+		printf(" %.15s%d%s", name, ifnet.if_unit,
+			rt->rt_nodes[0].rn_dupedkey ? " =>" : "");
+	}
+	putchar('\n');
 }
 
 char *
 routename(in)
-	struct in_addr in;
+	u_long in;
 {
 	register char *cp;
-	static char line[50];
+	static char line[MAXHOSTNAMELEN + 1];
 	struct hostent *hp;
 	static char domain[MAXHOSTNAMELEN + 1];
 	static int first = 1;
-	char *index();
 
 	if (first) {
 		first = 0;
@@ -158,7 +455,7 @@ routename(in)
 	}
 	cp = 0;
 	if (!nflag) {
-		hp = gethostbyaddr(&in, sizeof (struct in_addr),
+		hp = gethostbyaddr((char *)&in, sizeof (struct in_addr),
 			AF_INET);
 		if (hp) {
 			if ((cp = index(hp->h_name, '.')) &&
@@ -168,12 +465,12 @@ routename(in)
 		}
 	}
 	if (cp)
-		strcpy(line, cp);
+		strncpy(line, cp, sizeof(line) - 1);
 	else {
 #define C(x)	((x) & 0xff)
-		in.s_addr = ntohl(in.s_addr);
-		sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
-			C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr));
+		in = ntohl(in);
+		sprintf(line, "%u.%u.%u.%u",
+		    C(in >> 24), C(in >> 16), C(in >> 8), C(in));
 	}
 	return (line);
 }
@@ -184,18 +481,17 @@ routename(in)
  */
 char *
 netname(in, mask)
-	struct in_addr in;
-	u_long mask;
+	u_long in, mask;
 {
 	char *cp = 0;
-	static char line[50];
+	static char line[MAXHOSTNAMELEN + 1];
 	struct netent *np = 0;
 	u_long net;
-	register i;
+	register int i;
 	int subnetshift;
 
-	in.s_addr = ntohl(in.s_addr);
-	if (!nflag && in.s_addr) {
+	i = ntohl(in);
+	if (!nflag && i) {
 		if (mask == 0) {
 			if (IN_CLASSA(i)) {
 				mask = IN_CLASSA_NET;
@@ -213,10 +509,10 @@ netname(in, mask)
 			 * Guess at the subnet mask, assuming reasonable
 			 * width subnet fields.
 			 */
-			while (in.s_addr &~ mask)
+			while (i &~ mask)
 				mask = (long)mask >> subnetshift;
 		}
-		net = in.s_addr & mask;
+		net = i & mask;
 		while ((mask & 1) == 0)
 			mask >>= 1, net >>= 1;
 		np = getnetbyaddr(net, AF_INET);
@@ -224,25 +520,25 @@ netname(in, mask)
 			cp = np->n_name;
 	}
 	if (cp)
-		strcpy(line, cp);
-	else if ((in.s_addr & 0xffffff) == 0)
-		sprintf(line, "%u", C(in.s_addr >> 24));
-	else if ((in.s_addr & 0xffff) == 0)
-		sprintf(line, "%u.%u", C(in.s_addr >> 24) , C(in.s_addr >> 16));
-	else if ((in.s_addr & 0xff) == 0)
-		sprintf(line, "%u.%u.%u", C(in.s_addr >> 24),
-			C(in.s_addr >> 16), C(in.s_addr >> 8));
+		strncpy(line, cp, sizeof(line) - 1);
+	else if ((i & 0xffffff) == 0)
+		sprintf(line, "%u", C(i >> 24));
+	else if ((i & 0xffff) == 0)
+		sprintf(line, "%u.%u", C(i >> 24) , C(i >> 16));
+	else if ((i & 0xff) == 0)
+		sprintf(line, "%u.%u.%u", C(i >> 24), C(i >> 16), C(i >> 8));
 	else
-		sprintf(line, "%u.%u.%u.%u", C(in.s_addr >> 24),
-			C(in.s_addr >> 16), C(in.s_addr >> 8), C(in.s_addr));
+		sprintf(line, "%u.%u.%u.%u", C(i >> 24),
+			C(i >> 16), C(i >> 8), C(i));
 	return (line);
 }
 
 /*
  * Print routing statistics
  */
+void
 rt_stats(off)
-	off_t off;
+	u_long off;
 {
 	struct rtstat rtstat;
 
@@ -250,62 +546,95 @@ rt_stats(off)
 		printf("rtstat: symbol not in namelist\n");
 		return;
 	}
-	klseek(kmem, off, 0);
-	read(kmem, (char *)&rtstat, sizeof (rtstat));
+	kread(off, (char *)&rtstat, sizeof (rtstat));
 	printf("routing:\n");
-	printf("\t%d bad routing redirect%s\n",
+	printf("\t%u bad routing redirect%s\n",
 		rtstat.rts_badredirect, plural(rtstat.rts_badredirect));
-	printf("\t%d dynamically created route%s\n",
+	printf("\t%u dynamically created route%s\n",
 		rtstat.rts_dynamic, plural(rtstat.rts_dynamic));
-	printf("\t%d new gateway%s due to redirects\n",
+	printf("\t%u new gateway%s due to redirects\n",
 		rtstat.rts_newgateway, plural(rtstat.rts_newgateway));
-	printf("\t%d destination%s found unreachable\n",
+	printf("\t%u destination%s found unreachable\n",
 		rtstat.rts_unreach, plural(rtstat.rts_unreach));
-	printf("\t%d use%s of a wildcard route\n",
+	printf("\t%u use%s of a wildcard route\n",
 		rtstat.rts_wildcard, plural(rtstat.rts_wildcard));
 }
+short ns_nullh[] = {0,0,0};
 short ns_bh[] = {-1,-1,-1};
 
 char *
-ns_print(sns)
-struct sockaddr_ns *sns;
+ns_print(sa)
+	register struct sockaddr *sa;
 {
-	register struct ns_addr *dna = &sns->sns_addr;
-	long net = ntohl(ns_netof(*dna));
-	static char mybuf[50];
-	register char *p = mybuf;
-	short port = dna->x_port;
-
-	sprintf(p,"%lx:", net);
+	register struct sockaddr_ns *sns = (struct sockaddr_ns*)sa;
+	struct ns_addr work;
+	union { union ns_net net_e; u_long long_e; } net;
+	u_short port;
+	static char mybuf[50], cport[10], chost[25];
+	char *host = "";
+	register char *p; register u_char *q;
 
-	while(*p)p++; /* find end of string */
+	work = sns->sns_addr;
+	port = ntohs(work.x_port);
+	work.x_port = 0;
+	net.net_e  = work.x_net;
+	if (ns_nullhost(work) && net.long_e == 0) {
+		if (port ) {
+			sprintf(mybuf, "*.%xH", port);
+			upHex(mybuf);
+		} else
+			sprintf(mybuf, "*.*");
+		return (mybuf);
+	}
 
-	if (strncmp(ns_bh,dna->x_host.c_host,6)==0)
-		sprintf(p,"any");
-	else
-		sprintf(p,"%x.%x.%x.%x.%x.%x",
-			    dna->x_host.c_host[0], dna->x_host.c_host[1],
-			    dna->x_host.c_host[2], dna->x_host.c_host[3],
-			    dna->x_host.c_host[4], dna->x_host.c_host[5]);
-	if (port) {
-	while(*p)p++; /* find end of string */
-		sprintf(p,":%x",ntohs(port));
+	if (bcmp(ns_bh, work.x_host.c_host, 6) == 0) {
+		host = "any";
+	} else if (bcmp(ns_nullh, work.x_host.c_host, 6) == 0) {
+		host = "*";
+	} else {
+		q = work.x_host.c_host;
+		sprintf(chost, "%02x%02x%02x%02x%02x%02xH",
+			q[0], q[1], q[2], q[3], q[4], q[5]);
+		for (p = chost; *p == '0' && p < chost + 12; p++)
+			continue;
+		host = p;
 	}
+	if (port)
+		sprintf(cport, ".%xH", htons(port));
+	else
+		*cport = 0;
+
+	sprintf(mybuf,"%xH.%s%s", ntohl(net.long_e), host, cport);
+	upHex(mybuf);
 	return(mybuf);
 }
+
 char *
-ns_phost(sns)
-struct sockaddr_ns *sns;
+ns_phost(sa)
+	struct sockaddr *sa;
 {
-	register struct ns_addr *dna = &sns->sns_addr;
-	long net = ntohl(ns_netof(*dna));
-	static char mybuf[50];
-	register char *p = mybuf;
-	if (strncmp(ns_bh,dna->x_host.c_host,6)==0)
-		sprintf(p,"any");
-	else
-		sprintf(p,"%x,%x,%x",
-			   dna->x_host.s_host[0], dna->x_host.s_host[1],
-			    dna->x_host.s_host[2]);
-	return(mybuf);
+	register struct sockaddr_ns *sns = (struct sockaddr_ns *)sa;
+	struct sockaddr_ns work;
+	static union ns_net ns_zeronet;
+	char *p;
+
+	work = *sns;
+	work.sns_addr.x_port = 0;
+	work.sns_addr.x_net = ns_zeronet;
+
+	p = ns_print((struct sockaddr *)&work);
+	if (strncmp("0H.", p, 3) == 0) p += 3;
+	return(p);
+}
+
+void
+upHex(p0)
+	char *p0;
+{
+	register char *p = p0;
+	for (; *p; p++) switch (*p) {
+
+	case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+		*p += ('A' - 'a');
+	}
 }