Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afe89962 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: use right in and out stream cnt 



Since sctp reconf was added in sctp, the real cnt of in/out stream
have not been c.sinit_max_instreams and c.sinit_num_ostreams any
more.

This patch is to replace them with stream->in/outcnt.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 612307c6

net/sctp/outqueue.c

+1 −2
Original line number Diff line number Diff line
@@ -1026,8 +1026,7 @@ static void sctp_outq_flush(struct sctp_outq *q, int rtx_timeout, gfp_t gfp) 
			/* RFC 2960 6.5 Every DATA chunk MUST carry a valid

			 * stream identifier.

			 */

			if (chunk->sinfo.sinfo_stream >=

			    asoc->c.sinit_num_ostreams) {

			if (chunk->sinfo.sinfo_stream >= asoc->stream->outcnt) {



				/* Mark as failed send. */

				sctp_chunk_fail(chunk, SCTP_ERROR_INV_STRM);

net/sctp/proc.c

+2 −2
Original line number Diff line number Diff line
@@ -361,8 +361,8 @@ static int sctp_assocs_seq_show(struct seq_file *seq, void *v) 
	sctp_seq_dump_remote_addrs(seq, assoc);

	seq_printf(seq, "\t%8lu %5d %5d %4d %4d %4d %8d "

		   "%8d %8d %8d %8d",

		assoc->hbinterval, assoc->c.sinit_max_instreams,

		assoc->c.sinit_num_ostreams, assoc->max_retrans,

		assoc->hbinterval, assoc->stream->incnt,

		assoc->stream->outcnt, assoc->max_retrans,

		assoc->init_retries, assoc->shutdown_retries,

		assoc->rtx_data_chunks,

		atomic_read(&sk->sk_wmem_alloc),

net/sctp/sm_statefuns.c

+3 −3
Original line number Diff line number Diff line
@@ -3946,7 +3946,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn(struct net *net, 


	/* Silently discard the chunk if stream-id is not valid */

	sctp_walk_fwdtsn(skip, chunk) {

		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)

		if (ntohs(skip->stream) >= asoc->stream->incnt)

			goto discard_noforce;

	}
@@ -4017,7 +4017,7 @@ sctp_disposition_t sctp_sf_eat_fwd_tsn_fast( 


	/* Silently discard the chunk if stream-id is not valid */

	sctp_walk_fwdtsn(skip, chunk) {

		if (ntohs(skip->stream) >= asoc->c.sinit_max_instreams)

		if (ntohs(skip->stream) >= asoc->stream->incnt)

			goto gen_shutdown;

	}
@@ -6353,7 +6353,7 @@ static int sctp_eat_data(const struct sctp_association *asoc, 
	 * and discard the DATA chunk.

	 */

	sid = ntohs(data_hdr->stream);

	if (sid >= asoc->c.sinit_max_instreams) {

	if (sid >= asoc->stream->incnt) {

		/* Mark tsn as received even though we drop it */

		sctp_add_cmd_sf(commands, SCTP_CMD_REPORT_TSN, SCTP_U32(tsn));

net/sctp/socket.c

+5 −5
Original line number Diff line number Diff line
@@ -1920,7 +1920,7 @@ static int sctp_sendmsg(struct sock *sk, struct msghdr *msg, size_t msg_len) 
	}



	/* Check for invalid stream. */

	if (sinfo->sinfo_stream >= asoc->c.sinit_num_ostreams) {

	if (sinfo->sinfo_stream >= asoc->stream->outcnt) {

		err = -EINVAL;

		goto out_free;

	}
@@ -4461,8 +4461,8 @@ int sctp_get_sctp_info(struct sock *sk, struct sctp_association *asoc, 
	info->sctpi_rwnd = asoc->a_rwnd;

	info->sctpi_unackdata = asoc->unack_data;

	info->sctpi_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);

	info->sctpi_instrms = asoc->c.sinit_max_instreams;

	info->sctpi_outstrms = asoc->c.sinit_num_ostreams;

	info->sctpi_instrms = asoc->stream->incnt;

	info->sctpi_outstrms = asoc->stream->outcnt;

	list_for_each(pos, &asoc->base.inqueue.in_chunk_list)

		info->sctpi_inqueue++;

	list_for_each(pos, &asoc->outqueue.out_chunk_list)
@@ -4691,8 +4691,8 @@ static int sctp_getsockopt_sctp_status(struct sock *sk, int len, 
	status.sstat_unackdata = asoc->unack_data;



	status.sstat_penddata = sctp_tsnmap_pending(&asoc->peer.tsn_map);

	status.sstat_instrms = asoc->c.sinit_max_instreams;

	status.sstat_outstrms = asoc->c.sinit_num_ostreams;

	status.sstat_instrms = asoc->stream->incnt;

	status.sstat_outstrms = asoc->stream->outcnt;

	status.sstat_fragmentation_point = asoc->frag_point;

	status.sstat_primary.spinfo_assoc_id = sctp_assoc2id(transport->asoc);

	memcpy(&status.sstat_primary.spinfo_address, &transport->ipaddr,