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

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

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
31/* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */
32
33#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.

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

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
31/* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */
32
33#include <sys/cdefs.h>
34__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 179783 2008-06-14 07:58:05Z rrs $");
34__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 180387 2008-07-09 16:45:30Z rrs $");
35
36#include <netinet/sctp_os.h>
37#include <netinet/sctp_var.h>
38#include <netinet/sctp_sysctl.h>
39#include <netinet/sctp_pcb.h>
40#include <netinet/sctp_header.h>
41#include <netinet/sctputil.h>
42#include <netinet/sctp_output.h>

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

3179 tp1->sent == SCTP_DATAGRAM_UNSENT) {
3180 /* done */
3181 break;
3182 }
3183 if (stcb->asoc.peer_supports_prsctp) {
3184 if ((PR_SCTP_TTL_ENABLED(tp1->flags)) && tp1->sent < SCTP_DATAGRAM_ACKED) {
3185 /* Is it expired? */
3186 if (
35
36#include <netinet/sctp_os.h>
37#include <netinet/sctp_var.h>
38#include <netinet/sctp_sysctl.h>
39#include <netinet/sctp_pcb.h>
40#include <netinet/sctp_header.h>
41#include <netinet/sctputil.h>
42#include <netinet/sctp_output.h>

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

3179 tp1->sent == SCTP_DATAGRAM_UNSENT) {
3180 /* done */
3181 break;
3182 }
3183 if (stcb->asoc.peer_supports_prsctp) {
3184 if ((PR_SCTP_TTL_ENABLED(tp1->flags)) && tp1->sent < SCTP_DATAGRAM_ACKED) {
3185 /* Is it expired? */
3186 if (
3187 /*
3188 * TODO sctp_constants.h needs alternative
3189 * time macros when _KERNEL is undefined.
3190 */
3187 (timevalcmp(&now, &tp1->rec.data.timetodrop, >))
3188 ) {
3189 /* Yes so drop it */
3190 if (tp1->data != NULL) {
3191 (void)sctp_release_pr_sctp_chunk(stcb, tp1,
3192 (SCTP_RESPONSE_TO_USER_REQ | SCTP_NOTIFY_DATAGRAM_SENT),
3193 &asoc->sent_queue, SCTP_SO_NOT_LOCKED);
3194 }

--- 2363 unchanged lines hidden ---
3191 (timevalcmp(&now, &tp1->rec.data.timetodrop, >))
3192 ) {
3193 /* Yes so drop it */
3194 if (tp1->data != NULL) {
3195 (void)sctp_release_pr_sctp_chunk(stcb, tp1,
3196 (SCTP_RESPONSE_TO_USER_REQ | SCTP_NOTIFY_DATAGRAM_SENT),
3197 &asoc->sent_queue, SCTP_SO_NOT_LOCKED);
3198 }

--- 2363 unchanged lines hidden ---