Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.54.2.10 retrieving revision 1.56.2.4 diff -u -p -r1.54.2.10 -r1.56.2.4 --- src/sys/kern/uipc_socket.c 2002/04/17 00:06:19 1.54.2.10 +++ src/sys/kern/uipc_socket.c 2002/03/15 21:36:11 1.56.2.4 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.54.2.10 2002/04/17 00:06:19 nathanw Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.56.2.4 2002/03/15 21:36:11 jdolecek Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1990, 1993 @@ -36,11 +36,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.54.2.10 2002/04/17 00:06:19 nathanw Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.56.2.4 2002/03/15 21:36:11 jdolecek Exp $"); #include #include -#include #include #include #include @@ -53,6 +52,20 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. #include #include #include +#include + +static void filt_sordetach(struct knote *kn); +static int filt_soread(struct knote *kn, long hint); +static void filt_sowdetach(struct knote *kn); +static int filt_sowrite(struct knote *kn, long hint); +static int filt_solisten(struct knote *kn, long hint); + +static const struct filterops solisten_filtops = + { 1, NULL, filt_sordetach, filt_solisten }; +const struct filterops soread_filtops = + { 1, NULL, filt_sordetach, filt_soread }; +const struct filterops sowrite_filtops = + { 1, NULL, filt_sowdetach, filt_sowrite }; struct pool socket_pool; @@ -64,7 +77,7 @@ soinit(void) { pool_init(&socket_pool, sizeof(struct socket), 0, 0, 0, - "sockpl", NULL); + "sockpl", 0, NULL, NULL, M_SOCKET); } /* @@ -83,7 +96,7 @@ socreate(int dom, struct socket **aso, i struct socket *so; int error, s; - p = curproc->l_proc; /* XXX */ + p = curproc; /* XXX */ if (proto) prp = pffindproto(dom, proto, type); else @@ -140,7 +153,7 @@ solisten(struct socket *so, int backlog) splx(s); return (error); } - if (TAILQ_EMPTY(&so->so_q)) + if (so->so_q.tqh_first == NULL) so->so_options |= SO_ACCEPTCONN; if (backlog < 0) backlog = 0; @@ -183,11 +196,11 @@ soclose(struct socket *so) error = 0; s = splsoftnet(); /* conservative */ if (so->so_options & SO_ACCEPTCONN) { - while ((so2 = TAILQ_FIRST(&so->so_q0)) != 0) { + while ((so2 = so->so_q0.tqh_first) != 0) { (void) soqremque(so2, 0); (void) soabort(so2); } - while ((so2 = TAILQ_FIRST(&so->so_q)) != 0) { + while ((so2 = so->so_q.tqh_first) != 0) { (void) soqremque(so2, 1); (void) soabort(so2); } @@ -268,7 +281,7 @@ soconnect(struct socket *so, struct mbuf struct proc *p; int s, error; - p = curproc->l_proc; /* XXX */ + p = curproc; /* XXX */ if (so->so_options & SO_ACCEPTCONN) return (EOPNOTSUPP); s = splsoftnet(); @@ -351,7 +364,7 @@ sosend(struct socket *so, struct mbuf *a long space, len, resid, clen, mlen; int error, s, dontroute, atomic; - p = curproc->l_proc; /* XXX */ + p = curproc; /* XXX */ clen = 0; atomic = sosendallatonce(so) || top; if (uio) @@ -1105,3 +1118,112 @@ sohasoutofband(struct socket *so) psignal(p, SIGURG); selwakeup(&so->so_rcv.sb_sel); } + + +int +soo_kqfilter(struct file *fp, struct knote *kn) +{ + struct socket *so; + struct sockbuf *sb; + + so = (struct socket *)kn->kn_fp->f_data; + switch (kn->kn_filter) { + case EVFILT_READ: + if (so->so_options & SO_ACCEPTCONN) + kn->kn_fop = &solisten_filtops; + else + kn->kn_fop = &soread_filtops; + sb = &so->so_rcv; + break; + case EVFILT_WRITE: + kn->kn_fop = &sowrite_filtops; + sb = &so->so_snd; + break; + default: + return (1); + } + SLIST_INSERT_HEAD(&sb->sb_sel.si_klist, kn, kn_selnext); + sb->sb_flags |= SB_KNOTE; + return (0); +} + +static void +filt_sordetach(struct knote *kn) +{ + struct socket *so; + + so = (struct socket *)kn->kn_fp->f_data; + SLIST_REMOVE(&so->so_rcv.sb_sel.si_klist, kn, knote, kn_selnext); + if (SLIST_EMPTY(&so->so_rcv.sb_sel.si_klist)) + so->so_rcv.sb_flags &= ~SB_KNOTE; +} + +/*ARGSUSED*/ +static int +filt_soread(struct knote *kn, long hint) +{ + struct socket *so; + + so = (struct socket *)kn->kn_fp->f_data; + kn->kn_data = so->so_rcv.sb_cc; + if (so->so_state & SS_CANTRCVMORE) { + kn->kn_flags |= EV_EOF; + kn->kn_fflags = so->so_error; + return (1); + } + if (so->so_error) /* temporary udp error */ + return (1); + if (kn->kn_sfflags & NOTE_LOWAT) + return (kn->kn_data >= kn->kn_sdata); + return (kn->kn_data >= so->so_rcv.sb_lowat); +} + +static void +filt_sowdetach(struct knote *kn) +{ + struct socket *so; + + so = (struct socket *)kn->kn_fp->f_data; + SLIST_REMOVE(&so->so_snd.sb_sel.si_klist, kn, knote, kn_selnext); + if (SLIST_EMPTY(&so->so_snd.sb_sel.si_klist)) + so->so_snd.sb_flags &= ~SB_KNOTE; +} + +/*ARGSUSED*/ +static int +filt_sowrite(struct knote *kn, long hint) +{ + struct socket *so; + + so = (struct socket *)kn->kn_fp->f_data; + kn->kn_data = sbspace(&so->so_snd); + if (so->so_state & SS_CANTSENDMORE) { + kn->kn_flags |= EV_EOF; + kn->kn_fflags = so->so_error; + return (1); + } + if (so->so_error) /* temporary udp error */ + return (1); + if (((so->so_state & SS_ISCONNECTED) == 0) && + (so->so_proto->pr_flags & PR_CONNREQUIRED)) + return (0); + if (kn->kn_sfflags & NOTE_LOWAT) + return (kn->kn_data >= kn->kn_sdata); + return (kn->kn_data >= so->so_snd.sb_lowat); +} + +/*ARGSUSED*/ +static int +filt_solisten(struct knote *kn, long hint) +{ + struct socket *so; + + so = (struct socket *)kn->kn_fp->f_data; + + /* + * Set kn_data to number of incoming connections, not + * counting partial (incomplete) connections. + */ + kn->kn_data = so->so_qlen; + return (kn->kn_data > 0); +}