xnu-4570.51.1.tar.gz

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

diff --git a/bsd/netinet/tcp_seq.h b/bsd/netinet/tcp_seq.h
index 5023c0a1866be86b4c061ffc3f07e0e3037c9a46..772d33f3642bb682a1cc49af531d83c675913d57 100644 (file)
--- a/bsd/netinet/tcp_seq.h
+++ b/bsd/netinet/tcp_seq.h
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * 

- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (the
- * "License").  You may not use this file except in compliance with the
- * License.  Please obtain a copy of the License at
- * http://www.apple.com/publicsource and read it before using this file.
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.

  * 
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * Copyright (c) 1982, 1986, 1993, 1995
  */
 /*
  * Copyright (c) 1982, 1986, 1993, 1995


@@ -68,8 +74,13 @@
 #define        SEQ_GT(a,b)     ((int)((a)-(b)) > 0)
 #define        SEQ_GEQ(a,b)    ((int)((a)-(b)) >= 0)
 
 #define        SEQ_GT(a,b)     ((int)((a)-(b)) > 0)
 #define        SEQ_GEQ(a,b)    ((int)((a)-(b)) >= 0)
 

+#define        SEQ_MIN(a, b)   ((SEQ_LT(a, b)) ? (a) : (b))
+#define        SEQ_MAX(a, b)   ((SEQ_GT(a, b)) ? (a) : (b))
+

 /* for modulo comparisons of timestamps */
 #define TSTMP_LT(a,b)  ((int)((a)-(b)) < 0)
 /* for modulo comparisons of timestamps */
 #define TSTMP_LT(a,b)  ((int)((a)-(b)) < 0)

+#define TSTMP_GT(a,b)  ((int)((a)-(b)) > 0)
+#define TSTMP_LEQ(a,b) ((int)((a)-(b)) <= 0)

 #define TSTMP_GEQ(a,b) ((int)((a)-(b)) >= 0)
 
 /*
 #define TSTMP_GEQ(a,b) ((int)((a)-(b)) >= 0)
 
 /*


@@ -96,11 +107,9 @@
 
 #define        tcp_sendseqinit(tp) \
        (tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \
 
 #define        tcp_sendseqinit(tp) \
        (tp)->snd_una = (tp)->snd_nxt = (tp)->snd_max = (tp)->snd_up = \

-       (tp)->snd_recover = (tp)->snd_high = (tp)->iss  
-
-#define TCP_PAWS_IDLE  (24 * 24 * 60 * 60 * PR_SLOWHZ)
-                                       /* timestamp wrap-around time */
+       (tp)->snd_recover = (tp)->iss

 
 

-extern tcp_cc  tcp_ccgen;              /* global connection count */
-#endif KERNEL_PRIVATE
+#define TCP_PAWS_IDLE  (24 * 24 * 60 * 60 * TCP_RETRANSHZ)
+/* timestamp wrap-around time */
+#endif /* KERNEL_PRIVATE */

 #endif /* _NETINET_TCP_SEQ_H_ */
 #endif /* _NETINET_TCP_SEQ_H_ */