| sctp_timer.c (172091) | sctp_timer.c (172156) |
|---|---|
| 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 172091 2007-09-08 17:48:46Z rrs $"); | 34__FBSDID("$FreeBSD: head/sys/netinet/sctp_timer.c 172156 2007-09-13 10:36:43Z 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> --- 1341 unchanged lines hidden (view full) --- 1384 if (asconf->sent != SCTP_DATAGRAM_RESEND) 1385 sctp_ucount_incr(stcb->asoc.sent_queue_retran_cnt); 1386 asconf->sent = SCTP_DATAGRAM_RESEND; 1387 } 1388 return (0); 1389} 1390 1391/* Mobility adaptation */ | 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> --- 1341 unchanged lines hidden (view full) --- 1384 if (asconf->sent != SCTP_DATAGRAM_RESEND) 1385 sctp_ucount_incr(stcb->asoc.sent_queue_retran_cnt); 1386 asconf->sent = SCTP_DATAGRAM_RESEND; 1387 } 1388 return (0); 1389} 1390 1391/* Mobility adaptation */ |
| 1392int | 1392void |
| 1393sctp_delete_prim_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb, 1394 struct sctp_nets *net) 1395{ 1396 if (stcb->asoc.deleted_primary == NULL) { 1397 SCTPDBG(SCTP_DEBUG_ASCONF1, "delete_prim_timer: deleted_primary is not stored...\n"); 1398 sctp_mobility_feature_off(inp, SCTP_MOBILITY_PRIM_DELETED); | 1393sctp_delete_prim_timer(struct sctp_inpcb *inp, struct sctp_tcb *stcb, 1394 struct sctp_nets *net) 1395{ 1396 if (stcb->asoc.deleted_primary == NULL) { 1397 SCTPDBG(SCTP_DEBUG_ASCONF1, "delete_prim_timer: deleted_primary is not stored...\n"); 1398 sctp_mobility_feature_off(inp, SCTP_MOBILITY_PRIM_DELETED); |
| 1399 return (0); | 1399 return; |
| 1400 } 1401 SCTPDBG(SCTP_DEBUG_ASCONF1, "delete_prim_timer: finished to keep deleted primary "); 1402 SCTPDBG_ADDR(SCTP_DEBUG_ASCONF1, &stcb->asoc.deleted_primary->ro._l_addr.sa); 1403 sctp_free_remote_addr(stcb->asoc.deleted_primary); 1404 stcb->asoc.deleted_primary = NULL; 1405 sctp_mobility_feature_off(inp, SCTP_MOBILITY_PRIM_DELETED); | 1400 } 1401 SCTPDBG(SCTP_DEBUG_ASCONF1, "delete_prim_timer: finished to keep deleted primary "); 1402 SCTPDBG_ADDR(SCTP_DEBUG_ASCONF1, &stcb->asoc.deleted_primary->ro._l_addr.sa); 1403 sctp_free_remote_addr(stcb->asoc.deleted_primary); 1404 stcb->asoc.deleted_primary = NULL; 1405 sctp_mobility_feature_off(inp, SCTP_MOBILITY_PRIM_DELETED); |
| 1406 return (0); | 1406 return; |
| 1407} 1408 1409/* 1410 * For the shutdown and shutdown-ack, we do not keep one around on the 1411 * control queue. This means we must generate a new one and call the general 1412 * chunk output routine, AFTER having done threshold management. 1413 */ 1414int --- 512 unchanged lines hidden --- | 1407} 1408 1409/* 1410 * For the shutdown and shutdown-ack, we do not keep one around on the 1411 * control queue. This means we must generate a new one and call the general 1412 * chunk output routine, AFTER having done threshold management. 1413 */ 1414int --- 512 unchanged lines hidden --- |