| sctp_timer.c (185694) | sctp_timer.c (189790) |
|---|---|
| 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_timer.c,v 1.29 2005/03/06 16:04:18 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_timer.c,v 1.29 2005/03/06 16:04:18 itojun Exp $ */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 185694 2008-12-06 13:19:54Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 189790 2009-03-14 13:42:13Z rrs $"); |
| 35 36#define _IP_VHL 37#include <netinet/sctp_os.h> 38#include <netinet/sctp_pcb.h> 39#ifdef INET6 40#endif 41#include <netinet/sctp_var.h> 42#include <netinet/sctp_sysctl.h> --- 719 unchanged lines hidden (view full) --- 762 if ((now.tv_sec > chk->rec.data.timetodrop.tv_sec) || 763 ((chk->rec.data.timetodrop.tv_sec == now.tv_sec) && 764 (now.tv_usec > chk->rec.data.timetodrop.tv_usec))) { 765 /* Yes so drop it */ 766 if (chk->data) { 767 (void)sctp_release_pr_sctp_chunk(stcb, 768 chk, 769 (SCTP_RESPONSE_TO_USER_REQ | SCTP_NOTIFY_DATAGRAM_SENT), | 35 36#define _IP_VHL 37#include <netinet/sctp_os.h> 38#include <netinet/sctp_pcb.h> 39#ifdef INET6 40#endif 41#include <netinet/sctp_var.h> 42#include <netinet/sctp_sysctl.h> --- 719 unchanged lines hidden (view full) --- 762 if ((now.tv_sec > chk->rec.data.timetodrop.tv_sec) || 763 ((chk->rec.data.timetodrop.tv_sec == now.tv_sec) && 764 (now.tv_usec > chk->rec.data.timetodrop.tv_usec))) { 765 /* Yes so drop it */ 766 if (chk->data) { 767 (void)sctp_release_pr_sctp_chunk(stcb, 768 chk, 769 (SCTP_RESPONSE_TO_USER_REQ | SCTP_NOTIFY_DATAGRAM_SENT), |
| 770 &stcb->asoc.sent_queue, SCTP_SO_NOT_LOCKED); | 770 SCTP_SO_NOT_LOCKED); |
| 771 } 772 continue; 773 } 774 } 775 if (PR_SCTP_RTX_ENABLED(chk->flags)) { 776 /* Has it been retransmitted tv_sec times? */ 777 if (chk->snd_count > chk->rec.data.timetodrop.tv_sec) { 778 if (chk->data) { 779 (void)sctp_release_pr_sctp_chunk(stcb, 780 chk, 781 (SCTP_RESPONSE_TO_USER_REQ | SCTP_NOTIFY_DATAGRAM_SENT), | 771 } 772 continue; 773 } 774 } 775 if (PR_SCTP_RTX_ENABLED(chk->flags)) { 776 /* Has it been retransmitted tv_sec times? */ 777 if (chk->snd_count > chk->rec.data.timetodrop.tv_sec) { 778 if (chk->data) { 779 (void)sctp_release_pr_sctp_chunk(stcb, 780 chk, 781 (SCTP_RESPONSE_TO_USER_REQ | SCTP_NOTIFY_DATAGRAM_SENT), |
| 782 &stcb->asoc.sent_queue, SCTP_SO_NOT_LOCKED); | 782 SCTP_SO_NOT_LOCKED); |
| 783 } 784 continue; 785 } 786 } 787 if (chk->sent < SCTP_DATAGRAM_RESEND) { 788 sctp_ucount_incr(stcb->asoc.sent_queue_retran_cnt); 789 num_mk++; 790 if (fir == 0) { --- 1232 unchanged lines hidden --- | 783 } 784 continue; 785 } 786 } 787 if (chk->sent < SCTP_DATAGRAM_RESEND) { 788 sctp_ucount_incr(stcb->asoc.sent_queue_retran_cnt); 789 num_mk++; 790 if (fir == 0) { --- 1232 unchanged lines hidden --- |