- Restructure so bindx functions are not done inline to socket option

  but are a seperate call that can be re-used if needed.
- 64 bit issues
  o re-arrange cookie so it is better 64 bit aligned
  o For wire level things we need the packed attribute.

1 files changed, 70 insertions, 64 deletions

diff --git a/sys/netinet/sctp_header.h b/sys/netinet/sctp_header.h
index c3cad00..121c796 100644
--- a/sys/netinet/sctp_header.h
+++ b/sys/netinet/sctp_header.h
@@ -41,13 +41,14 @@ __FBSDID("$FreeBSD$");
 #include <netinet/sctp.h>
 #include <netinet/sctp_constants.h>
 
+
 /*
  * Parameter structures
  */
 struct sctp_ipv4addr_param {
 	struct sctp_paramhdr ph;/* type=SCTP_IPV4_PARAM_TYPE, len=8 */
 	uint32_t addr;		/* IPV4 address */
-};
+}                   SCTP_PACKED;
 
 #define SCTP_V6_ADDR_BYTES 16
 
@@ -55,7 +56,7 @@ struct sctp_ipv4addr_param {
 struct sctp_ipv6addr_param {
 	struct sctp_paramhdr ph;/* type=SCTP_IPV6_PARAM_TYPE, len=20 */
 	uint8_t addr[SCTP_V6_ADDR_BYTES];	/* IPV6 address */
-};
+}                   SCTP_PACKED;
 
 /* Cookie Preservative */
 struct sctp_cookie_perserve_param {
@@ -68,7 +69,7 @@ struct sctp_cookie_perserve_param {
 struct sctp_host_name_param {
 	struct sctp_paramhdr ph;/* type=SCTP_HOSTNAME_ADDRESS */
 	char name[SCTP_ARRAY_MIN_LEN];	/* host name */
-};
+}                    SCTP_PACKED;
 
 /*
  * This is the maximum padded size of a s-a-p
@@ -80,12 +81,12 @@ struct sctp_supported_addr_param {
 	struct sctp_paramhdr ph;/* type=SCTP_SUPPORTED_ADDRTYPE */
 	uint16_t addr_type[SCTP_ARRAY_MIN_LEN];	/* array of supported address
 						 * types */
-};
+}                         SCTP_PACKED;
 
 /* ECN parameter */
 struct sctp_ecn_supported_param {
 	struct sctp_paramhdr ph;/* type=SCTP_ECN_CAPABLE */
-};
+}                        SCTP_PACKED;
 
 
 /* heartbeat info parameter */
@@ -99,44 +100,44 @@ struct sctp_heartbeat_info_param {
 	uint8_t addr_family;
 	uint8_t addr_len;
 	char address[SCTP_ADDRMAX];
-};
+}                         SCTP_PACKED;
 
 
 /* draft-ietf-tsvwg-prsctp */
 /* PR-SCTP supported parameter */
 struct sctp_prsctp_supported_param {
 	struct sctp_paramhdr ph;
-};
+}                           SCTP_PACKED;
 
 
 /* draft-ietf-tsvwg-addip-sctp */
 struct sctp_asconf_paramhdr {	/* an ASCONF "parameter" */
 	struct sctp_paramhdr ph;/* a SCTP parameter header */
 	uint32_t correlation_id;/* correlation id for this param */
-};
+}                    SCTP_PACKED;
 
 struct sctp_asconf_addr_param {	/* an ASCONF address parameter */
 	struct sctp_asconf_paramhdr aph;	/* asconf "parameter" */
 	struct sctp_ipv6addr_param addrp;	/* max storage size */
-};
+}                      SCTP_PACKED;
 
 struct sctp_asconf_addrv4_param {	/* an ASCONF address (v4) parameter */
 	struct sctp_asconf_paramhdr aph;	/* asconf "parameter" */
 	struct sctp_ipv4addr_param addrp;	/* max storage size */
-};
+}                        SCTP_PACKED;
 
 #define SCTP_MAX_SUPPORTED_EXT 256
 
 struct sctp_supported_chunk_types_param {
 	struct sctp_paramhdr ph;/* type = 0x8008  len = x */
 	uint8_t chunk_types[0];
-};
+}                                SCTP_PACKED;
 
 
 /* ECN Nonce: draft-ladha-sctp-ecn-nonce */
 struct sctp_ecn_nonce_supported_param {
 	struct sctp_paramhdr ph;/* type = 0x8001  len = 4 */
-};
+}                              SCTP_PACKED;
 
 
 /*
@@ -148,12 +149,12 @@ struct sctp_data {
 	uint16_t stream_sequence;
 	uint32_t protocol_id;
 	/* user data follows */
-};
+}         SCTP_PACKED;
 
 struct sctp_data_chunk {
 	struct sctp_chunkhdr ch;
 	struct sctp_data dp;
-};
+}               SCTP_PACKED;
 
 /*
  * Structures for the control chunks
@@ -167,38 +168,43 @@ struct sctp_init {
 	uint16_t num_inbound_streams;	/* MIS */
 	uint32_t initial_tsn;	/* I-TSN */
 	/* optional param's follow */
-};
+}         SCTP_PACKED;
 
 #define SCTP_IDENTIFICATION_SIZE 16
 #define SCTP_ADDRESS_SIZE 4
+#define SCTP_RESERVE_SPACE 6
 /* state cookie header */
 struct sctp_state_cookie {	/* this is our definition... */
 	uint8_t identification[SCTP_IDENTIFICATION_SIZE];	/* id of who we are */
+	struct timeval time_entered;	/* the time I built cookie */
 	uint32_t cookie_life;	/* life I will award this cookie */
 	uint32_t tie_tag_my_vtag;	/* my tag in old association */
+
 	uint32_t tie_tag_peer_vtag;	/* peers tag in old association */
 	uint32_t peers_vtag;	/* peers tag in INIT (for quick ref) */
+
 	uint32_t my_vtag;	/* my tag in INIT-ACK (for quick ref) */
-	struct timeval time_entered;	/* the time I built cookie */
 	uint32_t address[SCTP_ADDRESS_SIZE];	/* 4 ints/128 bits */
 	uint32_t addr_type;	/* address type */
 	uint32_t laddress[SCTP_ADDRESS_SIZE];	/* my local from address */
 	uint32_t laddr_type;	/* my local from address type */
 	uint32_t scope_id;	/* v6 scope id for link-locals */
+
 	uint16_t peerport;	/* port address of the peer in the INIT */
 	uint16_t myport;	/* my port address used in the INIT */
 	uint8_t ipv4_addr_legal;/* Are V4 addr legal? */
 	uint8_t ipv6_addr_legal;/* Are V6 addr legal? */
 	uint8_t local_scope;	/* IPv6 local scope flag */
 	uint8_t site_scope;	/* IPv6 site scope flag */
+
 	uint8_t ipv4_scope;	/* IPv4 private addr scope */
 	uint8_t loopback_scope;	/* loopback scope information */
-	uint16_t reserved;
+	uint8_t reserved[SCTP_RESERVE_SPACE];	/* Align to 64 bits */
 	/*
 	 * at the end is tacked on the INIT chunk and the INIT-ACK chunk
 	 * (minus the cookie).
 	 */
-};
+}                 SCTP_PACKED;
 
 struct sctp_inv_mandatory_param {
 	uint16_t cause;
@@ -210,30 +216,30 @@ struct sctp_inv_mandatory_param {
 	 * this error.
 	 */
 	uint16_t resv;
-};
+}                        SCTP_PACKED;
 
 struct sctp_unresolv_addr {
 	uint16_t cause;
 	uint16_t length;
 	uint16_t addr_type;
 	uint16_t reserved;	/* Only one invalid addr type */
-};
+}                  SCTP_PACKED;
 
 /* state cookie parameter */
 struct sctp_state_cookie_param {
 	struct sctp_paramhdr ph;
 	struct sctp_state_cookie cookie;
-};
+}                       SCTP_PACKED;
 
 struct sctp_init_chunk {
 	struct sctp_chunkhdr ch;
 	struct sctp_init init;
-};
+}               SCTP_PACKED;
 
 struct sctp_init_msg {
 	struct sctphdr sh;
 	struct sctp_init_chunk msg;
-};
+}             SCTP_PACKED;
 
 /* ... used for both INIT and INIT ACK */
 #define sctp_init_ack		sctp_init
@@ -245,7 +251,7 @@ struct sctp_init_msg {
 struct sctp_gap_ack_block {
 	uint16_t start;		/* Gap Ack block start */
 	uint16_t end;		/* Gap Ack block end */
-};
+}                  SCTP_PACKED;
 
 struct sctp_sack {
 	uint32_t cum_tsn_ack;	/* cumulative TSN Ack */
@@ -254,23 +260,23 @@ struct sctp_sack {
 	uint16_t num_dup_tsns;	/* number of duplicate TSNs */
 	/* struct sctp_gap_ack_block's follow */
 	/* uint32_t duplicate_tsn's follow */
-};
+}         SCTP_PACKED;
 
 struct sctp_sack_chunk {
 	struct sctp_chunkhdr ch;
 	struct sctp_sack sack;
-};
+}               SCTP_PACKED;
 
 
 /* Heartbeat Request (HEARTBEAT) */
 struct sctp_heartbeat {
 	struct sctp_heartbeat_info_param hb_info;
-};
+}              SCTP_PACKED;
 
 struct sctp_heartbeat_chunk {
 	struct sctp_chunkhdr ch;
 	struct sctp_heartbeat heartbeat;
-};
+}                    SCTP_PACKED;
 
 /* ... used for Heartbeat Ack (HEARTBEAT ACK) */
 #define sctp_heartbeat_ack		sctp_heartbeat
@@ -281,83 +287,83 @@ struct sctp_heartbeat_chunk {
 struct sctp_abort_chunk {
 	struct sctp_chunkhdr ch;
 	/* optional error cause may follow */
-};
+}                SCTP_PACKED;
 
 struct sctp_abort_msg {
 	struct sctphdr sh;
 	struct sctp_abort_chunk msg;
-};
+}              SCTP_PACKED;
 
 
 /* Shutdown Association (SHUTDOWN) */
 struct sctp_shutdown_chunk {
 	struct sctp_chunkhdr ch;
 	uint32_t cumulative_tsn_ack;
-};
+}                   SCTP_PACKED;
 
 
 /* Shutdown Acknowledgment (SHUTDOWN ACK) */
 struct sctp_shutdown_ack_chunk {
 	struct sctp_chunkhdr ch;
-};
+}                       SCTP_PACKED;
 
 
 /* Operation Error (ERROR) */
 struct sctp_error_chunk {
 	struct sctp_chunkhdr ch;
 	/* optional error causes follow */
-};
+}                SCTP_PACKED;
 
 
 /* Cookie Echo (COOKIE ECHO) */
 struct sctp_cookie_echo_chunk {
 	struct sctp_chunkhdr ch;
 	struct sctp_state_cookie cookie;
-};
+}                      SCTP_PACKED;
 
 /* Cookie Acknowledgment (COOKIE ACK) */
 struct sctp_cookie_ack_chunk {
 	struct sctp_chunkhdr ch;
-};
+}                     SCTP_PACKED;
 
 /* Explicit Congestion Notification Echo (ECNE) */
 struct sctp_ecne_chunk {
 	struct sctp_chunkhdr ch;
 	uint32_t tsn;
-};
+}               SCTP_PACKED;
 
 /* Congestion Window Reduced (CWR) */
 struct sctp_cwr_chunk {
 	struct sctp_chunkhdr ch;
 	uint32_t tsn;
-};
+}              SCTP_PACKED;
 
 /* Shutdown Complete (SHUTDOWN COMPLETE) */
 struct sctp_shutdown_complete_chunk {
 	struct sctp_chunkhdr ch;
-};
+}                            SCTP_PACKED;
 
 /* Oper error holding a stale cookie */
 struct sctp_stale_cookie_msg {
 	struct sctp_paramhdr ph;/* really an error cause */
 	uint32_t time_usec;
-};
+}                     SCTP_PACKED;
 
 struct sctp_adaptation_layer_indication {
 	struct sctp_paramhdr ph;
 	uint32_t indication;
-};
+}                                SCTP_PACKED;
 
 struct sctp_cookie_while_shutting_down {
 	struct sctphdr sh;
 	struct sctp_chunkhdr ch;
 	struct sctp_paramhdr ph;/* really an error cause */
-};
+}                               SCTP_PACKED;
 
 struct sctp_shutdown_complete_msg {
 	struct sctphdr sh;
 	struct sctp_shutdown_complete_chunk shut_cmp;
-};
+}                          SCTP_PACKED;
 
 /*
  * draft-ietf-tsvwg-addip-sctp
@@ -368,14 +374,14 @@ struct sctp_asconf_chunk {
 	uint32_t serial_number;
 	/* lookup address parameter (mandatory) */
 	/* asconf parameters follow */
-};
+}                 SCTP_PACKED;
 
 /* Address/Stream Configuration Acknowledge (ASCONF ACK) */
 struct sctp_asconf_ack_chunk {
 	struct sctp_chunkhdr ch;
 	uint32_t serial_number;
 	/* asconf parameters follow */
-};
+}                     SCTP_PACKED;
 
 /* draft-ietf-tsvwg-prsctp */
 /* Forward Cumulative TSN (FORWARD TSN) */
@@ -383,17 +389,17 @@ struct sctp_forward_tsn_chunk {
 	struct sctp_chunkhdr ch;
 	uint32_t new_cumulative_tsn;
 	/* stream/sequence pairs (sctp_strseq) follow */
-};
+}                      SCTP_PACKED;
 
 struct sctp_strseq {
 	uint16_t stream;
 	uint16_t sequence;
-};
+}           SCTP_PACKED;
 
 struct sctp_forward_tsn_msg {
 	struct sctphdr sh;
 	struct sctp_forward_tsn_chunk msg;
-};
+}                    SCTP_PACKED;
 
 /* should be a multiple of 4 - 1 aka 3/7/11 etc. */
 
@@ -403,7 +409,7 @@ struct sctp_chunk_desc {
 	uint8_t chunk_type;
 	uint8_t data_bytes[SCTP_NUM_DB_TO_VERIFY];
 	uint32_t tsn_ifany;
-};
+}               SCTP_PACKED;
 
 
 struct sctp_pktdrop_chunk {
@@ -413,7 +419,7 @@ struct sctp_pktdrop_chunk {
 	uint16_t trunc_len;
 	uint16_t reserved;
 	uint8_t data[0];
-};
+}                  SCTP_PACKED;
 
 /**********STREAM RESET STUFF ******************/
 
@@ -423,25 +429,25 @@ struct sctp_stream_reset_out_request {
 	uint32_t response_seq;	/* if a response, the resp seq no */
 	uint32_t send_reset_at_tsn;	/* last TSN I assigned outbound */
 	uint16_t list_of_streams[0];	/* if not all list of streams */
-};
+}                             SCTP_PACKED;
 
 struct sctp_stream_reset_in_request {
 	struct sctp_paramhdr ph;
 	uint32_t request_seq;
 	uint16_t list_of_streams[0];	/* if not all list of streams */
-};
+}                            SCTP_PACKED;
 
 
 struct sctp_stream_reset_tsn_request {
 	struct sctp_paramhdr ph;
 	uint32_t request_seq;
-};
+}                             SCTP_PACKED;
 
 struct sctp_stream_reset_response {
 	struct sctp_paramhdr ph;
 	uint32_t response_seq;	/* if a response, the resp seq no */
 	uint32_t result;
-};
+}                          SCTP_PACKED;
 
 struct sctp_stream_reset_response_tsn {
 	struct sctp_paramhdr ph;
@@ -449,7 +455,7 @@ struct sctp_stream_reset_response_tsn {
 	uint32_t result;
 	uint32_t senders_next_tsn;
 	uint32_t receivers_next_tsn;
-};
+}                              SCTP_PACKED;
 
 
 
@@ -468,28 +474,28 @@ struct sctp_stream_reset_response_tsn {
 struct sctp_stream_reset_out_req {
 	struct sctp_chunkhdr ch;
 	struct sctp_stream_reset_out_request sr_req;
-};
+}                         SCTP_PACKED;
 
 struct sctp_stream_reset_in_req {
 	struct sctp_chunkhdr ch;
 	struct sctp_stream_reset_in_request sr_req;
-};
+}                        SCTP_PACKED;
 
 struct sctp_stream_reset_tsn_req {
 	struct sctp_chunkhdr ch;
 	struct sctp_stream_reset_tsn_request sr_req;
-};
+}                         SCTP_PACKED;
 
 struct sctp_stream_reset_resp {
 	struct sctp_chunkhdr ch;
 	struct sctp_stream_reset_response sr_resp;
-};
+}                      SCTP_PACKED;
 
 /* respone only valid with a TSN request */
 struct sctp_stream_reset_resp_tsn {
 	struct sctp_chunkhdr ch;
 	struct sctp_stream_reset_response_tsn sr_resp;
-};
+}                          SCTP_PACKED;
 
 /****************************************************/
 
@@ -502,30 +508,30 @@ struct sctp_stream_reset_resp_tsn {
 struct sctp_auth_random {
 	struct sctp_paramhdr ph;/* type = 0x8002 */
 	uint8_t random_data[0];
-};
+}                SCTP_PACKED;
 
 struct sctp_auth_chunk_list {
 	struct sctp_paramhdr ph;/* type = 0x8003 */
 	uint8_t chunk_types[0];
-};
+}                    SCTP_PACKED;
 
 struct sctp_auth_hmac_algo {
 	struct sctp_paramhdr ph;/* type = 0x8004 */
 	uint16_t hmac_ids[0];
-};
+}                   SCTP_PACKED;
 
 struct sctp_auth_chunk {
 	struct sctp_chunkhdr ch;
 	uint16_t shared_key_id;
 	uint16_t hmac_id;
 	uint8_t hmac[0];
-};
+}               SCTP_PACKED;
 
 struct sctp_auth_invalid_hmac {
 	struct sctp_paramhdr ph;
 	uint16_t hmac_id;
 	uint16_t padding;
-};
+}                      SCTP_PACKED;
 
 /*
  * we pre-reserve enough room for a ECNE or CWR AND a SACK with no missing