| tcp_usrreq.c (275320) | tcp_usrreq.c (275329) |
|---|---|
| 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1993 3 * The Regents of the University of California. 4 * Copyright (c) 2006-2007 Robert N. M. Watson 5 * Copyright (c) 2010-2011 Juniper Networks, Inc. 6 * All rights reserved. 7 * 8 * Portions of this software were developed by Robert N. M. Watson under --- 22 unchanged lines hidden (view full) --- 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 36 */ 37 38#include <sys/cdefs.h> | 1/*- 2 * Copyright (c) 1982, 1986, 1988, 1993 3 * The Regents of the University of California. 4 * Copyright (c) 2006-2007 Robert N. M. Watson 5 * Copyright (c) 2010-2011 Juniper Networks, Inc. 6 * All rights reserved. 7 * 8 * Portions of this software were developed by Robert N. M. Watson under --- 22 unchanged lines hidden (view full) --- 31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * SUCH DAMAGE. 34 * 35 * From: @(#)tcp_usrreq.c 8.2 (Berkeley) 1/3/94 36 */ 37 38#include <sys/cdefs.h> |
| 39__FBSDID("$FreeBSD: head/sys/netinet/tcp_usrreq.c 275320 2014-11-30 12:11:01Z glebius $"); | 39__FBSDID("$FreeBSD: head/sys/netinet/tcp_usrreq.c 275329 2014-11-30 13:24:21Z glebius $"); |
| 40 41#include "opt_ddb.h" 42#include "opt_inet.h" 43#include "opt_inet6.h" 44#include "opt_tcpdebug.h" 45 46#include <sys/param.h> 47#include <sys/systm.h> --- 790 unchanged lines hidden (view full) --- 838 if (m) 839 m_freem(m); 840 error = EINVAL; 841 goto out; 842 } 843 m_freem(control); /* empty control, just free it */ 844 } 845 if (!(flags & PRUS_OOB)) { | 40 41#include "opt_ddb.h" 42#include "opt_inet.h" 43#include "opt_inet6.h" 44#include "opt_tcpdebug.h" 45 46#include <sys/param.h> 47#include <sys/systm.h> --- 790 unchanged lines hidden (view full) --- 838 if (m) 839 m_freem(m); 840 error = EINVAL; 841 goto out; 842 } 843 m_freem(control); /* empty control, just free it */ 844 } 845 if (!(flags & PRUS_OOB)) { |
| 846 sbappendstream(&so->so_snd, m); | 846 sbappendstream(&so->so_snd, m, flags); |
| 847 if (nam && tp->t_state < TCPS_SYN_SENT) { 848 /* 849 * Do implied connect if not yet connected, 850 * initialize window to default value, and 851 * initialize maxseg/maxopd using peer's cached 852 * MSS. 853 */ 854#ifdef INET6 --- 41 unchanged lines hidden (view full) --- 896 /* 897 * According to RFC961 (Assigned Protocols), 898 * the urgent pointer points to the last octet 899 * of urgent data. We continue, however, 900 * to consider it to indicate the first octet 901 * of data past the urgent section. 902 * Otherwise, snd_up should be one lower. 903 */ | 847 if (nam && tp->t_state < TCPS_SYN_SENT) { 848 /* 849 * Do implied connect if not yet connected, 850 * initialize window to default value, and 851 * initialize maxseg/maxopd using peer's cached 852 * MSS. 853 */ 854#ifdef INET6 --- 41 unchanged lines hidden (view full) --- 896 /* 897 * According to RFC961 (Assigned Protocols), 898 * the urgent pointer points to the last octet 899 * of urgent data. We continue, however, 900 * to consider it to indicate the first octet 901 * of data past the urgent section. 902 * Otherwise, snd_up should be one lower. 903 */ |
| 904 sbappendstream_locked(&so->so_snd, m); | 904 sbappendstream_locked(&so->so_snd, m, flags); |
| 905 SOCKBUF_UNLOCK(&so->so_snd); 906 if (nam && tp->t_state < TCPS_SYN_SENT) { 907 /* 908 * Do implied connect if not yet connected, 909 * initialize window to default value, and 910 * initialize maxseg/maxopd using peer's cached 911 * MSS. 912 */ --- 1138 unchanged lines hidden --- | 905 SOCKBUF_UNLOCK(&so->so_snd); 906 if (nam && tp->t_state < TCPS_SYN_SENT) { 907 /* 908 * Do implied connect if not yet connected, 909 * initialize window to default value, and 910 * initialize maxseg/maxopd using peer's cached 911 * MSS. 912 */ --- 1138 unchanged lines hidden --- |