mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

sctp: implement receiver-side procedures for the Add Outgoing Streams Request Parameter

Browse source 
This patch is to add Receiver-Side Procedures for the Add Outgoing
Streams Request Parameter described in section 5.2.5.

It is also to improve sctp_chunk_lookup_strreset_param, so that it
can be used for processing addstrm_out request.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2017-03-10 12:11:09 +08:00 committed by David S. Miller
parent b444153fb5
commit 50a41591f1
3 changed files with 86 additions and 10 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
include/net/sctp/sm.h
View file

@ -297,6 +297,10 @@ struct sctp_chunk *sctp_process_strreset_tsnreq(
struct sctp_association *asoc, struct sctp_association *asoc,
union sctp_params param, union sctp_params param,
struct sctp_ulpevent **evp); struct sctp_ulpevent **evp);
struct sctp_chunk *sctp_process_strreset_addstrm_out(
struct sctp_association *asoc,
union sctp_params param,
struct sctp_ulpevent **evp);
/* Prototypes for statetable processing. */ /* Prototypes for statetable processing. */

3
net/sctp/sm_statefuns.c
View file

@ -3875,6 +3875,9 @@ sctp_disposition_t sctp_sf_do_reconf(struct net *net,
else if (param.p->type == SCTP_PARAM_RESET_TSN_REQUEST) else if (param.p->type == SCTP_PARAM_RESET_TSN_REQUEST)
reply = sctp_process_strreset_tsnreq( reply = sctp_process_strreset_tsnreq(
(struct sctp_association *)asoc, param, &ev); (struct sctp_association *)asoc, param, &ev);
else if (param.p->type == SCTP_PARAM_RESET_ADD_OUT_STREAMS)
reply = sctp_process_strreset_addstrm_out(
(struct sctp_association *)asoc, param, &ev);
/* More handles for other types will be added here, by now it /* More handles for other types will be added here, by now it
* just ignores other types. * just ignores other types.
*/ */

89
net/sctp/stream.c
View file

@ -303,13 +303,14 @@ int sctp_send_add_streams(struct sctp_association *asoc,
} }
static sctp_paramhdr_t *sctp_chunk_lookup_strreset_param( static sctp_paramhdr_t *sctp_chunk_lookup_strreset_param(
struct sctp_association *asoc, __u32 resp_seq) struct sctp_association *asoc, __u32 resp_seq,
__be16 type)
{ {
struct sctp_chunk *chunk = asoc->strreset_chunk; struct sctp_chunk *chunk = asoc->strreset_chunk;
struct sctp_reconf_chunk *hdr; struct sctp_reconf_chunk *hdr;
union sctp_params param; union sctp_params param;
if (ntohl(resp_seq) != asoc->strreset_outseq || !chunk) if (!chunk)
return NULL; return NULL;
hdr = (struct sctp_reconf_chunk *)chunk->chunk_hdr; hdr = (struct sctp_reconf_chunk *)chunk->chunk_hdr;
@ -320,7 +321,8 @@ static sctp_paramhdr_t *sctp_chunk_lookup_strreset_param(
*/ */
struct sctp_strreset_tsnreq *req = param.v; struct sctp_strreset_tsnreq *req = param.v;
if (req->request_seq == resp_seq) if ((!resp_seq || req->request_seq == resp_seq) &&
(!type || type == req->param_hdr.type))
return param.v; return param.v;
} }
@ -361,13 +363,9 @@ struct sctp_chunk *sctp_process_strreset_outreq(
goto out; goto out;
if (asoc->strreset_chunk) { if (asoc->strreset_chunk) {
sctp_paramhdr_t *param_hdr; if (!sctp_chunk_lookup_strreset_param(
struct sctp_transport *t; asoc, outreq->response_seq,
SCTP_PARAM_RESET_IN_REQUEST)) {
param_hdr = sctp_chunk_lookup_strreset_param(
asoc, outreq->response_seq);
if (!param_hdr || param_hdr->type !=
SCTP_PARAM_RESET_IN_REQUEST) {
/* same process with outstanding isn't 0 */ /* same process with outstanding isn't 0 */
result = SCTP_STRRESET_ERR_IN_PROGRESS; result = SCTP_STRRESET_ERR_IN_PROGRESS;
goto out; goto out;
@ -377,6 +375,8 @@ struct sctp_chunk *sctp_process_strreset_outreq(
asoc->strreset_outseq++; asoc->strreset_outseq++;
if (!asoc->strreset_outstanding) { if (!asoc->strreset_outstanding) {
struct sctp_transport *t;
t = asoc->strreset_chunk->transport; t = asoc->strreset_chunk->transport;
if (del_timer(&t->reconf_timer)) if (del_timer(&t->reconf_timer))
sctp_transport_put(t); sctp_transport_put(t);
@ -556,3 +556,72 @@ struct sctp_chunk *sctp_process_strreset_tsnreq(
return sctp_make_strreset_tsnresp(asoc, result, request_seq, return sctp_make_strreset_tsnresp(asoc, result, request_seq,
next_tsn, init_tsn); next_tsn, init_tsn);
} }
struct sctp_chunk *sctp_process_strreset_addstrm_out(
struct sctp_association *asoc,
union sctp_params param,
struct sctp_ulpevent **evp)
{
struct sctp_strreset_addstrm *addstrm = param.v;
struct sctp_stream *stream = asoc->stream;
__u32 result = SCTP_STRRESET_DENIED;
struct sctp_stream_in *streamin;
__u32 request_seq, incnt;
__u16 in;
request_seq = ntohl(addstrm->request_seq);
if (request_seq > asoc->strreset_inseq) {
result = SCTP_STRRESET_ERR_BAD_SEQNO;
goto out;
} else if (request_seq == asoc->strreset_inseq) {
asoc->strreset_inseq++;
}
if (!(asoc->strreset_enable & SCTP_ENABLE_CHANGE_ASSOC_REQ))
goto out;
if (asoc->strreset_chunk) {
if (!sctp_chunk_lookup_strreset_param(
asoc, 0, SCTP_PARAM_RESET_ADD_IN_STREAMS)) {
/* same process with outstanding isn't 0 */
result = SCTP_STRRESET_ERR_IN_PROGRESS;
goto out;
}
asoc->strreset_outstanding--;
asoc->strreset_outseq++;
if (!asoc->strreset_outstanding) {
struct sctp_transport *t;
t = asoc->strreset_chunk->transport;
if (del_timer(&t->reconf_timer))
sctp_transport_put(t);
sctp_chunk_put(asoc->strreset_chunk);
asoc->strreset_chunk = NULL;
}
}
in = ntohs(addstrm->number_of_streams);
incnt = stream->incnt + in;
if (!in || incnt > SCTP_MAX_STREAM)
goto out;
streamin = krealloc(stream->in, incnt * sizeof(*streamin),
GFP_ATOMIC);
if (!streamin)
goto out;
memset(streamin + stream->incnt, 0, in * sizeof(*streamin));
stream->in = streamin;
stream->incnt = incnt;
result = SCTP_STRRESET_PERFORMED;
*evp = sctp_ulpevent_make_stream_change_event(asoc,
0, ntohs(addstrm->number_of_streams), 0, GFP_ATOMIC);
out:
return sctp_make_strreset_resp(asoc, result, request_seq);
}