- added pre-checks to the bindx call.

- use proper tick gathering macro instead of ticks directly.
- Placed reasonable boundaries on sets that a user can do
  that are converted to ticks from ms.
- Fix CMT_PF to always check to be sure CMT is on.
- Fix ticks use of CMT_PF.
- put back code to allow asconfs to be queued while INITs are in flight
  and before the assoc is established.
- During window probes, an ack'd packet might be left with the window
  probe mark on it causing it to be retransmitted. Change so that
  the flight decrease macro clears the window_probe mark.
- Additional logging flight size/reading and ASOC LOG. This
  is only enabled if you manually insert things into opt_sctp.h
  since its a set of debug code only.
- Found an interesting SMP race in the way data was appended which
  could cause a reader to lose a part of a message, had to
  reorder when we marked the message was complete to after
  the data was appended.
- bug in ADD-IP for the subset bound socket case when the peer has only
  one address
- fix ASCONF implicit success/error handling case
- proper support of jails in Freebsd 6>
- copy out the timeval for the 64 bit sparc world on cookie-echo
  alignment error crashes without this).
Approved by:	re(Ken Smith)

1 files changed, 13 insertions, 5 deletions

diff --git a/sys/netinet/sctp.h b/sys/netinet/sctp.h
index 642e227..659ef4e 100644
--- a/sys/netinet/sctp.h
+++ b/sys/netinet/sctp.h
@@ -292,11 +292,11 @@ __attribute__((packed));
 #define SCTP_CAUSE_PROTOCOL_VIOLATION	0x000d
 
 /* Error causes from draft-ietf-tsvwg-addip-sctp */
-#define SCTP_CAUSE_DELETING_LAST_ADDR	0x0100
-#define SCTP_CAUSE_RESOURCE_SHORTAGE	0x0101
-#define SCTP_CAUSE_DELETING_SRC_ADDR	0x0102
-#define SCTP_CAUSE_ILLEGAL_ASCONF_ACK	0x0103
-#define SCTP_CAUSE_REQUEST_REFUSED	0x0104
+#define SCTP_CAUSE_DELETING_LAST_ADDR	0xa0
+#define SCTP_CAUSE_RESOURCE_SHORTAGE	0xa1
+#define SCTP_CAUSE_DELETING_SRC_ADDR	0xa2
+#define SCTP_CAUSE_ILLEGAL_ASCONF_ACK	0xa3
+#define SCTP_CAUSE_REQUEST_REFUSED	0xa4
 
 /* Error causes from draft-ietf-tsvwg-sctp-auth */
 #define SCTP_CAUSE_UNSUPPORTED_HMACID	0x0105
@@ -496,6 +496,14 @@ __attribute__((packed));
  */
 #define SCTP_PACKET_LOG_SIZE 65536
 
+/* Maximum delays and such a user can set for options that
+ * take ms.
+ */
+#define SCTP_MAX_SACK_DELAY 500	/* per RFC4960 */
+#define SCTP_MAX_HB_INTERVAL 14400000	/* 4 hours in ms */
+#define SCTP_MAX_COOKIE_LIFE  3600000	/* 1 hour in ms */
+
+
 /* Types of logging/KTR tracing  that can be enabled via the
  * sysctl net.inet.sctp.sctp_logging. You must also enable
  * SUBSYS tracing.