| sctp_indata.c (164085) | sctp_indata.c (164181) |
|---|---|
| 1/*- 2 * Copyright (c) 2001-2006, 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/* $kejKAME: 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-2006, 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/* $kejKAME: 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 164085 2006-11-08 00:21:13Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_indata.c 164181 2006-11-11 15:59:01Z rrs $"); |
| 35 36 37#include "opt_ipsec.h" 38#include "opt_inet6.h" 39#include "opt_inet.h" 40 41#include "opt_sctp.h" 42 --- 1712 unchanged lines hidden (view full) --- 1755 } 1756 sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1); 1757 if ((ch->ch.chunk_flags & SCTP_DATA_UNORDERED) == 0) { 1758 /* for ordered, bump what we delivered */ 1759 asoc->strmin[strmno].last_sequence_delivered++; 1760 } 1761 SCTP_STAT_INCR(sctps_recvexpress); 1762#ifdef SCTP_STR_LOGGING | 35 36 37#include "opt_ipsec.h" 38#include "opt_inet6.h" 39#include "opt_inet.h" 40 41#include "opt_sctp.h" 42 --- 1712 unchanged lines hidden (view full) --- 1755 } 1756 sctp_add_to_readq(stcb->sctp_ep, stcb, control, &stcb->sctp_socket->so_rcv, 1); 1757 if ((ch->ch.chunk_flags & SCTP_DATA_UNORDERED) == 0) { 1758 /* for ordered, bump what we delivered */ 1759 asoc->strmin[strmno].last_sequence_delivered++; 1760 } 1761 SCTP_STAT_INCR(sctps_recvexpress); 1762#ifdef SCTP_STR_LOGGING |
| 1763 sctp_log_strm_del_alt(tsn, strmseq, | 1763 sctp_log_strm_del_alt(stcb, tsn, strmseq, strmno, |
| 1764 SCTP_STR_LOG_FROM_EXPRS_DEL); 1765#endif 1766 control = NULL; 1767 goto finish_express_del; 1768 } 1769failed_express_del: 1770 /* If we reach here this is a new chunk */ 1771 chk = NULL; --- 311 unchanged lines hidden (view full) --- 2083 if ((ch->ch.chunk_flags & SCTP_DATA_UNORDERED) == 0) { 2084 SCTP_STAT_INCR_COUNTER64(sctps_inorderchunks); 2085 } else { 2086 SCTP_STAT_INCR_COUNTER64(sctps_inunorderchunks); 2087 } 2088 SCTP_STAT_INCR(sctps_recvdata); 2089 /* Set it present please */ 2090#ifdef SCTP_STR_LOGGING | 1764 SCTP_STR_LOG_FROM_EXPRS_DEL); 1765#endif 1766 control = NULL; 1767 goto finish_express_del; 1768 } 1769failed_express_del: 1770 /* If we reach here this is a new chunk */ 1771 chk = NULL; --- 311 unchanged lines hidden (view full) --- 2083 if ((ch->ch.chunk_flags & SCTP_DATA_UNORDERED) == 0) { 2084 SCTP_STAT_INCR_COUNTER64(sctps_inorderchunks); 2085 } else { 2086 SCTP_STAT_INCR_COUNTER64(sctps_inunorderchunks); 2087 } 2088 SCTP_STAT_INCR(sctps_recvdata); 2089 /* Set it present please */ 2090#ifdef SCTP_STR_LOGGING |
| 2091 sctp_log_strm_del_alt(tsn, strmseq, SCTP_STR_LOG_FROM_MARK_TSN); | 2091 sctp_log_strm_del_alt(stcb, tsn, strmseq, strmno, SCTP_STR_LOG_FROM_MARK_TSN); |
| 2092#endif 2093#ifdef SCTP_MAP_LOGGING 2094 sctp_log_map(asoc->mapping_array_base_tsn, asoc->cumulative_tsn, 2095 asoc->highest_tsn_inside_map, SCTP_MAP_PREPARE_SLIDE); 2096#endif 2097 SCTP_SET_TSN_PRESENT(asoc->mapping_array, gap); 2098 return (1); 2099} --- 3491 unchanged lines hidden --- | 2092#endif 2093#ifdef SCTP_MAP_LOGGING 2094 sctp_log_map(asoc->mapping_array_base_tsn, asoc->cumulative_tsn, 2095 asoc->highest_tsn_inside_map, SCTP_MAP_PREPARE_SLIDE); 2096#endif 2097 SCTP_SET_TSN_PRESENT(asoc->mapping_array, gap); 2098 return (1); 2099} --- 3491 unchanged lines hidden --- |