mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-07-23 23:32:14 +00:00
sctp: implement assign_number for sctp_stream_interleave
assign_number is added as a member of sctp_stream_interleave, used to assign ssn for data or mid (message id) for idata, called in sctp_packet_append_data. sctp_chunk_assign_ssn is left as it is, and sctp_chunk_assign_mid is added for sctp_stream_interleave_1. This procedure is described in section 2.2.2 of RFC8260. All sizeof(struct sctp_data_chunk) in tx path is replaced with sctp_datachk_len, to make it right for idata as well. And also adjust sctp_chunk_is_data for SCTP_CID_I_DATA. After this patch, idata can be built and sent in tx path. Note that if sp strm_interleave is set, it has to wait_connect in sctp_sendmsg, as asoc intl_enable need to be known after 4 shake- hands, to decide if it should use data or idata later. data and idata can't be mixed to send in one asoc. Signed-off-by: Xin Long <lucien.xin@gmail.com> Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> Acked-by: Neil Horman <nhorman@tuxdriver.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0c3f6f6554
commit
668c9beb90
9 changed files with 83 additions and 14 deletions
|
@ -313,6 +313,7 @@ static enum sctp_xmit __sctp_packet_append_chunk(struct sctp_packet *packet,
|
|||
/* We believe that this chunk is OK to add to the packet */
|
||||
switch (chunk->chunk_hdr->type) {
|
||||
case SCTP_CID_DATA:
|
||||
case SCTP_CID_I_DATA:
|
||||
/* Account for the data being in the packet */
|
||||
sctp_packet_append_data(packet, chunk);
|
||||
/* Disallow SACK bundling after DATA. */
|
||||
|
@ -724,7 +725,7 @@ static enum sctp_xmit sctp_packet_can_append_data(struct sctp_packet *packet,
|
|||
* or delay in hopes of bundling a full sized packet.
|
||||
*/
|
||||
if (chunk->skb->len + q->out_qlen > transport->pathmtu -
|
||||
packet->overhead - sizeof(struct sctp_data_chunk) - 4)
|
||||
packet->overhead - sctp_datachk_len(&chunk->asoc->stream) - 4)
|
||||
/* Enough data queued to fill a packet */
|
||||
return SCTP_XMIT_OK;
|
||||
|
||||
|
@ -759,7 +760,7 @@ static void sctp_packet_append_data(struct sctp_packet *packet,
|
|||
|
||||
asoc->peer.rwnd = rwnd;
|
||||
sctp_chunk_assign_tsn(chunk);
|
||||
sctp_chunk_assign_ssn(chunk);
|
||||
asoc->stream.si->assign_number(chunk);
|
||||
}
|
||||
|
||||
static enum sctp_xmit sctp_packet_will_fit(struct sctp_packet *packet,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue