| sctp_timer.c (172156) | sctp_timer.c (172190) |
|---|---|
| 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 172156 2007-09-13 10:36:43Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 172190 2007-09-15 19:07:42Z rrs $"); |
| 35 36#define _IP_VHL 37#include <netinet/sctp_os.h> 38#include <netinet/sctp_pcb.h> 39#ifdef INET6 40#include <netinet6/sctp6_var.h> 41#endif 42#include <netinet/sctp_var.h> --- 1268 unchanged lines hidden (view full) --- 1311 struct sctp_nets *net) 1312{ 1313 struct sctp_nets *alt; 1314 struct sctp_tmit_chunk *asconf, *chk; 1315 1316 /* is this a first send, or a retransmission? */ 1317 if (stcb->asoc.asconf_sent == 0) { 1318 /* compose a new ASCONF chunk and send it */ | 35 36#define _IP_VHL 37#include <netinet/sctp_os.h> 38#include <netinet/sctp_pcb.h> 39#ifdef INET6 40#include <netinet6/sctp6_var.h> 41#endif 42#include <netinet/sctp_var.h> --- 1268 unchanged lines hidden (view full) --- 1311 struct sctp_nets *net) 1312{ 1313 struct sctp_nets *alt; 1314 struct sctp_tmit_chunk *asconf, *chk; 1315 1316 /* is this a first send, or a retransmission? */ 1317 if (stcb->asoc.asconf_sent == 0) { 1318 /* compose a new ASCONF chunk and send it */ |
| 1319 sctp_send_asconf(stcb, net); | 1319 sctp_send_asconf(stcb, net, SCTP_ADDR_NOT_LOCKED); |
| 1320 } else { 1321 /* 1322 * Retransmission of the existing ASCONF is needed 1323 */ 1324 1325 /* find the existing ASCONF */ 1326 TAILQ_FOREACH(asconf, &stcb->asoc.control_send_queue, 1327 sctp_next) { --- 599 unchanged lines hidden --- | 1320 } else { 1321 /* 1322 * Retransmission of the existing ASCONF is needed 1323 */ 1324 1325 /* find the existing ASCONF */ 1326 TAILQ_FOREACH(asconf, &stcb->asoc.control_send_queue, 1327 sctp_next) { --- 599 unchanged lines hidden --- |