Permalink
Browse files

1) Changes the hb random number to 64 bit value.

2) Expands the protection of when a peer sends a ACK
   for a TSN we have not sent we abort. This used to
   only be the cum-ack. It now expands to include out
   of order segments.
3) Reverse the order of test for shutdown-rcv vs shutdown_pending. M Tuexen
   found that we would get a shutdown, the app close the socket, and then
   we would send SHUTDOWN instead of SHUTDOWN-ACK when the queue cleared.
4) TCP model enhancment to obey so_qlimit - found by Marko Lindholm
5) IN_MULTICAST in Open and Net BSD do NOT need ntohl() - found by Marko Lindholm
6) More enhancment of base freebsd port for the effort to get to M Tuexen something
   that can get into Max X
7) Alternate route is deleted and becomes a patch from the sctp.org web site.
8) Kozuka-san's enhancment to TCP model association lookup.
9) SOme more FreeBSD version 5 stuff.

and TONS of KNF cleanup (unfinished)
  • Loading branch information...
1 parent b4bd142 commit 8ef5d9a91ee977391219afe635ca8d7ce4819c31 itojun committed Jan 16, 2004
@@ -343,7 +343,6 @@ SCTP opt_sctp.h
SCTP_DEBUG opt_sctp.h
SCTP_TCP_MODEL_SUPPORT opt_sctp.h
SCTP_USE_ADLER32 opt_sctp.h
-SCTP_ALTERNATE_ROUTE opt_sctp.h
SCTP_HIGH_SPEED opt_sctp.h
SCTP_STAT_LOGGING opt_sctp.h
SCTP_CWND_LOGGING opt_sctp.h
View
@@ -1,4 +1,4 @@
-/* $KAME: sctp.h,v 1.14 2003/11/25 06:40:52 ono Exp $ */
+/* $KAME: sctp.h,v 1.15 2004/01/16 09:56:00 itojun Exp $ */
#ifndef _NETINET_SCTP_H_
#define _NETINET_SCTP_H_
@@ -1,4 +1,4 @@
-/* $KAME: sctp_header.h,v 1.9 2003/11/25 06:40:52 ono Exp $ */
+/* $KAME: sctp_header.h,v 1.10 2004/01/16 09:56:00 itojun Exp $ */
#ifndef __sctp_header_h__
#define __sctp_header_h__
@@ -73,10 +73,11 @@ struct sctp_heartbeat_info_param {
struct sctp_paramhdr ph;
u_int32_t time_value_1;
u_int32_t time_value_2;
- u_int32_t random_value;
+ u_int32_t random_value1;
+ u_int32_t random_value2;
u_int16_t user_req;
- u_int8_t addr_family;
- u_int8_t addr_len;
+ u_int8_t addr_family;
+ u_int8_t addr_len;
char address[SCTP_ADDRMAX];
};
@@ -138,25 +139,25 @@ struct sctp_init {
/* state cookie header */
struct sctp_state_cookie { /* this is our definition... */
u_int32_t cookie_life; /* life I will award this cookie */
- u_int32_t tie_tag_my_vtag; /* my tag in old association */
- u_int32_t tie_tag_peer_vtag; /* peers tag in old association */
- u_int32_t peers_vtag; /* peers tag in INIT (for quick ref) */
- u_int32_t my_vtag; /* my tag in INIT-ACK (for quick ref) */
+ u_int32_t tie_tag_my_vtag; /* my tag in old association */
+ u_int32_t tie_tag_peer_vtag; /* peers tag in old association */
+ u_int32_t peers_vtag; /* peers tag in INIT (for quick ref) */
+ u_int32_t my_vtag; /* my tag in INIT-ACK (for quick ref) */
struct timeval time_entered; /* the time I built cookie */
u_int32_t address[4]; /* 4 ints/128 bits */
u_int32_t addr_type; /* address type */
- u_int32_t laddress[4]; /* my local from address */
- u_int32_t laddr_type; /* my local from address type */
+ u_int32_t laddress[4]; /* my local from address */
+ u_int32_t laddr_type; /* my local from address type */
u_int32_t scope_id; /* v6 scope id for link-locals */
u_int16_t peerport; /* port address of the peer in the INIT */
u_int16_t myport; /* my port address used in the INIT */
- u_int8_t ipv4_addr_legal; /* Are V4 addr legal? */
- u_int8_t ipv6_addr_legal; /* Are V6 addr legal? */
+ u_int8_t ipv4_addr_legal; /* Are V4 addr legal? */
+ u_int8_t ipv6_addr_legal; /* Are V6 addr legal? */
u_int8_t local_scope; /* IPv6 local scope flag */
u_int8_t site_scope; /* IPv6 site scope flag */
- u_int8_t ipv4_scope; /* IPv4 private addr scope */
- u_int8_t loopback_scope; /* loopback scope information */
- u_int16_t reserved;
+ u_int8_t ipv4_scope; /* IPv4 private addr scope */
+ u_int8_t loopback_scope; /* loopback scope information */
+ u_int16_t reserved;
/*
* at the end is tacked on the INIT chunk and the
* INIT-ACK chunk (minus the cookie).
@@ -319,8 +320,8 @@ struct sctp_cookie_while_shutting_down {
};
struct sctp_shutdown_complete_msg {
- struct sctphdr sh;
- struct sctp_shutdown_complete_chunk shut_cmp;
+ struct sctphdr sh;
+ struct sctp_shutdown_complete_chunk shut_cmp;
};
/* draft-ietf-tsvwg-addip-sctp */
@@ -400,7 +401,7 @@ struct sctp_packet_drop {
#define SCTP_MIN_OVERHEAD (sizeof(struct ip6_hdr) + \
- sizeof(struct sctphdr))
+ sizeof(struct sctphdr))
#else
#define SCTP_MAX_OVERHEAD (sizeof(struct sctp_data_chunk) + \
@@ -415,7 +416,7 @@ struct sctp_packet_drop {
#define SCTP_MIN_OVERHEAD (sizeof(struct ip) + \
- sizeof(struct sctphdr))
+ sizeof(struct sctphdr))
#endif /* AF_INET6 */
#endif /* !SCTP_MAX_OVERHEAD */
@@ -425,6 +426,6 @@ struct sctp_packet_drop {
sizeof(struct ip))
#define SCTP_MIN_V4_OVERHEAD (sizeof(struct ip) + \
- sizeof(struct sctphdr))
+ sizeof(struct sctphdr))
#endif /* !__sctp_header_h__ */
Oops, something went wrong.

0 comments on commit 8ef5d9a

Please sign in to comment.