a number of minor changes

[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 0b1ba20..dc40da3 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.10 81/12/21 */
+/* tcp_timer.c 4.11 82/01/13 */

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


@@ -158,7 +158,11 @@ printf("rexmt set to %d\n", tp->t_timer[TCPT_REXMT]);
                        tcp_drop(tp, ETIMEDOUT);
                        return;
                }
                        tcp_drop(tp, ETIMEDOUT);
                        return;
                }

-               tcp_respond(tp->t_template, tp->rcv_nxt, tp->snd_una-1, 0);
+               if (tp->t_inpcb->inp_socket->so_options & SO_NOKEEPALIVE)
+                       tp->t_idle = 0;
+               else
+                       tcp_respond(tp,
+                           tp->t_template, tp->rcv_nxt, tp->snd_una-1, 0);

                tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;
                return;
        }
                tp->t_timer[TCPT_KEEP] = TCPTV_KEEP;
                return;
        }