Deleted Added
full compact
sctp_input.c (235403) sctp_input.c (235414)
1/*-
2 * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
3 * Copyright (c) 2008-2011, by Randall Stewart. All rights reserved.
4 * Copyright (c) 2008-2011, by Michael Tuexen. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 *

--- 19 unchanged lines hidden (view full) ---

28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33/* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */
34
35#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2001-2008, by Cisco Systems, Inc. All rights reserved.
3 * Copyright (c) 2008-2011, by Randall Stewart. All rights reserved.
4 * Copyright (c) 2008-2011, by Michael Tuexen. All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions are met:
8 *

--- 19 unchanged lines hidden (view full) ---

28 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
29 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
30 * THE POSSIBILITY OF SUCH DAMAGE.
31 */
32
33/* $KAME: sctp_input.c,v 1.27 2005/03/06 16:04:17 itojun Exp $ */
34
35#include <sys/cdefs.h>
36__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 235403 2012-05-13 16:56:16Z tuexen $");
36__FBSDID("$FreeBSD: head/sys/netinet/sctp_input.c 235414 2012-05-13 17:36:04Z tuexen $");
37
38#include <netinet/sctp_os.h>
39#include <netinet/sctp_var.h>
40#include <netinet/sctp_sysctl.h>
41#include <netinet/sctp_pcb.h>
42#include <netinet/sctp_header.h>
43#include <netinet/sctputil.h>
44#include <netinet/sctp_output.h>

--- 582 unchanged lines hidden (view full) ---

627 tv.tv_sec = cp->heartbeat.hb_info.time_value_1;
628 tv.tv_usec = cp->heartbeat.hb_info.time_value_2;
629 /* Now lets do a RTO with this */
630 r_net->RTO = sctp_calculate_rto(stcb, &stcb->asoc, r_net, &tv, sctp_align_safe_nocopy,
631 SCTP_RTT_FROM_NON_DATA);
632 if (!(r_net->dest_state & SCTP_ADDR_REACHABLE)) {
633 r_net->dest_state |= SCTP_ADDR_REACHABLE;
634 sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_UP, stcb,
37
38#include <netinet/sctp_os.h>
39#include <netinet/sctp_var.h>
40#include <netinet/sctp_sysctl.h>
41#include <netinet/sctp_pcb.h>
42#include <netinet/sctp_header.h>
43#include <netinet/sctputil.h>
44#include <netinet/sctp_output.h>

--- 582 unchanged lines hidden (view full) ---

627 tv.tv_sec = cp->heartbeat.hb_info.time_value_1;
628 tv.tv_usec = cp->heartbeat.hb_info.time_value_2;
629 /* Now lets do a RTO with this */
630 r_net->RTO = sctp_calculate_rto(stcb, &stcb->asoc, r_net, &tv, sctp_align_safe_nocopy,
631 SCTP_RTT_FROM_NON_DATA);
632 if (!(r_net->dest_state & SCTP_ADDR_REACHABLE)) {
633 r_net->dest_state |= SCTP_ADDR_REACHABLE;
634 sctp_ulp_notify(SCTP_NOTIFY_INTERFACE_UP, stcb,
635 SCTP_HEARTBEAT_SUCCESS, (void *)r_net, SCTP_SO_NOT_LOCKED);
635 0, (void *)r_net, SCTP_SO_NOT_LOCKED);
636 }
637 if (r_net->dest_state & SCTP_ADDR_PF) {
638 r_net->dest_state &= ~SCTP_ADDR_PF;
639 stcb->asoc.cc_functions.sctp_cwnd_update_exit_pf(stcb, net);
640 }
641 if (old_error_counter > 0) {
642 sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, r_net, SCTP_FROM_SCTP_INPUT + SCTP_LOC_3);
643 sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, r_net);

--- 5462 unchanged lines hidden ---
636 }
637 if (r_net->dest_state & SCTP_ADDR_PF) {
638 r_net->dest_state &= ~SCTP_ADDR_PF;
639 stcb->asoc.cc_functions.sctp_cwnd_update_exit_pf(stcb, net);
640 }
641 if (old_error_counter > 0) {
642 sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, r_net, SCTP_FROM_SCTP_INPUT + SCTP_LOC_3);
643 sctp_timer_start(SCTP_TIMER_TYPE_HEARTBEAT, stcb->sctp_ep, stcb, r_net);

--- 5462 unchanged lines hidden ---