handles new uba stuff and fix page freeing problem

[unix-history] / usr / src / sys / netinet / tcp_fsm.h

diff --git a/usr/src/sys/netinet/tcp_fsm.h b/usr/src/sys/netinet/tcp_fsm.h
index b298078..4f2ce91 100644 (file)
--- a/usr/src/sys/netinet/tcp_fsm.h
+++ b/usr/src/sys/netinet/tcp_fsm.h
@@ -1,4 +1,4 @@
-/*     tcp_fsm.h       4.9     81/11/26        */
+/*     tcp_fsm.h       4.12    81/12/21        */

 
 /*
  * TCP FSM state definitions.
 
 /*
  * TCP FSM state definitions.


@@ -24,18 +24,18 @@
 
 #define        TCPS_HAVERCVDSYN(s)     ((s) >= TCPS_SYN_RECEIVED)
 #define        TCPS_HAVERCVDFIN(s)     ((s) >= TCPS_TIME_WAIT)
 
 #define        TCPS_HAVERCVDSYN(s)     ((s) >= TCPS_SYN_RECEIVED)
 #define        TCPS_HAVERCVDFIN(s)     ((s) >= TCPS_TIME_WAIT)

-#define        TCPS_OURFINNOTACKED(s)  ((s) > TCPS_CLOSE_WAIT && (s) < TCPS_FIN_WAIT_2)

 
 #ifdef TCPOUTFLAGS
 /*
  * Flags used when sending segments in tcp_output.
  * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally
 
 #ifdef TCPOUTFLAGS
 /*
  * Flags used when sending segments in tcp_output.
  * Basic flags (TH_RST,TH_ACK,TH_SYN,TH_FIN) are totally

- * determined by state.
+ * determined by state, with the proviso that TH_FIN is sent only
+ * if all data queued for output is included in the segment.

  */
 u_char tcp_outflags[TCP_NSTATES] = {
     TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK,
     TH_ACK, TH_ACK,
  */
 u_char tcp_outflags[TCP_NSTATES] = {
     TH_RST|TH_ACK, 0, TH_SYN, TH_SYN|TH_ACK,
     TH_ACK, TH_ACK,

-    TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK,
+    TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_FIN|TH_ACK, TH_ACK, TH_ACK,

 };
 #endif
 
 };
 #endif
 


@@ -46,7 +46,7 @@ int   tcp_acounts[TCP_NSTATES][PRU_NREQ];
 #ifdef TCPSTATES
 char *tcpstates[] = {
        "CLOSED",       "LISTEN",       "SYN_SENT",     "SYN_RCVD",
 #ifdef TCPSTATES
 char *tcpstates[] = {
        "CLOSED",       "LISTEN",       "SYN_SENT",     "SYN_RCVD",

-       "ESTABLISHED",  "CLOSE_WAIT",   "FIN_WAIT_1",   "FIN_WAIT_2",
-       "TIME_WAIT",    "CLOSING",      "LAST_ACK",
+       "ESTABLISHED",  "CLOSE_WAIT",   "FIN_WAIT_1",   "CLOSING",
+       "LAST_ACK",     "FIN_WAIT_2",   "TIME_WAIT",

 };
 #endif
 };
 #endif