--- Net2/sys/socketvar.h 2018/04/24 18:03:58 1.1.1.1 +++ Net2/sys/socketvar.h 2018/04/24 18:16:10 1.1.1.3 @@ -30,9 +30,15 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)socketvar.h 7.17 (Berkeley) 5/5/91 + * from: @(#)socketvar.h 7.17 (Berkeley) 5/5/91 + * socketvar.h,v 1.6 1993/06/12 23:35:14 andrew Exp */ +#ifndef _SYS_SOCKETVAR_H_ +#define _SYS_SOCKETVAR_H_ + +#include /* for struct selinfo */ + /* * Kernel structure per socket. * Contains send and receive buffer queues, @@ -77,7 +83,7 @@ struct socket { u_long sb_mbmax; /* max chars of mbufs to use */ long sb_lowat; /* low water mark */ struct mbuf *sb_mb; /* the mbuf chain */ - struct proc *sb_sel; /* process selecting read/write */ + struct selinfo sb_sel; /* process selecting read/write */ short sb_flags; /* flags, see below */ short sb_timeo; /* timeout for read/write */ } so_rcv, so_snd; @@ -88,7 +94,7 @@ struct socket { #define SB_SEL 0x08 /* someone is selecting */ #define SB_ASYNC 0x10 /* ASYNC I/O, need signals */ #define SB_NOTIFY (SB_WAIT|SB_SEL|SB_ASYNC) -#define SB_COLL 0x20 /* collision selecting */ +/* was SB_COLL 0x20 * collision selecting */ #define SB_NOINTR 0x40 /* operations not interruptible */ caddr_t so_tpcb; /* Wisc. protocol control block XXX */ @@ -197,3 +203,5 @@ int soo_ioctl __P((struct file *fp, int int soo_select __P((struct file *fp, int which, struct proc *p)); int soo_close __P((struct file *fp, struct proc *p)); #endif + +#endif /* !_SYS_SOCKETVAR_H_ */