Deleted Added
full compact
sctp6_usrreq.c (197288) sctp6_usrreq.c (206137)
1/*-
2 * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met:
6 *
7 * a) Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer.

--- 16 unchanged lines hidden (view full) ---

25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGE.
29 */
30/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
31
32#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001-2007, by Cisco Systems, Inc. All rights reserved.
3 *
4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are met:
6 *
7 * a) Redistributions of source code must retain the above copyright notice,
8 * this list of conditions and the following disclaimer.

--- 16 unchanged lines hidden (view full) ---

25 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
26 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGE.
29 */
30/* $KAME: sctp6_usrreq.c,v 1.38 2005/08/24 08:08:56 suz Exp $ */
31
32#include <sys/cdefs.h>
33__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 197288 2009-09-17 15:11:12Z rrs $");
33__FBSDID("$FreeBSD: head/sys/netinet6/sctp6_usrreq.c 206137 2010-04-03 15:40:14Z tuexen $");
34
35#include <netinet/sctp_os.h>
36#include <sys/proc.h>
37#include <netinet/sctp_pcb.h>
38#include <netinet/sctp_header.h>
39#include <netinet/sctp_var.h>
40#if defined(INET6)
41#include <netinet6/sctp6_var.h>

--- 986 unchanged lines hidden (view full) ---

1028 if (stcb != NULL) {
1029 /* Already have or am bring up an association */
1030 SCTP_ASOC_CREATE_UNLOCK(inp);
1031 SCTP_TCB_UNLOCK(stcb);
1032 SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, EALREADY);
1033 return (EALREADY);
1034 }
1035 /* We are GOOD to go */
34
35#include <netinet/sctp_os.h>
36#include <sys/proc.h>
37#include <netinet/sctp_pcb.h>
38#include <netinet/sctp_header.h>
39#include <netinet/sctp_var.h>
40#if defined(INET6)
41#include <netinet6/sctp6_var.h>

--- 986 unchanged lines hidden (view full) ---

1028 if (stcb != NULL) {
1029 /* Already have or am bring up an association */
1030 SCTP_ASOC_CREATE_UNLOCK(inp);
1031 SCTP_TCB_UNLOCK(stcb);
1032 SCTP_LTRACE_ERR_RET(inp, NULL, NULL, SCTP_FROM_SCTP6_USRREQ, EALREADY);
1033 return (EALREADY);
1034 }
1035 /* We are GOOD to go */
1036 stcb = sctp_aloc_assoc(inp, addr, 1, &error, 0, vrf_id, p);
1036 stcb = sctp_aloc_assoc(inp, addr, &error, 0, vrf_id, p);
1037 SCTP_ASOC_CREATE_UNLOCK(inp);
1038 if (stcb == NULL) {
1039 /* Gak! no memory */
1040 return (error);
1041 }
1042 if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) {
1043 stcb->sctp_ep->sctp_flags |= SCTP_PCB_FLAGS_CONNECTED;
1044 /* Set the connected flag so we can queue data */

--- 258 unchanged lines hidden ---
1037 SCTP_ASOC_CREATE_UNLOCK(inp);
1038 if (stcb == NULL) {
1039 /* Gak! no memory */
1040 return (error);
1041 }
1042 if (stcb->sctp_ep->sctp_flags & SCTP_PCB_FLAGS_TCPTYPE) {
1043 stcb->sctp_ep->sctp_flags |= SCTP_PCB_FLAGS_CONNECTED;
1044 /* Set the connected flag so we can queue data */

--- 258 unchanged lines hidden ---