diff options
| author |   kurt <kurt@openbsd.org> | 2007-02-26 23:53:33 +0000 |
|---|---|---|
| committer | kurt <kurt@openbsd.org> | 2007-02-26 23:53:33 +0000 |
| commit | e3cfaa0013d9a15cff03f418012bd6632611f1fd (patch) | |
| tree | 753172fadefbfdd000d7e9a2ac724d6ecf931d60 /sys/kern/sys_socket.c | |
| parent | Error out if the -t or -T options are specified without -a or -d. (diff) | |
| download | wireguard-openbsd-e3cfaa0013d9a15cff03f418012bd6632611f1fd.tar.xz wireguard-openbsd-e3cfaa0013d9a15cff03f418012bd6632611f1fd.zip | |
exclude control data from the number of bytes returned by FIONREAD ioctl()
by adding a sb_datacc count to sockbuf that counts data excluding
MT_CONTROL and MT_SONAME mbuf types. w/help from deraadt@.
okay deraadt@ claudio@
Diffstat (limited to 'sys/kern/sys_socket.c')
| -rw-r--r-- | sys/kern/sys_socket.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/sys_socket.c b/sys/kern/sys_socket.c index 45e4aee5444..0bde91ca287 100644 --- a/sys/kern/sys_socket.c +++ b/sys/kern/sys_socket.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sys_socket.c,v 1.10 2005/12/13 10:33:14 jsg Exp $ */ +/* $OpenBSD: sys_socket.c,v 1.11 2007/02/26 23:53:33 kurt Exp $ */ /* $NetBSD: sys_socket.c,v 1.13 1995/08/12 23:59:09 mycroft Exp $ */ /* @@ -97,7 +97,7 @@ soo_ioctl(struct file *fp, u_long cmd, caddr_t data, struct proc *p) return (0); case FIONREAD: - *(int *)data = so->so_rcv.sb_cc; + *(int *)data = so->so_rcv.sb_datacc; return (0); case SIOCSPGRP: |