trailing comment after #else or #endif

[unix-history] / usr / src / sys / netinet / tcp_timer.c

diff --git a/usr/src/sys/netinet/tcp_timer.c b/usr/src/sys/netinet/tcp_timer.c
index ca92942..2d80f3f 100644 (file)
--- a/usr/src/sys/netinet/tcp_timer.c
+++ b/usr/src/sys/netinet/tcp_timer.c
@@ -1,41 +1,41 @@
 /*
 /*

- * Copyright (c) 1982, 1986 Regents of the University of California.
+ * Copyright (c) 1982, 1986, 1988, 1990 Regents of the University of California.

  * All rights reserved.
  *
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of California at Berkeley. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)tcp_timer.c 7.11.1.1 (Berkeley) %G%
+ *     @(#)tcp_timer.c 7.21 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "mbuf.h"
-#include "socket.h"
-#include "socketvar.h"
-#include "protosw.h"
-#include "errno.h"
+#ifndef TUBA_INCLUDE
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/mbuf.h>
+#include <sys/socket.h>
+#include <sys/socketvar.h>
+#include <sys/protosw.h>
+#include <sys/errno.h>

 
 

-#include "../net/if.h"
-#include "../net/route.h"
+#include <net/if.h>
+#include <net/route.h>

 
 

-#include "in.h"
-#include "in_pcb.h"
-#include "in_systm.h"
-#include "ip.h"
-#include "ip_var.h"
-#include "tcp.h"
-#include "tcp_fsm.h"
-#include "tcp_seq.h"
-#include "tcp_timer.h"
-#include "tcp_var.h"
-#include "tcpip.h"
+#include <netinet/in.h>
+#include <netinet/in_systm.h>
+#include <netinet/ip.h>
+#include <netinet/in_pcb.h>
+#include <netinet/ip_var.h>
+#include <netinet/tcp.h>
+#include <netinet/tcp_fsm.h>
+#include <netinet/tcp_seq.h>
+#include <netinet/tcp_timer.h>
+#include <netinet/tcp_var.h>
+#include <netinet/tcpip.h>

 
 

-int    tcpnodelack = 0;
+int    tcp_keepidle = TCPTV_KEEP_IDLE;
+int    tcp_keepintvl = TCPTV_KEEPINTVL;
+int    tcp_maxidle;
+#endif /* TUBA_INCLUDE */

 /*
  * Fast timeout routine for processing delayed acks
  */
 /*
  * Fast timeout routine for processing delayed acks
  */


@@ -70,6 +70,7 @@ tcp_slowtimo()
        int s = splnet();
        register int i;
 
        int s = splnet();
        register int i;
 

+       tcp_maxidle = TCPTV_KEEPCNT * tcp_keepintvl;

        /*
         * Search through tcb's and update active timers.
         */
        /*
         * Search through tcb's and update active timers.
         */


@@ -103,8 +104,10 @@ tpgone:
        if ((int)tcp_iss < 0)
                tcp_iss = 0;                            /* XXX */
 #endif
        if ((int)tcp_iss < 0)
                tcp_iss = 0;                            /* XXX */
 #endif

+       tcp_now++;                                      /* for timestamps */

        splx(s);
 }
        splx(s);
 }

+#ifndef TUBA_INCLUDE

 
 /*
  * Cancel all timers for TCP tp.
 
 /*
  * Cancel all timers for TCP tp.


@@ -141,8 +144,8 @@ tcp_timers(tp, timer)
         */
        case TCPT_2MSL:
                if (tp->t_state != TCPS_TIME_WAIT &&
         */
        case TCPT_2MSL:
                if (tp->t_state != TCPS_TIME_WAIT &&

-                   tp->t_idle <= TCPTV_MAXIDLE)
-                       tp->t_timer[TCPT_2MSL] = TCPTV_KEEP;
+                   tp->t_idle <= tcp_maxidle)
+                       tp->t_timer[TCPT_2MSL] = tcp_keepintvl;

                else
                        tp = tcp_close(tp);
                break;
                else
                        tp = tcp_close(tp);
                break;


@@ -156,13 +159,14 @@ tcp_timers(tp, timer)
                if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
                        tp->t_rxtshift = TCP_MAXRXTSHIFT;
                        tcpstat.tcps_timeoutdrop++;
                if (++tp->t_rxtshift > TCP_MAXRXTSHIFT) {
                        tp->t_rxtshift = TCP_MAXRXTSHIFT;
                        tcpstat.tcps_timeoutdrop++;

-                       tp = tcp_drop(tp, ETIMEDOUT);
+                       tp = tcp_drop(tp, tp->t_softerror ?
+                           tp->t_softerror : ETIMEDOUT);

                        break;
                }
                tcpstat.tcps_rexmttimeo++;
                        break;
                }
                tcpstat.tcps_rexmttimeo++;

