From 88673064e2b5436421cf5ca651d21701dbd98dfe Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Fri, 1 Aug 2014 20:56:38 +0000 Subject: Sync with Mavericks and adopt user land stack. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8938 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index 1b44f11..b771e62 100755 --- a/user_socket.c +++ b/user_socket.c @@ -3280,7 +3280,6 @@ USRSCTP_SYSCTL_SET_DEF(sctp_cmt_on_off) USRSCTP_SYSCTL_SET_DEF(sctp_cmt_use_dac) USRSCTP_SYSCTL_SET_DEF(sctp_nr_sack_on_off) USRSCTP_SYSCTL_SET_DEF(sctp_use_cwnd_based_maxburst) -USRSCTP_SYSCTL_SET_DEF(sctp_asconf_auth_nochk) USRSCTP_SYSCTL_SET_DEF(sctp_auth_disable) USRSCTP_SYSCTL_SET_DEF(sctp_nat_friendly) USRSCTP_SYSCTL_SET_DEF(sctp_L2_abc_variable) @@ -3359,7 +3358,6 @@ USRSCTP_SYSCTL_GET_DEF(sctp_cmt_on_off) USRSCTP_SYSCTL_GET_DEF(sctp_cmt_use_dac) USRSCTP_SYSCTL_GET_DEF(sctp_nr_sack_on_off) USRSCTP_SYSCTL_GET_DEF(sctp_use_cwnd_based_maxburst) -USRSCTP_SYSCTL_GET_DEF(sctp_asconf_auth_nochk) USRSCTP_SYSCTL_GET_DEF(sctp_auth_disable) USRSCTP_SYSCTL_GET_DEF(sctp_nat_friendly) USRSCTP_SYSCTL_GET_DEF(sctp_L2_abc_variable) -- cgit v1.2.3 From a8657c4fc04fb9cc82100f648810d51ec6ab155a Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Sat, 2 Aug 2014 22:05:33 +0000 Subject: Sync with Mavericks sources. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8944 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index b771e62..07ff67d 100755 --- a/user_socket.c +++ b/user_socket.c @@ -3247,6 +3247,7 @@ USRSCTP_SYSCTL_SET_DEF(sctp_recvspace) USRSCTP_SYSCTL_SET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_SET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_SET_DEF(sctp_ecn_enable) +USRSCTP_SYSCTL_SET_DEF(sctp_pr_enable) USRSCTP_SYSCTL_SET_DEF(sctp_strict_sacks) #if !defined(SCTP_WITH_NO_CSUM) USRSCTP_SYSCTL_SET_DEF(sctp_no_csum_on_loopback) @@ -3325,6 +3326,7 @@ USRSCTP_SYSCTL_GET_DEF(sctp_recvspace) USRSCTP_SYSCTL_GET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_GET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_GET_DEF(sctp_ecn_enable) +USRSCTP_SYSCTL_GET_DEF(sctp_pr_enable) USRSCTP_SYSCTL_GET_DEF(sctp_strict_sacks) #if !defined(SCTP_WITH_NO_CSUM) USRSCTP_SYSCTL_GET_DEF(sctp_no_csum_on_loopback) -- cgit v1.2.3 From 44318e900a771ba1a5bafb510c38f33fd5cd8a39 Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Sun, 3 Aug 2014 15:25:02 +0000 Subject: Sync with Mavericks sources. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8949 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index 07ff67d..109cf99 100755 --- a/user_socket.c +++ b/user_socket.c @@ -3248,6 +3248,7 @@ USRSCTP_SYSCTL_SET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_SET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_SET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pr_enable) +USRSCTP_SYSCTL_SET_DEF(sctp_nrsack_enable) USRSCTP_SYSCTL_SET_DEF(sctp_strict_sacks) #if !defined(SCTP_WITH_NO_CSUM) USRSCTP_SYSCTL_SET_DEF(sctp_no_csum_on_loopback) @@ -3279,7 +3280,6 @@ USRSCTP_SYSCTL_SET_DEF(sctp_add_more_threshold) USRSCTP_SYSCTL_SET_DEF(sctp_nr_outgoing_streams_default) USRSCTP_SYSCTL_SET_DEF(sctp_cmt_on_off) USRSCTP_SYSCTL_SET_DEF(sctp_cmt_use_dac) -USRSCTP_SYSCTL_SET_DEF(sctp_nr_sack_on_off) USRSCTP_SYSCTL_SET_DEF(sctp_use_cwnd_based_maxburst) USRSCTP_SYSCTL_SET_DEF(sctp_auth_disable) USRSCTP_SYSCTL_SET_DEF(sctp_nat_friendly) @@ -3327,6 +3327,7 @@ USRSCTP_SYSCTL_GET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_GET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_GET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pr_enable) +USRSCTP_SYSCTL_GET_DEF(sctp_nrsack_enable) USRSCTP_SYSCTL_GET_DEF(sctp_strict_sacks) #if !defined(SCTP_WITH_NO_CSUM) USRSCTP_SYSCTL_GET_DEF(sctp_no_csum_on_loopback) @@ -3358,7 +3359,6 @@ USRSCTP_SYSCTL_GET_DEF(sctp_add_more_threshold) USRSCTP_SYSCTL_GET_DEF(sctp_nr_outgoing_streams_default) USRSCTP_SYSCTL_GET_DEF(sctp_cmt_on_off) USRSCTP_SYSCTL_GET_DEF(sctp_cmt_use_dac) -USRSCTP_SYSCTL_GET_DEF(sctp_nr_sack_on_off) USRSCTP_SYSCTL_GET_DEF(sctp_use_cwnd_based_maxburst) USRSCTP_SYSCTL_GET_DEF(sctp_auth_disable) USRSCTP_SYSCTL_GET_DEF(sctp_nat_friendly) -- cgit v1.2.3 From 669cffca0ac8ad73a3c16bb63d1fa0f829f84c10 Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Sun, 3 Aug 2014 20:32:08 +0000 Subject: Sync with Mavericks sources. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8952 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index 109cf99..18b5d17 100755 --- a/user_socket.c +++ b/user_socket.c @@ -3249,6 +3249,7 @@ USRSCTP_SYSCTL_SET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_SET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pr_enable) USRSCTP_SYSCTL_SET_DEF(sctp_nrsack_enable) +USRSCTP_SYSCTL_SET_DEF(sctp_pktdrop_enable) USRSCTP_SYSCTL_SET_DEF(sctp_strict_sacks) #if !defined(SCTP_WITH_NO_CSUM) USRSCTP_SYSCTL_SET_DEF(sctp_no_csum_on_loopback) @@ -3328,6 +3329,7 @@ USRSCTP_SYSCTL_GET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_GET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pr_enable) USRSCTP_SYSCTL_GET_DEF(sctp_nrsack_enable) +USRSCTP_SYSCTL_GET_DEF(sctp_pktdrop_enable) USRSCTP_SYSCTL_GET_DEF(sctp_strict_sacks) #if !defined(SCTP_WITH_NO_CSUM) USRSCTP_SYSCTL_GET_DEF(sctp_no_csum_on_loopback) -- cgit v1.2.3 From 2344bfccffeb80545fca6a86e8cda3d56a6f50bf Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Mon, 4 Aug 2014 20:41:36 +0000 Subject: Sync with Mavericks sources. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8955 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index 18b5d17..8810214 100755 --- a/user_socket.c +++ b/user_socket.c @@ -3248,6 +3248,7 @@ USRSCTP_SYSCTL_SET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_SET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_SET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pr_enable) +USRSCTP_SYSCTL_SET_DEF(sctp_reconfig_enable) USRSCTP_SYSCTL_SET_DEF(sctp_nrsack_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pktdrop_enable) USRSCTP_SYSCTL_SET_DEF(sctp_strict_sacks) @@ -3328,6 +3329,7 @@ USRSCTP_SYSCTL_GET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_GET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_GET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pr_enable) +USRSCTP_SYSCTL_GET_DEF(sctp_reconfig_enable) USRSCTP_SYSCTL_GET_DEF(sctp_nrsack_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pktdrop_enable) USRSCTP_SYSCTL_GET_DEF(sctp_strict_sacks) -- cgit v1.2.3 From fb3816eaffe5878bb1286adb120fd160da178a05 Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Tue, 12 Aug 2014 12:51:45 +0000 Subject: Sync with Mavericks sources. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8959 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index 8810214..13dd8fd 100755 --- a/user_socket.c +++ b/user_socket.c @@ -710,6 +710,7 @@ userspace_sctp_sendmsg(struct socket *so, struct uio auio; struct iovec iov[1]; + memset(sinfo, 0, sizeof(struct sctp_sndrcvinfo)); sinfo->sinfo_ppid = ppid; sinfo->sinfo_flags = flags; sinfo->sinfo_stream = stream_no; @@ -3248,6 +3249,8 @@ USRSCTP_SYSCTL_SET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_SET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_SET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pr_enable) +USRSCTP_SYSCTL_SET_DEF(sctp_auth_disable) +USRSCTP_SYSCTL_SET_DEF(sctp_asconf_enable) USRSCTP_SYSCTL_SET_DEF(sctp_reconfig_enable) USRSCTP_SYSCTL_SET_DEF(sctp_nrsack_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pktdrop_enable) @@ -3283,7 +3286,6 @@ USRSCTP_SYSCTL_SET_DEF(sctp_nr_outgoing_streams_default) USRSCTP_SYSCTL_SET_DEF(sctp_cmt_on_off) USRSCTP_SYSCTL_SET_DEF(sctp_cmt_use_dac) USRSCTP_SYSCTL_SET_DEF(sctp_use_cwnd_based_maxburst) -USRSCTP_SYSCTL_SET_DEF(sctp_auth_disable) USRSCTP_SYSCTL_SET_DEF(sctp_nat_friendly) USRSCTP_SYSCTL_SET_DEF(sctp_L2_abc_variable) USRSCTP_SYSCTL_SET_DEF(sctp_mbuf_threshold_count) @@ -3329,6 +3331,8 @@ USRSCTP_SYSCTL_GET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_GET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_GET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pr_enable) +USRSCTP_SYSCTL_GET_DEF(sctp_auth_disable) +USRSCTP_SYSCTL_GET_DEF(sctp_asconf_enable) USRSCTP_SYSCTL_GET_DEF(sctp_reconfig_enable) USRSCTP_SYSCTL_GET_DEF(sctp_nrsack_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pktdrop_enable) @@ -3364,7 +3368,6 @@ USRSCTP_SYSCTL_GET_DEF(sctp_nr_outgoing_streams_default) USRSCTP_SYSCTL_GET_DEF(sctp_cmt_on_off) USRSCTP_SYSCTL_GET_DEF(sctp_cmt_use_dac) USRSCTP_SYSCTL_GET_DEF(sctp_use_cwnd_based_maxburst) -USRSCTP_SYSCTL_GET_DEF(sctp_auth_disable) USRSCTP_SYSCTL_GET_DEF(sctp_nat_friendly) USRSCTP_SYSCTL_GET_DEF(sctp_L2_abc_variable) USRSCTP_SYSCTL_GET_DEF(sctp_mbuf_threshold_count) -- cgit v1.2.3 From 0602fd0eeb08e1999c7f28f21c8dde1f4503a03f Mon Sep 17 00:00:00 2001 From: t00fcxen Date: Tue, 12 Aug 2014 13:19:21 +0000 Subject: Sync with Mavericks sources. git-svn-id: http://sctp-refimpl.googlecode.com/svn/trunk/KERN/usrsctp/usrsctplib@8963 9df1edf5-d72c-5b5f-11c0-5f5209eb73f7 --- user_socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'user_socket.c') diff --git a/user_socket.c b/user_socket.c index 13dd8fd..9a0e0c7 100755 --- a/user_socket.c +++ b/user_socket.c @@ -3249,7 +3249,7 @@ USRSCTP_SYSCTL_SET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_SET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_SET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_SET_DEF(sctp_pr_enable) -USRSCTP_SYSCTL_SET_DEF(sctp_auth_disable) +USRSCTP_SYSCTL_SET_DEF(sctp_auth_enable) USRSCTP_SYSCTL_SET_DEF(sctp_asconf_enable) USRSCTP_SYSCTL_SET_DEF(sctp_reconfig_enable) USRSCTP_SYSCTL_SET_DEF(sctp_nrsack_enable) @@ -3331,7 +3331,7 @@ USRSCTP_SYSCTL_GET_DEF(sctp_auto_asconf) USRSCTP_SYSCTL_GET_DEF(sctp_multiple_asconfs) USRSCTP_SYSCTL_GET_DEF(sctp_ecn_enable) USRSCTP_SYSCTL_GET_DEF(sctp_pr_enable) -USRSCTP_SYSCTL_GET_DEF(sctp_auth_disable) +USRSCTP_SYSCTL_GET_DEF(sctp_auth_enable) USRSCTP_SYSCTL_GET_DEF(sctp_asconf_enable) USRSCTP_SYSCTL_GET_DEF(sctp_reconfig_enable) USRSCTP_SYSCTL_GET_DEF(sctp_nrsack_enable) -- cgit v1.2.3