Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Apr 2012 16:16:31 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r234793 - stable/9/sys/netinet
Message-ID:  <201204291616.q3TGGVsA021527@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tuexen
Date: Sun Apr 29 16:16:31 2012
New Revision: 234793
URL: http://svn.freebsd.org/changeset/base/234793

Log:
  MFC r234296,r234297:
  
  Bugfix: Don't send HBs on path which are not idle.
  Send always HBs when in PF state.

Modified:
  stable/9/sys/netinet/sctp_timer.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/sctp_timer.c
==============================================================================
--- stable/9/sys/netinet/sctp_timer.c	Sun Apr 29 16:14:09 2012	(r234792)
+++ stable/9/sys/netinet/sctp_timer.c	Sun Apr 29 16:16:31 2012	(r234793)
@@ -1438,7 +1438,23 @@ sctp_heartbeat_timer(struct sctp_inpcb *
 		 * when move to PF during threshold mangement, a HB has been
 		 * queued in that routine
 		 */
-		sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED);
+		uint32_t ms_gone_by;
+
+		if ((net->last_sent_time.tv_sec > 0) ||
+		    (net->last_sent_time.tv_usec > 0)) {
+			struct timeval diff;
+
+			SCTP_GETTIME_TIMEVAL(&diff);
+			timevalsub(&diff, &net->last_sent_time);
+			ms_gone_by = (uint32_t) (diff.tv_sec * 1000) +
+			    (uint32_t) (diff.tv_usec / 1000);
+		} else {
+			ms_gone_by = 0xffffffff;
+		}
+		if ((ms_gone_by >= net->heart_beat_delay) ||
+		    (net->dest_state & SCTP_ADDR_PF)) {
+			sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED);
+		}
 	}
 	return (0);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204291616.q3TGGVsA021527>