diff options
| author | alfred <alfred@FreeBSD.org> | 2000-12-14 23:35:57 +0000 |
|---|---|---|
| committer | alfred <alfred@FreeBSD.org> | 2000-12-14 23:35:57 +0000 |
| commit | 4527b5166f03395c863c08bb8abab997c147c073 (patch) | |
| tree | ad1b5c1c9187f55ec6a923c6f4e32be05b416fc5 /contrib/ipfilter/ipsend | |
| parent | d7c24f441effa95171be3d7441eb7d26c558424e (diff) | |
| download | FreeBSD-src-4527b5166f03395c863c08bb8abab997c147c073.zip FreeBSD-src-4527b5166f03395c863c08bb8abab997c147c073.tar.gz | |
Adapt to new struct kinfo_proc and unbreak world.
Apologies to: darrenr who is maintainer
Diffstat (limited to 'contrib/ipfilter/ipsend')
| -rw-r--r-- | contrib/ipfilter/ipsend/sock.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/contrib/ipfilter/ipsend/sock.c b/contrib/ipfilter/ipsend/sock.c index a998c90..a641592 100644 --- a/contrib/ipfilter/ipsend/sock.c +++ b/contrib/ipfilter/ipsend/sock.c @@ -283,12 +283,21 @@ struct tcpiphdr *ti; return NULL; fd = (struct filedesc *)malloc(sizeof(*fd)); +#if defined( __FreeBSD_version) && __FreeBSD_version >= 500013 + if (KMCPY(fd, p->ki_fd, sizeof(*fd)) == -1) + { + fprintf(stderr, "read(%#lx,%#lx) failed\n", + (u_long)p, (u_long)p->ki_fd); + return NULL; + } +#else if (KMCPY(fd, p->kp_proc.p_fd, sizeof(*fd)) == -1) { fprintf(stderr, "read(%#lx,%#lx) failed\n", (u_long)p, (u_long)p->kp_proc.p_fd); return NULL; } +#endif o = (struct file **)calloc(1, sizeof(*o) * (fd->fd_lastfile + 1)); if (KMCPY(o, fd->fd_ofiles, (fd->fd_lastfile + 1) * sizeof(*o)) == -1) |
