Deleted Added
full compact
sctp_peeloff.c (175845) sctp_peeloff.c (179783)
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.

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

27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31
32/* $KAME: sctp_peeloff.c,v 1.13 2005/03/06 16:04:18 itojun Exp $ */
33
34#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.

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

27 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
28 * THE POSSIBILITY OF SUCH DAMAGE.
29 */
30
31
32/* $KAME: sctp_peeloff.c,v 1.13 2005/03/06 16:04:18 itojun Exp $ */
33
34#include <sys/cdefs.h>
35__FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.c 175845 2008-01-31 08:22:24Z rwatson $");
35__FBSDID("$FreeBSD: head/sys/netinet/sctp_peeloff.c 179783 2008-06-14 07:58:05Z rrs $");
36#include <netinet/sctp_os.h>
37#include <netinet/sctp_pcb.h>
38#include <netinet/sctputil.h>
39#include <netinet/sctp_var.h>
40#include <netinet/sctp_var.h>
41#include <netinet/sctp_sysctl.h>
42#include <netinet/sctp.h>
43#include <netinet/sctp_uio.h>

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

207 SCTP_FROM_SCTP_PEELOFF + SCTP_LOC_1);
208 }
209 /* Turn off any non-blocking semantic. */
210 SCTP_CLEAR_SO_NBIO(newso);
211 newso->so_state |= SS_ISCONNECTED;
212 /* We remove it right away */
213
214#ifdef SCTP_LOCK_LOGGING
36#include <netinet/sctp_os.h>
37#include <netinet/sctp_pcb.h>
38#include <netinet/sctputil.h>
39#include <netinet/sctp_var.h>
40#include <netinet/sctp_var.h>
41#include <netinet/sctp_sysctl.h>
42#include <netinet/sctp.h>
43#include <netinet/sctp_uio.h>

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

207 SCTP_FROM_SCTP_PEELOFF + SCTP_LOC_1);
208 }
209 /* Turn off any non-blocking semantic. */
210 SCTP_CLEAR_SO_NBIO(newso);
211 newso->so_state |= SS_ISCONNECTED;
212 /* We remove it right away */
213
214#ifdef SCTP_LOCK_LOGGING
215 if (sctp_logging_level & SCTP_LOCK_LOGGING_ENABLE) {
215 if (SCTP_BASE_SYSCTL(sctp_logging_level) & SCTP_LOCK_LOGGING_ENABLE) {
216 sctp_log_lock(inp, (struct sctp_tcb *)NULL, SCTP_LOG_LOCK_SOCK);
217 }
218#endif
219 TAILQ_REMOVE(&head->so_comp, newso, so_list);
220 head->so_qlen--;
221 SOCK_UNLOCK(head);
222 /*
223 * Now we must move it from one hash table to another and get the

--- 13 unchanged lines hidden ---
216 sctp_log_lock(inp, (struct sctp_tcb *)NULL, SCTP_LOG_LOCK_SOCK);
217 }
218#endif
219 TAILQ_REMOVE(&head->so_comp, newso, so_list);
220 head->so_qlen--;
221 SOCK_UNLOCK(head);
222 /*
223 * Now we must move it from one hash table to another and get the

--- 13 unchanged lines hidden ---