D32720.id97641.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D32720.id97641.diff
View Options

	Index: usr.bin/systat/netstat.c
	===================================================================
	--- usr.bin/systat/netstat.c
	+++ usr.bin/systat/netstat.c
	@@ -206,7 +206,7 @@
	next = &inpcb;
	if (!aflag) {
	if (inpcb.inp_vflag & INP_IPV4) {
	- if (inet_lnaof(inpcb.inp_laddr) == INADDR_ANY)
	+ if (inpcb.inp_laddr.s_addr == INADDR_ANY)
	continue;
	}
	#ifdef INET6
	@@ -303,8 +303,7 @@

	if (!aflag) {
	if (xip->inp_vflag & INP_IPV4) {
	- if (inet_lnaof(xip->inp_laddr) ==
	- INADDR_ANY)
	+ if (xip->inp_laddr.s_addr == INADDR_ANY)
	continue;
	}
	#ifdef INET6
	@@ -584,7 +583,6 @@
	char *cp = 0;
	static char line[NI_MAXHOST];
	struct hostent *hp;
	- struct netent *np;
	struct in_addr in;

	#ifdef INET6
	@@ -601,19 +599,9 @@

	in = ((struct sockaddr_in *)sa)->sin_addr;
	if (!nflag && in.s_addr != INADDR_ANY) {
	- int net = inet_netof(in);
	- int lna = inet_lnaof(in);
	-
	- if (lna == INADDR_ANY) {
	- np = getnetbyaddr(net, AF_INET);
	- if (np)
	- cp = np->n_name;
	- }
	- if (cp == NULL) {
	- hp = gethostbyaddr((char *)&in, sizeof (in), AF_INET);
	- if (hp)
	- cp = hp->h_name;
	- }
	+ hp = gethostbyaddr((char *)&in, sizeof (in), AF_INET);
	+ if (hp)
	+ cp = hp->h_name;
	}
	if (in.s_addr == INADDR_ANY)
	strcpy(line, "*");