fixes to persist timer

SCCS-vsn: sys/netinet/tcp_output.c 4.39
SCCS-vsn: sys/netinet/tcp_timer.c 4.21
SCCS-vsn: sys/netinet/tcp_timer.h 4.8

diff --git a/usr/src/sys/netinet/tcp_output.c b/usr/src/sys/netinet/tcp_output.c
index b2f99e0..49d701f 100644 (file)
--- a/usr/src/sys/netinet/tcp_output.c
+++ b/usr/src/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/*     tcp_output.c    4.38    82/04/10        */
+/*     tcp_output.c    4.39    82/06/06        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"

diff --git a/usr/src/sys/netinet/tcp_timer.c b/usr/src/sys/netinet/tcp_timer.c
index 82d6acb..ee34d84 100644 (file)
--- a/usr/src/sys/netinet/tcp_timer.c
+++ b/usr/src/sys/netinet/tcp_timer.c
@@ -1,4 +1,4 @@
-/* tcp_timer.c 4.20 82/04/04 */
+/* tcp_timer.c 4.21 82/06/06 */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"

diff --git a/usr/src/sys/netinet/tcp_timer.h b/usr/src/sys/netinet/tcp_timer.h
index ef1df47..bbc4765 100644 (file)
--- a/usr/src/sys/netinet/tcp_timer.h
+++ b/usr/src/sys/netinet/tcp_timer.h
@@ -1,4 +1,4 @@
-/*     tcp_timer.h     4.7     82/02/03        */
+/*     tcp_timer.h     4.8     82/06/06        */

 
 /*
  * Definitions of the TCP timers.  These timers are counted
 
 /*
  * Definitions of the TCP timers.  These timers are counted


@@ -26,10 +26,10 @@
  * backoff on the retransmit timer.
  *
  * The TCPT_PERSIST timer is used to keep window size information
  * backoff on the retransmit timer.
  *
  * The TCPT_PERSIST timer is used to keep window size information

- * flowing even if the window goes shut.  If an output is attempted when there
- * is data ready to transmit, but nothing gets sent because the window
- * is shut, then we start the TCPT_PERSIST timer, and at intervals
- * send a single byte into the peers window to force him to update
+ * flowing even if the window goes shut.  If all previous transmissions
+ * have been acknowledged (so that there are no retransmissions in progress),
+ * and the window is shut, then we start the TCPT_PERSIST timer, and at
+ * intervals send a single byte into the peers window to force him to update

  * our window information.  We do this at most as often as TCPT_PERSMIN
  * time intervals, but no more frequently than the current estimate of
  * round-trip packet time.  The TCPT_PERSIST timer is cleared whenever
  * our window information.  We do this at most as often as TCPT_PERSMIN
  * time intervals, but no more frequently than the current estimate of
  * round-trip packet time.  The TCPT_PERSIST timer is cleared whenever


@@ -56,10 +56,10 @@
  */
 #define        TCPTV_MSL       ( 30*PR_SLOWHZ)         /* max seg lifetime */
 #define        TCPTV_SRTTBASE  (  1*PR_SLOWHZ)         /* base roundtrip time */
  */
 #define        TCPTV_MSL       ( 30*PR_SLOWHZ)         /* max seg lifetime */
 #define        TCPTV_SRTTBASE  (  1*PR_SLOWHZ)         /* base roundtrip time */

-#define        TCPTV_KEEP      ( 60*PR_SLOWHZ)         /* keep alive - 1 min */
+#define        TCPTV_KEEP      ( 45*PR_SLOWHZ)         /* keep alive - 45 secs */

 #define        TCPTV_PERSMIN   (  5*PR_SLOWHZ)         /* retransmit persistance */
 
 #define        TCPTV_PERSMIN   (  5*PR_SLOWHZ)         /* retransmit persistance */
 

-#define        TCPTV_MAXIDLE   (  4*TCPTV_KEEP)        /* maximum allowable idle
+#define        TCPTV_MAXIDLE   (  8*TCPTV_KEEP)        /* maximum allowable idle

                                                   time before drop conn */
 
 #define        TCPTV_MIN       (  1*PR_SLOWHZ)         /* minimum allowable value */
                                                   time before drop conn */
 
 #define        TCPTV_MIN       (  1*PR_SLOWHZ)         /* minimum allowable value */