summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorglebius <glebius@FreeBSD.org>2010-04-02 11:07:55 +0000
committerglebius <glebius@FreeBSD.org>2010-04-02 11:07:55 +0000
commitdc583d98a589fcdab130f8f010e7c5d6a48604c1 (patch)
tree8ffce948d5d2264add56bd73e89634b82e4c0d42 /usr.bin
parenta659a1ddf55f450adcf238dd853204a8fb31f1bf (diff)
downloadFreeBSD-src-dc583d98a589fcdab130f8f010e7c5d6a48604c1.zip
FreeBSD-src-dc583d98a589fcdab130f8f010e7c5d6a48604c1.tar.gz
Merge r205082, r205083 that fix 'netstat -f netgraph' functionality.
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/netstat/netgraph.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/netstat/netgraph.c b/usr.bin/netstat/netgraph.c
index c4dd647..d510414 100644
--- a/usr.bin/netstat/netgraph.c
+++ b/usr.bin/netstat/netgraph.c
@@ -166,14 +166,14 @@ netgraphprotopr(u_long off, const char *name, int af1 __unused,
name, sockb.so_rcv.sb_cc, sockb.so_snd.sb_cc);
/* Get ngsock structure */
- if (ngpcb.sockdata == 0) /* unconnected data socket */
+ if (ngpcb.sockdata == NULL) /* unconnected data socket */
goto finish;
kread((u_long)ngpcb.sockdata, (char *)&info, sizeof(info));
/* Get info on associated node */
- if (info.node == 0 || csock == -1)
+ if (info.node_id == 0 || csock == -1)
goto finish;
- snprintf(path, sizeof(path), "[%lx]:", (u_long) info.node);
+ snprintf(path, sizeof(path), "[%x]:", info.node_id);
if (NgSendMsg(csock, path,
NGM_GENERIC_COOKIE, NGM_NODEINFO, NULL, 0) < 0)
goto finish;
OpenPOWER on IntegriCloud