svn commit: r234296 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Apr 14 20:22:01 2012
New Revision: 234296
URL: http://svn.freebsd.org/changeset/base/234296

Log:
  Bugfix: Don't send HBs on path which are not idle.
  
  MFC after: 1 week

Modified:
  head/sys/netinet/sctp_timer.c

Modified: head/sys/netinet/sctp_timer.c
==============================================================================
--- head/sys/netinet/sctp_timer.c	Sat Apr 14 17:35:59 2012	(r234295)
+++ head/sys/netinet/sctp_timer.c	Sat Apr 14 20:22:01 2012	(r234296)
@@ -1438,7 +1438,22 @@ 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) {
+			sctp_send_hb(stcb, net, SCTP_SO_NOT_LOCKED);
+		}
 	}
 	return (0);
 }