33c33
< __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 179157 2008-05-20 13:47:46Z rrs $");
---
> __FBSDID("$FreeBSD: head/sys/netinet/sctp.h 179783 2008-06-14 07:58:05Z rrs $");
39a40,42
>
> #define SCTP_PACKED __attribute__((packed))
>
49c52
< }
---
> } SCTP_PACKED;
51,52d53
< __attribute__((packed));
<
56,61c57,62
< struct sctp_chunkhdr {
< uint8_t chunk_type; /* chunk type */
< uint8_t chunk_flags; /* chunk flags */
< uint16_t chunk_length; /* chunk length */
< /* optional params follow */
< } __attribute__((packed));
---
> struct sctp_chunkhdr {
> uint8_t chunk_type; /* chunk type */
> uint8_t chunk_flags; /* chunk flags */
> uint16_t chunk_length; /* chunk length */
> /* optional params follow */
> } SCTP_PACKED;
66,69c67,70
< struct sctp_paramhdr {
< uint16_t param_type; /* parameter type */
< uint16_t param_length; /* parameter length */
< } __attribute__((packed));
---
> struct sctp_paramhdr {
> uint16_t param_type; /* parameter type */
> uint16_t param_length; /* parameter length */
> } SCTP_PACKED;
306,310c307,311
< struct sctp_error_cause {
< uint16_t code;
< uint16_t length;
< /* optional cause-specific info may follow */
< } __attribute__((packed));
---
> struct sctp_error_cause {
> uint16_t code;
> uint16_t length;
> /* optional cause-specific info may follow */
> } SCTP_PACKED;
312,317c313,317
< struct sctp_error_invalid_stream {
< struct sctp_error_cause cause; /* code=SCTP_ERROR_INVALID_STRE
< * AM */
< uint16_t stream_id; /* stream id of the DATA in error */
< uint16_t reserved;
< } __attribute__((packed));
---
> struct sctp_error_invalid_stream {
> struct sctp_error_cause cause; /* code=SCTP_ERROR_INVALID_STREAM */
> uint16_t stream_id; /* stream id of the DATA in error */
> uint16_t reserved;
> } SCTP_PACKED;
319,325c319,323
< struct sctp_error_missing_param {
< struct sctp_error_cause cause; /* code=SCTP_ERROR_MISSING_PARA
< * M */
< uint32_t num_missing_params; /* number of missing
< * parameters */
< /* uint16_t param_type's follow */
< } __attribute__((packed));
---
> struct sctp_error_missing_param {
> struct sctp_error_cause cause; /* code=SCTP_ERROR_MISSING_PARAM */
> uint32_t num_missing_params; /* number of missing parameters */
> /* uint16_t param_type's follow */
> } SCTP_PACKED;
327,331c325,328
< struct sctp_error_stale_cookie {
< struct sctp_error_cause cause; /* code=SCTP_ERROR_STALE_COOKIE
< * */
< uint32_t stale_time; /* time in usec of staleness */
< } __attribute__((packed));
---
> struct sctp_error_stale_cookie {
> struct sctp_error_cause cause; /* code=SCTP_ERROR_STALE_COOKIE */
> uint32_t stale_time; /* time in usec of staleness */
> } SCTP_PACKED;
333,336c330,332
< struct sctp_error_out_of_resource {
< struct sctp_error_cause cause; /* code=SCTP_ERROR_OUT_OF_RESOU
< * RCES */
< } __attribute__((packed));
---
> struct sctp_error_out_of_resource {
> struct sctp_error_cause cause; /* code=SCTP_ERROR_OUT_OF_RESOURCES */
> } SCTP_PACKED;
338,340c334,335
< struct sctp_error_unresolv_addr {
< struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRESOLVABLE
< * _ADDR */
---
> struct sctp_error_unresolv_addr {
> struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRESOLVABLE_ADDR */
342c337
< } __attribute__((packed));
---
> } SCTP_PACKED;
344,348c339,342
< struct sctp_error_unrecognized_chunk {
< struct sctp_error_cause cause; /* code=SCTP_ERROR_UNRECOG_CHUN
< * K */
< struct sctp_chunkhdr ch; /* header from chunk in error */
< } __attribute__((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 */
> } SCTP_PACKED;
404,410c398,404
< #define SCTP_DATA_FRAG_MASK 0x03
< #define SCTP_DATA_MIDDLE_FRAG 0x00
< #define SCTP_DATA_LAST_FRAG 0x01
< #define SCTP_DATA_FIRST_FRAG 0x02
< #define SCTP_DATA_NOT_FRAG 0x03
< #define SCTP_DATA_UNORDERED 0x04
<
---
> #define SCTP_DATA_FRAG_MASK 0x03
> #define SCTP_DATA_MIDDLE_FRAG 0x00
> #define SCTP_DATA_LAST_FRAG 0x01
> #define SCTP_DATA_FIRST_FRAG 0x02
> #define SCTP_DATA_NOT_FRAG 0x03
> #define SCTP_DATA_UNORDERED 0x04
> #define SCTP_DATA_SACK_IMMEDIATELY 0x08
412c406
< #define SCTP_SACK_NONCE_SUM 0x01
---
> #define SCTP_SACK_NONCE_SUM 0x01
415c409
< #define SCTP_SACK_CMT_DAC 0x80
---
> #define SCTP_SACK_CMT_DAC 0x80
543a538,539
> #undef SCTP_PACKED
>