| sctputil.c (184031) | sctputil.c (184883) |
|---|---|
| 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: sctputil.c,v 1.37 2005/03/07 23:26:09 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: sctputil.c,v 1.37 2005/03/07 23:26:09 itojun Exp $ */ 32 33#include <sys/cdefs.h> |
| 34__FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 184031 2008-10-18 15:56:52Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctputil.c 184883 2008-11-12 14:16:39Z rrs $"); |
| 35 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_sysctl.h> 41#ifdef INET6 42#endif --- 862 unchanged lines hidden (view full) --- 905 906#ifdef INET6 907 asoc->default_flowlabel = ((struct in6pcb *)m)->in6p_flowinfo; 908#else 909 asoc->default_flowlabel = 0; 910#endif 911 asoc->sb_send_resv = 0; 912 if (override_tag) { | 35 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_sysctl.h> 41#ifdef INET6 42#endif --- 862 unchanged lines hidden (view full) --- 905 906#ifdef INET6 907 asoc->default_flowlabel = ((struct in6pcb *)m)->in6p_flowinfo; 908#else 909 asoc->default_flowlabel = 0; 910#endif 911 asoc->sb_send_resv = 0; 912 if (override_tag) { |
| 913 struct timeval now; 914 915 (void)SCTP_GETTIME_TIMEVAL(&now); | |
| 916 if (sctp_is_in_timewait(override_tag)) { 917 /* 918 * It must be in the time-wait hash, we put it there 919 * when we aloc one. If not the peer is playing 920 * games. 921 */ 922 asoc->my_vtag = override_tag; 923 } else { --- 537 unchanged lines hidden (view full) --- 1461 it = (struct sctp_iterator *)inp; 1462 inp = NULL; 1463 } 1464 type = tmr->type; 1465 if (inp) { 1466 SCTP_INP_INCR_REF(inp); 1467 if ((inp->sctp_socket == 0) && 1468 ((tmr->type != SCTP_TIMER_TYPE_INPKILL) && | 913 if (sctp_is_in_timewait(override_tag)) { 914 /* 915 * It must be in the time-wait hash, we put it there 916 * when we aloc one. If not the peer is playing 917 * games. 918 */ 919 asoc->my_vtag = override_tag; 920 } else { --- 537 unchanged lines hidden (view full) --- 1458 it = (struct sctp_iterator *)inp; 1459 inp = NULL; 1460 } 1461 type = tmr->type; 1462 if (inp) { 1463 SCTP_INP_INCR_REF(inp); 1464 if ((inp->sctp_socket == 0) && 1465 ((tmr->type != SCTP_TIMER_TYPE_INPKILL) && |
| 1466 (tmr->type != SCTP_TIMER_TYPE_SEND) && 1467 (tmr->type != SCTP_TIMER_TYPE_RECV) && 1468 (tmr->type != SCTP_TIMER_TYPE_HEARTBEAT) && |
|
| 1469 (tmr->type != SCTP_TIMER_TYPE_SHUTDOWN) && 1470 (tmr->type != SCTP_TIMER_TYPE_SHUTDOWNACK) && 1471 (tmr->type != SCTP_TIMER_TYPE_SHUTDOWNGUARD) && 1472 (tmr->type != SCTP_TIMER_TYPE_ASOCKILL)) 1473 ) { 1474 SCTP_INP_DECR_REF(inp); 1475 return; 1476 } --- 5179 unchanged lines hidden --- | 1469 (tmr->type != SCTP_TIMER_TYPE_SHUTDOWN) && 1470 (tmr->type != SCTP_TIMER_TYPE_SHUTDOWNACK) && 1471 (tmr->type != SCTP_TIMER_TYPE_SHUTDOWNGUARD) && 1472 (tmr->type != SCTP_TIMER_TYPE_ASOCKILL)) 1473 ) { 1474 SCTP_INP_DECR_REF(inp); 1475 return; 1476 } --- 5179 unchanged lines hidden --- |