diff options
Diffstat (limited to 'freebsd/sys/netinet/sctp_structs.h')
| -rw-r--r-- | freebsd/sys/netinet/sctp_structs.h | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/freebsd/sys/netinet/sctp_structs.h b/freebsd/sys/netinet/sctp_structs.h index 280100bb..22a3c736 100644 --- a/freebsd/sys/netinet/sctp_structs.h +++ b/freebsd/sys/netinet/sctp_structs.h @@ -183,7 +183,6 @@ struct iterator_control { uint32_t iterator_running; uint32_t iterator_flags; }; - #define SCTP_ITERATOR_STOP_CUR_IT 0x00000004 #define SCTP_ITERATOR_STOP_CUR_INP 0x00000008 @@ -389,10 +388,10 @@ struct sctp_nets { struct sctp_data_chunkrec { - uint32_t TSN_seq; /* the TSN of this transmit */ - uint32_t stream_seq; /* the stream sequence number of this transmit */ - uint16_t stream_number; /* the stream number of this guy */ - uint32_t payloadtype; + uint32_t tsn; /* the TSN of this transmit */ + uint32_t mid; /* the message identifier of this transmit */ + uint16_t sid; /* the stream number of this guy */ + uint32_t ppid; uint32_t context; /* from send */ uint32_t cwnd_at_send; /* @@ -401,7 +400,7 @@ struct sctp_data_chunkrec { */ uint32_t fast_retran_tsn; /* sending_seq at the time of FR */ struct timeval timetodrop; /* time we drop it from queue */ - uint32_t fsn_num; /* Fragment Sequence Number */ + uint32_t fsn; /* Fragment Sequence Number */ uint8_t doing_fast_retransmit; uint8_t rcv_flags; /* flags pulled from data chunk on inbound for * outbound holds sending flags for PR-SCTP. */ @@ -455,7 +454,6 @@ struct sctp_tmit_chunk { struct sctp_queued_to_read { /* sinfo structure Pluse more */ uint16_t sinfo_stream; /* off the wire */ - uint32_t sinfo_ssn; /* off the wire */ uint16_t sinfo_flags; /* SCTP_UNORDERED from wire use SCTP_EOF for * EOR */ uint32_t sinfo_ppid; /* off the wire */ @@ -465,7 +463,7 @@ struct sctp_queued_to_read { /* sinfo structure Pluse more */ uint32_t sinfo_cumtsn; /* Use this in reassembly as last TSN */ sctp_assoc_t sinfo_assoc_id; /* our assoc id */ /* Non sinfo stuff */ - uint32_t msg_id; /* Fragment Index */ + uint32_t mid; /* Fragment Index */ uint32_t length; /* length of data */ uint32_t held_length; /* length held in sb */ uint32_t top_fsn; /* Highest FSN in queue */ @@ -527,7 +525,7 @@ struct sctp_stream_queue_pending { uint32_t ppid; uint32_t context; uint16_t sinfo_flags; - uint16_t stream; + uint16_t sid; uint16_t act_flags; uint16_t auth_keyid; uint8_t holds_key_ref; @@ -546,8 +544,8 @@ TAILQ_HEAD(sctpwheelunrel_listhead, sctp_stream_in); struct sctp_stream_in { struct sctp_readhead inqueue; struct sctp_readhead uno_inqueue; - uint32_t last_sequence_delivered; /* used for re-order */ - uint16_t stream_no; + uint32_t last_mid_delivered; /* used for re-order */ + uint16_t sid; uint8_t delivery_started; uint8_t pd_api_started; }; @@ -630,7 +628,7 @@ struct sctp_stream_out { */ uint32_t next_mid_ordered; uint32_t next_mid_unordered; - uint16_t stream_no; + uint16_t sid; uint8_t last_msg_incomplete; uint8_t state; }; @@ -883,10 +881,8 @@ struct sctp_association { /* JRS - the congestion control functions are in this struct */ struct sctp_cc_functions cc_functions; - /* - * JRS - value to store the currently loaded congestion control - * module - */ + /* JRS - value to store the currently loaded congestion control + * module */ uint32_t congestion_control_module; /* RS - the stream scheduling functions are in this struct */ struct sctp_ss_functions ss_functions; |