Date: Mon, 9 Jun 2014 14:27:37 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r267272 - projects/sendfile/sys/netinet Message-ID: <201406091427.s59ERbuV040223@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Mon Jun 9 14:27:37 2014 New Revision: 267272 URL: http://svnweb.freebsd.org/changeset/base/267272 Log: Provide pru_ready method for TCP. It simply checks pcb and socket buffer, calls sbready() and if the latter reports, that now there is data to send, it calls tcp_output(). Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/netinet/tcp_usrreq.c Modified: projects/sendfile/sys/netinet/tcp_usrreq.c ============================================================================== --- projects/sendfile/sys/netinet/tcp_usrreq.c Mon Jun 9 14:24:41 2014 (r267271) +++ projects/sendfile/sys/netinet/tcp_usrreq.c Mon Jun 9 14:27:37 2014 (r267272) @@ -925,6 +925,38 @@ out: return (error); } +static int +tcp_usr_ready(struct socket *so, struct mbuf *m, int count) +{ + struct inpcb *inp; + struct tcpcb *tp; + int error; + + inp = sotoinpcb(so); + INP_WLOCK(inp); + if (inp->inp_flags & (INP_TIMEWAIT | INP_DROPPED)) { + INP_WUNLOCK(inp); + return (ECONNRESET); + } + tp = intotcpcb(inp); + + SOCKBUF_LOCK(&so->so_snd); + if (so->so_snd.sb_state & SBS_CANTSENDMORE) { + SOCKBUF_UNLOCK(&so->so_snd); + error = ENOTCONN; + } else if (sbready(&so->so_snd, m, count) == 0) { + SOCKBUF_UNLOCK(&so->so_snd); + error = tcp_output(tp); + } else { + SOCKBUF_UNLOCK(&so->so_snd); + error = EINPROGRESS; + } + + INP_WUNLOCK(inp); + + return (error); +} + /* * Abort the TCP. Drop the connection abruptly. */ @@ -1059,6 +1091,7 @@ struct pr_usrreqs tcp_usrreqs = { .pru_rcvd = tcp_usr_rcvd, .pru_rcvoob = tcp_usr_rcvoob, .pru_send = tcp_usr_send, + .pru_ready = tcp_usr_ready, .pru_shutdown = tcp_usr_shutdown, .pru_sockaddr = in_getsockaddr, .pru_sosetlabel = in_pcbsosetlabel,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201406091427.s59ERbuV040223>