xnu-1456.1.26.tar.gz

[apple/xnu.git] / bsd / netinet / tcp_timer.h

diff --git a/bsd/netinet/tcp_timer.h b/bsd/netinet/tcp_timer.h
index dc734e62f07db6b36670e62e29f3074c1f2dd799..c4ea59c6b2febe023a7008945af1368a77a9b7db 100644 (file)
--- a/bsd/netinet/tcp_timer.h
+++ b/bsd/netinet/tcp_timer.h
@@ -117,22 +117,23 @@
 /*
  * Time constants.
  */
 /*
  * Time constants.
  */

-#define        TCPTV_MSL       ( 30*PR_SLOWHZ)         /* max seg lifetime (hah!) */
+#define        TCPTV_MSL       ( 15*TCP_RETRANSHZ)             /* max seg lifetime (hah!) */

 #define        TCPTV_SRTTBASE  0                       /* base roundtrip time;
                                                   if 0, no idea yet */
 #define        TCPTV_SRTTBASE  0                       /* base roundtrip time;
                                                   if 0, no idea yet */

-#define        TCPTV_RTOBASE   (  3*PR_SLOWHZ)         /* assumed RTO if no info */
-#define        TCPTV_SRTTDFLT  (  3*PR_SLOWHZ)         /* assumed RTT if no info */
+#define        TCPTV_RTOBASE   (  1*TCP_RETRANSHZ)             /* assumed RTO if no info */
+#define        TCPTV_SRTTDFLT  (  1*TCP_RETRANSHZ)             /* assumed RTT if no info */

 
 

-#define        TCPTV_PERSMIN   (  5*PR_SLOWHZ)         /* retransmit persistence */
-#define        TCPTV_PERSMAX   ( 60*PR_SLOWHZ)         /* maximum persist interval */
+#define        TCPTV_PERSMIN   (  5*TCP_RETRANSHZ)             /* retransmit persistence */
+#define        TCPTV_PERSMAX   ( 60*TCP_RETRANSHZ)             /* maximum persist interval */

 
 

-#define        TCPTV_KEEP_INIT ( 75*PR_SLOWHZ)         /* initial connect keep alive */
-#define        TCPTV_KEEP_IDLE (120*60*PR_SLOWHZ)      /* dflt time before probing */
-#define        TCPTV_KEEPINTVL ( 75*PR_SLOWHZ)         /* default probe interval */
+#define        TCPTV_KEEP_INIT ( 75*TCP_RETRANSHZ)             /* initial connect keep alive */
+#define        TCPTV_KEEP_IDLE (120*60*TCP_RETRANSHZ)  /* dflt time before probing */
+#define        TCPTV_KEEPINTVL ( 75*TCP_RETRANSHZ)             /* default probe interval */

 #define        TCPTV_KEEPCNT   8                       /* max probes before drop */
 
 #define        TCPTV_KEEPCNT   8                       /* max probes before drop */
 

-#define        TCPTV_MIN       (  1*PR_SLOWHZ)         /* minimum allowable value */
-#define        TCPTV_REXMTMAX  ( 64*PR_SLOWHZ)         /* max allowable REXMT value */
+//#define      TCPTV_MIN       (  3*TCP_RETRANSHZ)             /* minimum allowable value */
+#define        TCPTV_MIN       (1)     /* minimum allowable value */
+#define        TCPTV_REXMTMAX  ( 64*TCP_RETRANSHZ)             /* max allowable REXMT value */

 
 #define TCPTV_TWTRUNC  8                       /* RTO factor to truncate TW */
 
 
 #define TCPTV_TWTRUNC  8                       /* RTO factor to truncate TW */
 


@@ -140,8 +141,6 @@
 
 #define        TCP_MAXRXTSHIFT 12                      /* maximum retransmits */
 
 
 #define        TCP_MAXRXTSHIFT 12                      /* maximum retransmits */
 

-#define        TCPTV_DELACK    PR_FASTHZ               /* 125ms timeout */
-

 #ifdef TCPTIMERS
 static char *tcptimers[] =
     { "REXMT", "PERSIST", "KEEP", "2MSL" };
 #ifdef TCPTIMERS
 static char *tcptimers[] =
     { "REXMT", "PERSIST", "KEEP", "2MSL" };


@@ -153,9 +152,9 @@ static char *tcptimers[] =
  */
 #define        TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
        (tv) = (value); \
  */
 #define        TCPT_RANGESET(tv, value, tvmin, tvmax) do { \
        (tv) = (value); \

-       if ((u_long)(tv) < (u_long)(tvmin)) \
+       if ((uint32_t)(tv) < (uint32_t)(tvmin)) \

                (tv) = (tvmin); \
                (tv) = (tvmin); \

-       else if ((u_long)(tv) > (u_long)(tvmax)) \
+       else if ((uint32_t)(tv) > (uint32_t)(tvmax)) \

                (tv) = (tvmax); \
 } while(0)
 
                (tv) = (tvmax); \
 } while(0)
 


@@ -167,7 +166,6 @@ extern int tcp_keepinit;            /* time to establish connection */
 extern int tcp_keepidle;               /* time before keepalive probes begin */
 extern int tcp_keepintvl;              /* time between keepalive probes */
 extern int tcp_maxidle;                        /* time to drop after starting probes */
 extern int tcp_keepidle;               /* time before keepalive probes begin */
 extern int tcp_keepintvl;              /* time between keepalive probes */
 extern int tcp_maxidle;                        /* time to drop after starting probes */

-extern int tcp_delacktime;             /* time before sending a delayed ACK */

 extern int tcp_maxpersistidle;
 extern int tcp_msl;
 extern int tcp_ttl;                    /* time to live for TCP segs */
 extern int tcp_maxpersistidle;
 extern int tcp_msl;
 extern int tcp_ttl;                    /* time to live for TCP segs */