-               rexmt = ((tp->t_srtt >> 2) + tp->t_rttvar) >> 1;
-               rexmt *= tcp_backoff[tp->t_rxtshift];
-               TCPT_RANGESET(tp->t_rxtcur, rexmt, TCPTV_MIN, TCPTV_REXMTMAX);
+               rexmt = TCP_REXMTVAL(tp) * tcp_backoff[tp->t_rxtshift];
+               TCPT_RANGESET(tp->t_rxtcur, rexmt,
+                   tp->t_rttmin, TCPTV_REXMTMAX);

                tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
                /*
                 * If losing, let the lower level know and try for
                tp->t_timer[TCPT_REXMT] = tp->t_rxtcur;
                /*
                 * If losing, let the lower level know and try for


@@ -176,7 +180,7 @@ tcp_timers(tp, timer)
 #if BSD>=43
                        in_losing(tp->t_inpcb);
 #endif
 #if BSD>=43
                        in_losing(tp->t_inpcb);
 #endif

-                       tp->t_rttvar += (tp->t_srtt >> 2);
+                       tp->t_rttvar += (tp->t_srtt >> TCP_RTT_SHIFT);

                        tp->t_srtt = 0;
                }
                tp->snd_nxt = tp->snd_una;
                        tp->t_srtt = 0;
                }
                tp->snd_nxt = tp->snd_una;


@@ -209,11 +213,12 @@ tcp_timers(tp, timer)
                 * to go below this.)
                 */
                {
                 * to go below this.)
                 */
                {

-               u_int win = MIN(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg;
+               u_int win = min(tp->snd_wnd, tp->snd_cwnd) / 2 / tp->t_maxseg;

                if (win < 2)
                        win = 2;
                tp->snd_cwnd = tp->t_maxseg;
                tp->snd_ssthresh = win * tp->t_maxseg;
                if (win < 2)
                        win = 2;
                tp->snd_cwnd = tp->t_maxseg;
                tp->snd_ssthresh = win * tp->t_maxseg;

+               tp->t_dupacks = 0;

                }
                (void) tcp_output(tp);
                break;
                }
                (void) tcp_output(tp);
                break;


@@ -240,7 +245,7 @@ tcp_timers(tp, timer)
                        goto dropit;
                if (tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE &&
                    tp->t_state <= TCPS_CLOSE_WAIT) {
                        goto dropit;
                if (tp->t_inpcb->inp_socket->so_options & SO_KEEPALIVE &&
                    tp->t_state <= TCPS_CLOSE_WAIT) {

-                       if (tp->t_idle >= TCPTV_MAXIDLE)
+                       if (tp->t_idle >= tcp_keepidle + tcp_maxidle)

                                goto dropit;
                        /*
                         * Send a packet designed to force a response
                                goto dropit;
                        /*
                         * Send a packet designed to force a response


@@ -260,14 +265,15 @@ tcp_timers(tp, timer)
                         * The keepalive packet must have nonzero length
                         * to get a 4.2 host to respond.
                         */
                         * The keepalive packet must have nonzero length
                         * to get a 4.2 host to respond.
                         */

-                       tcp_respond(tp, tp->t_template,
+                       tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,

                            tp->rcv_nxt - 1, tp->snd_una - 1, 0);
 #else
                            tp->rcv_nxt - 1, tp->snd_una - 1, 0);
 #else

-                       tcp_respond(tp, tp->t_template,
+                       tcp_respond(tp, tp->t_template, (struct mbuf *)NULL,

                            tp->rcv_nxt, tp->snd_una - 1, 0);
 #endif
                            tp->rcv_nxt, tp->snd_una - 1, 0);
 #endif

-               }
-               tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;
+                       tp->t_timer[TCPT_KEEP] = tcp_keepintvl;
+               } else
+                       tp->t_timer[TCPT_KEEP] = tcp_keepidle;

                break;
        dropit:
                tcpstat.tcps_keepdrops++;
                break;
        dropit:
                tcpstat.tcps_keepdrops++;


@@ -276,3 +282,4 @@ tcp_timers(tp, timer)
        }
        return (tp);
 }
        }
        return (tp);
 }

+#endif /* TUBA_INCLUDE */