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.211.2.5 retrieving revision 1.216 diff -u -p -r1.211.2.5 -r1.216 --- src/sys/kern/uipc_socket.c 2017/12/03 11:38:45 1.211.2.5 +++ src/sys/kern/uipc_socket.c 2013/08/02 20:00:33 1.216 @@ -1,4 +1,4 @@ -/* $NetBSD: uipc_socket.c,v 1.211.2.5 2017/12/03 11:38:45 jdolecek Exp $ */ +/* $NetBSD: uipc_socket.c,v 1.216 2013/08/02 20:00:33 spz Exp $ */ /*- * Copyright (c) 2002, 2007, 2008, 2009 The NetBSD Foundation, Inc. @@ -62,26 +62,15 @@ * @(#)uipc_socket.c 8.6 (Berkeley) 5/2/95 */ -/* - * Socket operation routines. - * - * These routines are called by the routines in sys_socket.c or from a - * system process, and implement the semantics of socket operations by - * switching out to the protocol specific routines. - */ - #include -__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.211.2.5 2017/12/03 11:38:45 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uipc_socket.c,v 1.216 2013/08/02 20:00:33 spz Exp $"); -#ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" #include "opt_sock_counters.h" #include "opt_sosend_loan.h" #include "opt_mbuftrace.h" #include "opt_somaxkva.h" #include "opt_multiprocessor.h" /* XXX */ -#include "opt_sctp.h" -#endif #include #include @@ -114,6 +103,7 @@ __KERNEL_RCSID(0, "$NetBSD: uipc_socket. #include #include +MALLOC_DEFINE(M_SOOPTS, "soopts", "socket options"); MALLOC_DEFINE(M_SONAME, "soname", "socket name"); extern const struct fileops socketops; @@ -295,8 +285,7 @@ sopendfree_thread(void *v) for (; m != NULL; m = next) { next = m->m_next; - KASSERT((~m->m_flags & (M_EXT|M_EXT_PAGES)) == - 0); + KASSERT((~m->m_flags & (M_EXT|M_EXT_PAGES)) == 0); KASSERT(m->m_ext.ext_refcnt == 0); rv += m->m_ext.ext_size; @@ -427,7 +416,7 @@ socket_listener_cb(kauth_cred_t cred, ka /* Normal users can only drop their own connections. */ struct socket *so = (struct socket *)arg1; - if (so->so_cred && proc_uidmatch(cred, so->so_cred) == 0) + if (proc_uidmatch(cred, so->so_cred) == 0) result = KAUTH_RESULT_ALLOW; break; @@ -435,20 +424,17 @@ socket_listener_cb(kauth_cred_t cred, ka case KAUTH_REQ_NETWORK_SOCKET_OPEN: /* We allow "raw" routing/bluetooth sockets to anyone. */ - switch ((u_long)arg1) { - case PF_ROUTE: - case PF_OROUTE: - case PF_BLUETOOTH: - case PF_CAN: + if ((u_long)arg1 == PF_ROUTE || (u_long)arg1 == PF_OROUTE + || (u_long)arg1 == PF_BLUETOOTH) { result = KAUTH_RESULT_ALLOW; - break; - default: + } else { /* Privileged, let secmodel handle this. */ if ((u_long)arg2 == SOCK_RAW) break; - result = KAUTH_RESULT_ALLOW; - break; } + + result = KAUTH_RESULT_ALLOW; + break; case KAUTH_REQ_NETWORK_SOCKET_CANSEE: @@ -493,11 +479,13 @@ soinit1(void) } /* - * socreate: create a new socket of the specified type and the protocol. - * - * => Caller may specify another socket for lock sharing (must not be held). - * => Returns the new socket without lock held. + * Socket operation routines. + * These routines are called by the routines in + * sys_socket.c or from a system process, and + * implement the semantics of socket operations by + * switching out to the protocol specific routines. */ +/*ARGSUSED*/ int socreate(int dom, struct socket **aso, int type, int proto, struct lwp *l, struct socket *lockso) @@ -527,7 +515,7 @@ socreate(int dom, struct socket **aso, i return EPROTOTYPE; return EPROTONOSUPPORT; } - if (prp->pr_usrreqs == NULL) + if (prp->pr_usrreq == NULL) return EPROTONOSUPPORT; if (prp->pr_type != type) return EPROTOTYPE; @@ -545,75 +533,62 @@ socreate(int dom, struct socket **aso, i uid = kauth_cred_geteuid(l->l_cred); so->so_uidinfo = uid_find(uid); so->so_cpid = l->l_proc->p_pid; - - /* - * Lock assigned and taken during PCB attach, unless we share - * the lock with another socket, e.g. socketpair(2) case. - */ - if (lockso) { + if (lockso != NULL) { + /* Caller wants us to share a lock. */ lock = lockso->so_lock; so->so_lock = lock; mutex_obj_hold(lock); + /* XXX Why is this not solock, to match sounlock? */ mutex_enter(lock); + } else { + /* Lock assigned and taken during PRU_ATTACH. */ } - - /* Attach the PCB (returns with the socket lock held). */ - error = (*prp->pr_usrreqs->pr_attach)(so, proto); + error = (*prp->pr_usrreq)(so, PRU_ATTACH, NULL, + (struct mbuf *)(long)proto, NULL, l); KASSERT(solocked(so)); - - if (error) { - KASSERT(so->so_pcb == NULL); + if (error != 0) { so->so_state |= SS_NOFDREF; sofree(so); return error; } so->so_cred = kauth_cred_dup(l->l_cred); sounlock(so); - *aso = so; return 0; } -/* - * fsocreate: create a socket and a file descriptor associated with it. - * - * => On success, write file descriptor to fdout and return zero. - * => On failure, return non-zero; *fdout will be undefined. +/* On success, write file descriptor to fdout and return zero. On + * failure, return non-zero; *fdout will be undefined. */ int -fsocreate(int domain, struct socket **sop, int type, int proto, int *fdout) +fsocreate(int domain, struct socket **sop, int type, int protocol, + struct lwp *l, int *fdout) { - lwp_t *l = curlwp; - int error, fd, flags; - struct socket *so; - struct file *fp; + struct socket *so; + struct file *fp; + int fd, error; + int flags = type & SOCK_FLAGS_MASK; - if ((error = fd_allocfile(&fp, &fd)) != 0) { + type &= ~SOCK_FLAGS_MASK; + if ((error = fd_allocfile(&fp, &fd)) != 0) return error; - } - flags = type & SOCK_FLAGS_MASK; fd_set_exclose(l, fd, (flags & SOCK_CLOEXEC) != 0); fp->f_flag = FREAD|FWRITE|((flags & SOCK_NONBLOCK) ? FNONBLOCK : 0)| ((flags & SOCK_NOSIGPIPE) ? FNOSIGPIPE : 0); fp->f_type = DTYPE_SOCKET; fp->f_ops = &socketops; - - type &= ~SOCK_FLAGS_MASK; - error = socreate(domain, &so, type, proto, l, NULL); - if (error) { + error = socreate(domain, &so, type, protocol, l, NULL); + if (error != 0) { fd_abort(curproc, fp, fd); - return error; - } - if (flags & SOCK_NONBLOCK) { - so->so_state |= SS_NBIO; - } - fp->f_socket = so; - fd_affix(curproc, fp, fd); - - if (sop != NULL) { - *sop = so; + } else { + if (sop != NULL) + *sop = so; + fp->f_data = so; + fd_affix(curproc, fp, fd); + *fdout = fd; + if (flags & SOCK_NONBLOCK) + so->so_state |= SS_NBIO; } - *fdout = fd; return error; } @@ -631,16 +606,12 @@ sofamily(const struct socket *so) } int -sobind(struct socket *so, struct sockaddr *nam, struct lwp *l) +sobind(struct socket *so, struct mbuf *nam, struct lwp *l) { int error; solock(so); - if (nam->sa_family != so->so_proto->pr_domain->dom_family) { - sounlock(so); - return EAFNOSUPPORT; - } - error = (*so->so_proto->pr_usrreqs->pr_bind)(so, nam, l); + error = (*so->so_proto->pr_usrreq)(so, PRU_BIND, NULL, nam, NULL, l); sounlock(so); return error; } @@ -649,29 +620,24 @@ int solisten(struct socket *so, int backlog, struct lwp *l) { int error; - short oldopt, oldqlimit; solock(so); - if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | + if ((so->so_state & (SS_ISCONNECTED | SS_ISCONNECTING | SS_ISDISCONNECTING)) != 0) { + sounlock(so); + return (EINVAL); + } + error = (*so->so_proto->pr_usrreq)(so, PRU_LISTEN, NULL, + NULL, NULL, l); + if (error != 0) { sounlock(so); - return EINVAL; + return error; } - oldopt = so->so_options; - oldqlimit = so->so_qlimit; if (TAILQ_EMPTY(&so->so_q)) so->so_options |= SO_ACCEPTCONN; if (backlog < 0) backlog = 0; so->so_qlimit = min(backlog, somaxconn); - - error = (*so->so_proto->pr_usrreqs->pr_listen)(so, l); - if (error != 0) { - so->so_options = oldopt; - so->so_qlimit = oldqlimit; - sounlock(so); - return error; - } sounlock(so); return 0; } @@ -719,15 +685,18 @@ sofree(struct socket *so) } /* - * soclose: close a socket on last file table reference removal. - * Initiate disconnect if connected. Free socket when disconnect complete. + * Close a socket on last file table reference removal. + * Initiate disconnect if connected. + * Free socket when disconnect complete. */ int soclose(struct socket *so) { - struct socket *so2; - int error = 0; + struct socket *so2; + int error; + int error2; + error = 0; solock(so); if (so->so_options & SO_ACCEPTCONN) { for (;;) { @@ -750,7 +719,7 @@ soclose(struct socket *so) break; } } - if (so->so_pcb == NULL) + if (so->so_pcb == 0) goto discard; if (so->so_state & SS_ISCONNECTED) { if ((so->so_state & SS_ISDISCONNECTING) == 0) { @@ -771,15 +740,18 @@ soclose(struct socket *so) } drop: if (so->so_pcb) { - KASSERT(solocked(so)); - (*so->so_proto->pr_usrreqs->pr_detach)(so); + error2 = (*so->so_proto->pr_usrreq)(so, PRU_DETACH, + NULL, NULL, NULL, NULL); + if (error == 0) + error = error2; } discard: - KASSERT((so->so_state & SS_NOFDREF) == 0); + if (so->so_state & SS_NOFDREF) + panic("soclose: NOFDREF"); kauth_cred_free(so->so_cred); so->so_state |= SS_NOFDREF; sofree(so); - return error; + return (error); } /* @@ -790,12 +762,13 @@ soabort(struct socket *so) { u_int refs; int error; - + KASSERT(solocked(so)); KASSERT(so->so_head == NULL); so->so_aborting++; /* XXX */ - error = (*so->so_proto->pr_usrreqs->pr_abort)(so); + error = (*so->so_proto->pr_usrreq)(so, PRU_ABORT, NULL, + NULL, NULL, NULL); refs = --so->so_aborting; /* XXX */ if (error || (refs == 0)) { sofree(so); @@ -806,32 +779,35 @@ soabort(struct socket *so) } int -soaccept(struct socket *so, struct sockaddr *nam) +soaccept(struct socket *so, struct mbuf *nam) { - int error; + int error; KASSERT(solocked(so)); - KASSERT((so->so_state & SS_NOFDREF) != 0); + error = 0; + if ((so->so_state & SS_NOFDREF) == 0) + panic("soaccept: !NOFDREF"); so->so_state &= ~SS_NOFDREF; if ((so->so_state & SS_ISDISCONNECTED) == 0 || (so->so_proto->pr_flags & PR_ABRTACPTDIS) == 0) - error = (*so->so_proto->pr_usrreqs->pr_accept)(so, nam); + error = (*so->so_proto->pr_usrreq)(so, PRU_ACCEPT, + NULL, nam, NULL, NULL); else error = ECONNABORTED; - return error; + return (error); } int -soconnect(struct socket *so, struct sockaddr *nam, struct lwp *l) +soconnect(struct socket *so, struct mbuf *nam, struct lwp *l) { - int error; + int error; KASSERT(solocked(so)); if (so->so_options & SO_ACCEPTCONN) - return EOPNOTSUPP; + return (EOPNOTSUPP); /* * If protocol is connection-based, can only connect once. * Otherwise, if connected, try to disconnect first. @@ -840,24 +816,24 @@ soconnect(struct socket *so, struct sock */ if (so->so_state & (SS_ISCONNECTED|SS_ISCONNECTING) && ((so->so_proto->pr_flags & PR_CONNREQUIRED) || - (error = sodisconnect(so)))) { + (error = sodisconnect(so)))) error = EISCONN; - } else { - if (nam->sa_family != so->so_proto->pr_domain->dom_family) { - return EAFNOSUPPORT; - } - error = (*so->so_proto->pr_usrreqs->pr_connect)(so, nam, l); - } - - return error; + else + error = (*so->so_proto->pr_usrreq)(so, PRU_CONNECT, + NULL, nam, NULL, l); + return (error); } int soconnect2(struct socket *so1, struct socket *so2) { + int error; + KASSERT(solocked2(so1, so2)); - return (*so1->so_proto->pr_usrreqs->pr_connect2)(so1, so2); + error = (*so1->so_proto->pr_usrreq)(so1, PRU_CONNECT2, + NULL, (struct mbuf *)so2, NULL, NULL); + return (error); } int @@ -872,7 +848,8 @@ sodisconnect(struct socket *so) } else if (so->so_state & SS_ISDISCONNECTING) { error = EALREADY; } else { - error = (*so->so_proto->pr_usrreqs->pr_disconnect)(so); + error = (*so->so_proto->pr_usrreq)(so, PRU_DISCONNECT, + NULL, NULL, NULL, NULL); } return (error); } @@ -896,8 +873,8 @@ sodisconnect(struct socket *so) * Data and control buffers are freed on return. */ int -sosend(struct socket *so, struct sockaddr *addr, struct uio *uio, - struct mbuf *top, struct mbuf *control, int flags, struct lwp *l) +sosend(struct socket *so, struct mbuf *addr, struct uio *uio, struct mbuf *top, + struct mbuf *control, int flags, struct lwp *l) { struct mbuf **mp, *m; long space, len, resid, clen, mlen; @@ -950,11 +927,12 @@ sosend(struct socket *so, struct sockadd } if ((so->so_state & SS_ISCONNECTED) == 0) { if (so->so_proto->pr_flags & PR_CONNREQUIRED) { - if (resid || clen == 0) { + if ((so->so_state & SS_ISCONFIRMING) == 0 && + !(resid == 0 && clen != 0)) { error = ENOTCONN; goto release; } - } else if (addr == NULL) { + } else if (addr == 0) { error = EDESTADDRREQ; goto release; } @@ -1002,7 +980,7 @@ sosend(struct socket *so, struct sockadd m = m_gethdr(M_WAIT, MT_DATA); mlen = MHLEN; m->m_pkthdr.len = 0; - m_reset_rcvif(m); + m->m_pkthdr.rcvif = NULL; } else { m = m_get(M_WAIT, MT_DATA); mlen = MLEN; @@ -1068,13 +1046,9 @@ sosend(struct socket *so, struct sockadd so->so_options |= SO_DONTROUTE; if (resid > 0) so->so_state |= SS_MORETOCOME; - if (flags & MSG_OOB) { - error = (*so->so_proto->pr_usrreqs->pr_sendoob)( - so, top, control); - } else { - error = (*so->so_proto->pr_usrreqs->pr_send)(so, - top, addr, control, l); - } + error = (*so->so_proto->pr_usrreq)(so, + (flags & MSG_OOB) ? PRU_SENDOOB : PRU_SEND, + top, addr, control, curlwp); if (dontroute) so->so_options &= ~SO_DONTROUTE; if (resid > 0) @@ -1186,7 +1160,8 @@ soreceive(struct socket *so, struct mbuf if (flags & MSG_OOB) { m = m_get(M_WAIT, MT_DATA); solock(so); - error = (*pr->pr_usrreqs->pr_recvoob)(so, m, flags & MSG_PEEK); + error = (*pr->pr_usrreq)(so, PRU_RCVOOB, m, + (struct mbuf *)(long)(flags & MSG_PEEK), NULL, l); sounlock(so); if (error) goto bad; @@ -1210,6 +1185,9 @@ soreceive(struct socket *so, struct mbuf */ s = splsoftnet(); solock(so); + if (so->so_state & SS_ISCONFIRMING && uio->uio_resid) + (*pr->pr_usrreq)(so, PRU_RCVD, NULL, NULL, NULL, l); + restart: if ((error = sblock(&so->so_rcv, SBLOCKWAIT(flags))) != 0) { sounlock(so); @@ -1328,35 +1306,12 @@ soreceive(struct socket *so, struct mbuf m->m_next = NULL; m = so->so_rcv.sb_mb; } else { - m = so->so_rcv.sb_mb = m_free(m); + MFREE(m, so->so_rcv.sb_mb); + m = so->so_rcv.sb_mb; } sbsync(&so->so_rcv, nextrecord); } } - if (pr->pr_flags & PR_ADDR_OPT) { - /* - * For SCTP we may be getting a - * whole message OR a partial delivery. - */ - if (m->m_type == MT_SONAME) { - orig_resid = 0; - if (flags & MSG_PEEK) { - if (paddr) - *paddr = m_copy(m, 0, m->m_len); - m = m->m_next; - } else { - sbfree(&so->so_rcv, m); - if (paddr) { - *paddr = m; - so->so_rcv.sb_mb = m->m_next; - m->m_next = 0; - m = so->so_rcv.sb_mb; - } else { - m = so->so_rcv.sb_mb = m_free(m); - } - } - } - } /* * Process one or more MT_CONTROL mbufs present before any data mbufs @@ -1411,7 +1366,7 @@ soreceive(struct socket *so, struct mbuf */ if (dom->dom_dispose != NULL && type == SCM_RIGHTS) { - sounlock(so); + sounlock(so); (*dom->dom_dispose)(cm); solock(so); } @@ -1491,10 +1446,6 @@ soreceive(struct socket *so, struct mbuf if (len == m->m_len - moff) { if (m->m_flags & M_EOR) flags |= MSG_EOR; -#ifdef SCTP - if (m->m_flags & M_NOTIFICATION) - flags |= MSG_NOTIFICATION; -#endif /* SCTP */ if (flags & MSG_PEEK) { m = m->m_next; moff = 0; @@ -1507,7 +1458,8 @@ soreceive(struct socket *so, struct mbuf so->so_rcv.sb_mb = m = m->m_next; *mp = NULL; } else { - m = so->so_rcv.sb_mb = m_free(m); + MFREE(m, so->so_rcv.sb_mb); + m = so->so_rcv.sb_mb; } /* * If m != NULL, we also know that @@ -1579,7 +1531,8 @@ soreceive(struct socket *so, struct mbuf * get it filled again. */ if ((pr->pr_flags & PR_WANTRCVD) && so->so_pcb) - (*pr->pr_usrreqs->pr_rcvd)(so, flags, l); + (*pr->pr_usrreq)(so, PRU_RCVD, + NULL, (struct mbuf *)(long)flags, NULL, l); SBLASTRECORDCHK(&so->so_rcv, "soreceive sbwait 2"); SBLASTMBUFCHK(&so->so_rcv, "soreceive sbwait 2"); if (wakeup_state & SS_RESTARTSYS) @@ -1620,7 +1573,8 @@ soreceive(struct socket *so, struct mbuf SBLASTRECORDCHK(&so->so_rcv, "soreceive 4"); SBLASTMBUFCHK(&so->so_rcv, "soreceive 4"); if (pr->pr_flags & PR_WANTRCVD && so->so_pcb) - (*pr->pr_usrreqs->pr_rcvd)(so, flags, l); + (*pr->pr_usrreq)(so, PRU_RCVD, NULL, + (struct mbuf *)(long)flags, NULL, l); } if (orig_resid == uio->uio_resid && orig_resid && (flags & MSG_EOR) == 0 && (so->so_state & SS_CANTRCVMORE) == 0) { @@ -1654,7 +1608,8 @@ soshutdown(struct socket *so, int how) error = 0; } if (how == SHUT_WR || how == SHUT_RDWR) - error = (*pr->pr_usrreqs->pr_shutdown)(so); + error = (*pr->pr_usrreq)(so, PRU_SHUTDOWN, NULL, + NULL, NULL, NULL); return error; } @@ -1713,8 +1668,7 @@ sorflush(struct socket *so) static int sosetopt1(struct socket *so, const struct sockopt *sopt) { - int error = EINVAL, opt; - int optval = 0; /* XXX: gcc */ + int error = EINVAL, optval, opt; struct linger l; struct timeval tv; @@ -1725,22 +1679,22 @@ sosetopt1(struct socket *so, const struc KASSERT(solocked(so)); break; - case SO_LINGER: - error = sockopt_get(sopt, &l, sizeof(l)); + case SO_LINGER: + error = sockopt_get(sopt, &l, sizeof(l)); solock(so); - if (error) - break; - if (l.l_linger < 0 || l.l_linger > USHRT_MAX || - l.l_linger > (INT_MAX / hz)) { + if (error) + break; + if (l.l_linger < 0 || l.l_linger > USHRT_MAX || + l.l_linger > (INT_MAX / hz)) { error = EDOM; break; } - so->so_linger = l.l_linger; - if (l.l_onoff) - so->so_options |= SO_LINGER; - else - so->so_options &= ~SO_LINGER; - break; + so->so_linger = l.l_linger; + if (l.l_onoff) + so->so_options |= SO_LINGER; + else + so->so_options &= ~SO_LINGER; + break; case SO_DEBUG: case SO_KEEPALIVE: @@ -1919,7 +1873,7 @@ so_setsockopt(struct lwp *l, struct sock return error; } - + /* * internal get SOL_SOCKET options */ @@ -1956,7 +1910,6 @@ sogetopt1(struct socket *so, struct sock #ifdef SO_OTIMESTAMP case SO_OTIMESTAMP: #endif - case SO_ACCEPTCONN: error = sockopt_setint(sopt, (so->so_options & opt) ? 1 : 0); break; @@ -2096,7 +2049,7 @@ sockopt_destroy(struct sockopt *sopt) /* * set sockopt value * - value is copied into sockopt - * - memory is allocated when necessary, will not sleep + * - memory is allocated when necessary, will not sleep */ int sockopt_set(struct sockopt *sopt, const void *buf, size_t len) @@ -2221,7 +2174,7 @@ filt_sordetach(struct knote *kn) { struct socket *so; - so = ((file_t *)kn->kn_obj)->f_socket; + so = ((file_t *)kn->kn_obj)->f_data; solock(so); SLIST_REMOVE(&so->so_rcv.sb_sel.sel_klist, kn, knote, kn_selnext); if (SLIST_EMPTY(&so->so_rcv.sb_sel.sel_klist)) @@ -2236,7 +2189,7 @@ filt_soread(struct knote *kn, long hint) struct socket *so; int rv; - so = ((file_t *)kn->kn_obj)->f_socket; + so = ((file_t *)kn->kn_obj)->f_data; if (hint != NOTE_SUBMIT) solock(so); kn->kn_data = so->so_rcv.sb_cc; @@ -2248,7 +2201,7 @@ filt_soread(struct knote *kn, long hint) rv = 1; else if (kn->kn_sfflags & NOTE_LOWAT) rv = (kn->kn_data >= kn->kn_sdata); - else + else rv = (kn->kn_data >= so->so_rcv.sb_lowat); if (hint != NOTE_SUBMIT) sounlock(so); @@ -2260,7 +2213,7 @@ filt_sowdetach(struct knote *kn) { struct socket *so; - so = ((file_t *)kn->kn_obj)->f_socket; + so = ((file_t *)kn->kn_obj)->f_data; solock(so); SLIST_REMOVE(&so->so_snd.sb_sel.sel_klist, kn, knote, kn_selnext); if (SLIST_EMPTY(&so->so_snd.sb_sel.sel_klist)) @@ -2275,7 +2228,7 @@ filt_sowrite(struct knote *kn, long hint struct socket *so; int rv; - so = ((file_t *)kn->kn_obj)->f_socket; + so = ((file_t *)kn->kn_obj)->f_data; if (hint != NOTE_SUBMIT) solock(so); kn->kn_data = sbspace(&so->so_snd); @@ -2304,7 +2257,7 @@ filt_solisten(struct knote *kn, long hin struct socket *so; int rv; - so = ((file_t *)kn->kn_obj)->f_socket; + so = ((file_t *)kn->kn_obj)->f_data; /* * Set kn_data to number of incoming connections, not @@ -2319,26 +2272,12 @@ filt_solisten(struct knote *kn, long hin return rv; } -static const struct filterops solisten_filtops = { - .f_isfd = 1, - .f_attach = NULL, - .f_detach = filt_sordetach, - .f_event = filt_solisten, -}; - -static const struct filterops soread_filtops = { - .f_isfd = 1, - .f_attach = NULL, - .f_detach = filt_sordetach, - .f_event = filt_soread, -}; - -static const struct filterops sowrite_filtops = { - .f_isfd = 1, - .f_attach = NULL, - .f_detach = filt_sowdetach, - .f_event = filt_sowrite, -}; +static const struct filterops solisten_filtops = + { 1, NULL, filt_sordetach, filt_solisten }; +static const struct filterops soread_filtops = + { 1, NULL, filt_sordetach, filt_soread }; +static const struct filterops sowrite_filtops = + { 1, NULL, filt_sowdetach, filt_sowrite }; int soo_kqfilter(struct file *fp, struct knote *kn) @@ -2346,7 +2285,7 @@ soo_kqfilter(struct file *fp, struct kno struct socket *so; struct sockbuf *sb; - so = ((file_t *)kn->kn_obj)->f_socket; + so = ((file_t *)kn->kn_obj)->f_data; solock(so); switch (kn->kn_filter) { case EVFILT_READ: @@ -2424,33 +2363,6 @@ sopoll(struct socket *so, int events) return revents; } -struct mbuf ** -sbsavetimestamp(int opt, struct mbuf *m, struct mbuf **mp) -{ - struct timeval tv; - microtime(&tv); - -#ifdef SO_OTIMESTAMP - if (opt & SO_OTIMESTAMP) { - struct timeval50 tv50; - - timeval_to_timeval50(&tv, &tv50); - *mp = sbcreatecontrol(&tv50, sizeof(tv50), - SCM_OTIMESTAMP, SOL_SOCKET); - if (*mp) - mp = &(*mp)->m_next; - } else -#endif - - if (opt & SO_TIMESTAMP) { - *mp = sbcreatecontrol(&tv, sizeof(tv), - SCM_TIMESTAMP, SOL_SOCKET); - if (*mp) - mp = &(*mp)->m_next; - } - return mp; -} - #include @@ -2515,6 +2427,11 @@ sysctl_kern_socket_setup(void) { KASSERT(socket_sysctllog == NULL); + sysctl_createv(&socket_sysctllog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_NODE, "kern", NULL, + NULL, 0, NULL, 0, + CTL_KERN, CTL_EOL); sysctl_createv(&socket_sysctllog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE,