Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/netinet Pack structs.
details: https://anonhg.NetBSD.org/src/rev/8ce70ca29515
branches: trunk
changeset: 825040:8ce70ca29515
user: rjs <rjs%NetBSD.org@localhost>
date: Tue Jun 27 11:55:07 2017 +0000
description:
Pack structs.
diffstat:
sys/netinet/sctp.h | 22 ++++----
sys/netinet/sctp_header.h | 106 +++++++++++++++++++++++-----------------------
2 files changed, 64 insertions(+), 64 deletions(-)
diffs (truncated from 478 to 300 lines):
diff -r 2e64aa32d2d3 -r 8ce70ca29515 sys/netinet/sctp.h
--- a/sys/netinet/sctp.h Tue Jun 27 10:33:09 2017 +0000
+++ b/sys/netinet/sctp.h Tue Jun 27 11:55:07 2017 +0000
@@ -1,5 +1,5 @@
/* $KAME: sctp.h,v 1.18 2005/03/06 16:04:16 itojun Exp $ */
-/* $NetBSD: sctp.h,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/* $NetBSD: sctp.h,v 1.2 2017/06/27 11:55:07 rjs Exp $ */
#ifndef _NETINET_SCTP_H_
#define _NETINET_SCTP_H_
@@ -47,7 +47,7 @@
u_int32_t v_tag; /* verification tag of packet */
u_int32_t checksum; /* Adler32 C-Sum */
/* chunks follow... */
-};
+} __packed;
/*
* SCTP Chunks
@@ -57,7 +57,7 @@
u_int8_t chunk_flags; /* chunk flags */
u_int16_t chunk_length; /* chunk length */
/* optional params follow */
-};
+} __packed;
/*
* SCTP chunk parameters
@@ -65,7 +65,7 @@
struct sctp_paramhdr {
u_int16_t param_type; /* parameter type */
u_int16_t param_length; /* parameter length */
-};
+} __packed;
/*
* user socket options
@@ -199,38 +199,38 @@
u_int16_t code;
u_int16_t length;
/* optional cause-specific info may follow */
-};
+} __packed;
struct sctp_error_invalid_stream {
struct sctp_error_cause cause; /* code=SCTP_ERROR_INVALID_STREAM */
u_int16_t stream_id; /* stream id of the DATA in error */
u_int16_t reserved;
-};
+} __packed;
struct sctp_error_missing_param {
struct sctp_error_cause cause; /* code=SCTP_ERROR_MISSING_PARAM */
u_int32_t num_missing_params; /* number of missing parameters */
/* u_int16_t param_type's follow */
-};
+} __packed;
struct sctp_error_stale_cookie {
struct sctp_error_cause cause; /* code=SCTP_ERROR_STALE_COOKIE */
u_int32_t stale_time; /* time in usec of staleness */
-};
+} __packed;
struct sctp_error_out_of_resource {
struct sctp_error_cause cause; /* code=SCTP_ERROR_OUT_OF_RESOURCES */
-};
+} __packed;
struct sctp_error_unresolv_addr {
struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRESOLVABLE_ADDR */
-};
+} __packed;
struct sctp_error_unrecognized_chunk {
struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRECOG_CHUNK */
struct sctp_chunkhdr ch; /* header from chunk in error */
-};
+} __packed;
#define HAVE_SCTP 1
#define HAVE_KERNEL_SCTP 1
diff -r 2e64aa32d2d3 -r 8ce70ca29515 sys/netinet/sctp_header.h
--- a/sys/netinet/sctp_header.h Tue Jun 27 10:33:09 2017 +0000
+++ b/sys/netinet/sctp_header.h Tue Jun 27 11:55:07 2017 +0000
@@ -1,5 +1,5 @@
/* $KAME: sctp_header.h,v 1.14 2005/03/06 16:04:17 itojun Exp $ */
-/* $NetBSD: sctp_header.h,v 1.1 2015/10/13 21:28:35 rjs Exp $ */
+/* $NetBSD: sctp_header.h,v 1.2 2017/06/27 11:55:07 rjs Exp $ */
#ifndef __SCTP_HEADER_H__
#define __SCTP_HEADER_H__
@@ -46,35 +46,35 @@
struct sctp_ipv4addr_param {
struct sctp_paramhdr ph; /* type=SCTP_IPV4_PARAM_TYPE, len=8 */
u_int32_t addr; /* IPV4 address */
-};
+} __packed;
struct sctp_ipv6addr_param {
struct sctp_paramhdr ph; /* type=SCTP_IPV6_PARAM_TYPE, len=20 */
u_int8_t addr[16]; /* IPV6 address */
-};
+} __packed;
/* Cookie Preservative */
struct sctp_cookie_perserve_param {
struct sctp_paramhdr ph; /* type=SCTP_COOKIE_PRESERVE, len=8 */
u_int32_t time; /* time in ms to extend cookie */
-};
+} __packed;
/* Host Name Address */
struct sctp_host_name_param {
struct sctp_paramhdr ph; /* type=SCTP_HOSTNAME_ADDRESS */
char name[1]; /* host name */
-};
+} __packed;
/* supported address type */
struct sctp_supported_addr_param {
struct sctp_paramhdr ph; /* type=SCTP_SUPPORTED_ADDRTYPE */
u_int16_t addr_type[1]; /* array of supported address types */
-};
+} __packed;
/* ECN parameter */
struct sctp_ecn_supported_param {
struct sctp_paramhdr ph; /* type=SCTP_ECN_CAPABLE */
-};
+} __packed;
/* heartbeat info parameter */
@@ -88,42 +88,42 @@
u_int8_t addr_family;
u_int8_t addr_len;
char address[SCTP_ADDRMAX];
-};
+} __packed;
/* draft-ietf-tsvwg-prsctp */
/* PR-SCTP supported parameter */
struct sctp_prsctp_supported_param {
struct sctp_paramhdr ph;
-};
+} __packed;
/* draft-ietf-tsvwg-addip-sctp */
struct sctp_asconf_paramhdr { /* an ASCONF "parameter" */
struct sctp_paramhdr ph; /* a SCTP parameter header */
u_int32_t correlation_id; /* correlation id for this param */
-};
+} __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 */
-};
+} __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 */
-};
+} __packed;
/* ECN Nonce: draft-ladha-sctp-ecn-nonce */
struct sctp_ecn_nonce_supported_param {
struct sctp_paramhdr ph; /* type = 0x8001 len = 4 */
-};
+} __packed;
struct sctp_supported_chunk_types_param {
struct sctp_paramhdr ph; /* type = 0x8002 len = x */
u_int8_t chunk_types[0];
-};
+} __packed;
/*
* Structures for DATA chunks
@@ -134,12 +134,12 @@
u_int16_t stream_sequence;
u_int32_t protocol_id;
/* user data follows */
-};
+} __packed;
struct sctp_data_chunk {
struct sctp_chunkhdr ch;
struct sctp_data dp;
-};
+} __packed;
/*
* Structures for the control chunks
@@ -153,7 +153,7 @@
u_int16_t num_inbound_streams; /* MIS */
u_int32_t initial_tsn; /* I-TSN */
/* optional param's follow */
-};
+} __packed;
/* state cookie header */
struct sctp_state_cookie { /* this is our definition... */
@@ -182,7 +182,7 @@
* at the end is tacked on the INIT chunk and the
* INIT-ACK chunk (minus the cookie).
*/
-};
+} __packed;
struct sctp_inv_mandatory_param {
u_int16_t cause;
@@ -194,30 +194,30 @@
* will cause this error.
*/
u_int16_t resv;
-};
+} __packed;
struct sctp_unresolv_addr {
u_int16_t cause;
u_int16_t length;
u_int16_t addr_type;
u_int16_t reserved; /* Only one invalid addr type */
-};
+} __packed;
/* state cookie parameter */
struct sctp_state_cookie_param {
struct sctp_paramhdr ph;
struct sctp_state_cookie cookie;
-};
+} __packed;
struct sctp_init_chunk {
struct sctp_chunkhdr ch;
struct sctp_init init;
-};
+} __packed;
struct sctp_init_msg {
struct sctphdr sh;
struct sctp_init_chunk msg;
-};
+} __packed;
/* ... used for both INIT and INIT ACK */
#define sctp_init_ack sctp_init
#define sctp_init_ack_chunk sctp_init_chunk
@@ -228,7 +228,7 @@
struct sctp_gap_ack_block {
u_int16_t start; /* Gap Ack block start */
u_int16_t end; /* Gap Ack block end */
-};
+} __packed;
struct sctp_sack {
u_int32_t cum_tsn_ack; /* cumulative TSN Ack */
@@ -237,23 +237,23 @@
u_int16_t num_dup_tsns; /* number of duplicate TSNs */
/* struct sctp_gap_ack_block's follow */
/* u_int32_t duplicate_tsn's follow */
-};
+} __packed;
struct sctp_sack_chunk {
struct sctp_chunkhdr ch;
struct sctp_sack sack;
-};
+} __packed;
/* Heartbeat Request (HEARTBEAT) */
struct sctp_heartbeat {
struct sctp_heartbeat_info_param hb_info;
-};
+} __packed;
struct sctp_heartbeat_chunk {
struct sctp_chunkhdr ch;
struct sctp_heartbeat heartbeat;
-};
+} __packed;
/* ... used for Heartbeat Ack (HEARTBEAT ACK) */
#define sctp_heartbeat_ack sctp_heartbeat
#define sctp_heartbeat_ack_chunk sctp_heartbeat_chunk
@@ -263,83 +263,83 @@
struct sctp_abort_chunk {
struct sctp_chunkhdr ch;
/* optional error cause may follow */
-};
+} __packed;
struct sctp_abort_msg {
struct sctphdr sh;
Home |
Main Index |
Thread Index |
Old Index