sctp: add receiver-side procedures for stream reconf ssn reset request chunk
Subsystems (3)
Xin Long
maintainerv2 cover sctp: add receiver-side procedures for stream reconf ssn reset request chunk
Patch 3/7 and 4/7 are to implement receiver-side procedures for the Outgoing and Incoming SSN Reset Request Parameter described in rfc6525 section 5.2.2 and 5.2.3
Patch 1/7 and 2/7 are ahead of them to define some apis.
Patch 5/7-7/7 are to add the process of reconf chunk event in rx path.
Note that with this patchset, asoc->reconf_enable has no chance yet to be set, until the patch "sctp: add get and set sockopt for reconf_enable" is applied in the future. As we can not just enable it when sctp is not capable of processing reconf chunk yet.
v1->v2:
- re-split the patchset and make sure it has no dead codes for review.
- rename the titles of the commits and improve some changelogs.
- drop __packed from some structures in patch 1/7.
- fix some kbuild warnings in patch 3/7 by initializing str_p = NULL.
- sctp_chunk_lookup_strreset_param changes to return sctp_paramhdr_t * and uses sctp_strreset_tsnreq to access request_seq in patch 3/7.
- use __u<size> in uapi sctp.h in patch 1/7.
- do str_list endian conversion when generating stream_reset_event in patch
2/7.
- remove str_list endian conversion, pass resp_seq param with network endian
to lookup_strreset_param in 3/7.
- move str_list endian conversion out of sctp_make_strreset_req, so that
sctp_make_strreset_req can be used more conveniently to process inreq in
patch 4/7.
- remove sctp_merge_reconf_chunk and not support response with multiparam
in patch 6/7.Xin Long (7):
sctp: add support for generating stream reconf resp chunk
sctp: add support for generating stream ssn reset event notification
sctp: implement receiver-side procedures for the Outgoing SSN Reset
Request Parameter
sctp: implement receiver-side procedures for the Incoming SSN Reset
Request Parameter
sctp: add a function to verify the sctp reconf chunk
sctp: add reconf chunk process
sctp: add reconf chunk event
include/linux/sctp.h | 24 ++++++ include/net/sctp/constants.h | 3 + include/net/sctp/sm.h | 21 +++++ include/net/sctp/ulpevent.h | 4 + include/uapi/linux/sctp.h | 16 ++++ net/sctp/sm_make_chunk.c | 141 +++++++++++++++++++++++++++++++-- net/sctp/sm_statefuns.c | 54 +++++++++++++ net/sctp/sm_statetable.c | 30 +++++++ net/sctp/stream.c | 183 +++++++++++++++++++++++++++++++++++++++++++ net/sctp/ulpevent.c | 29 +++++++ 10 files changed, 498 insertions(+), 7 deletions(-)
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 1/7 sctp: add support for generating stream reconf resp chunk
This patch is to define Re-configuration Response Parameter described in rfc6525 section 4.4. As optional fields are only for SSN/TSN Reset Request Parameter, it uses another function to make that.
--- include/linux/sctp.h | 24 ++++++++++++++++ include/net/sctp/sm.h | 7 +++++ net/sctp/sm_make_chunk.c | 74 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 105 insertions(+)
include/linux/sctp.h +24 -0
@@ -749,4 +749,28 @@ struct sctp_strreset_addstrm { __u16 reserved; }; +enum { +SCTP_STRRESET_NOTHING_TO_DO =0x00 , +SCTP_STRRESET_PERFORMED =0x01 , +SCTP_STRRESET_DENIED =0x02 , +SCTP_STRRESET_ERR_WRONG_SSN =0x03 , +SCTP_STRRESET_ERR_IN_PROGRESS =0x04 , +SCTP_STRRESET_ERR_BAD_SEQNO =0x05 , +SCTP_STRRESET_IN_PROGRESS =0x06 , +}; + +struct sctp_strreset_resp { +sctp_paramhdr_t param_hdr; +__u32 response_seq; +__u32 result; +}; + +struct sctp_strreset_resptsn { +sctp_paramhdr_t param_hdr; +__u32 response_seq; +__u32 result; +__u32 senders_next_tsn; +__u32 receivers_next_tsn; +}; +#endif /* __LINUX_SCTP_H__ */
include/net/sctp/sm.h +7 -0
@@ -270,6 +270,13 @@ struct sctp_chunk *sctp_make_strreset_tsnreq(struct sctp_chunk *sctp_make_strreset_addstrm (const struct sctp_association *asoc,__u16 out,__u16 in); +struct sctp_chunk *sctp_make_strreset_resp ( +const struct sctp_association *asoc, +__u32 result,__u32 sn); +struct sctp_chunk *sctp_make_strreset_tsnresp ( +struct sctp_association *asoc, +__u32 result,__u32 sn, +__u32 sender_tsn,__u32 receiver_tsn);void sctp_chunk_assign_tsn (struct sctp_chunk *);void sctp_chunk_assign_ssn (struct sctp_chunk *);
net/sctp/sm_make_chunk.c +74 -0
77 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 2/7 sctp: add support for generating stream ssn reset event notification
This patch is to add Stream Reset Event described in rfc6525 section 6.1.1.
--- include/net/sctp/ulpevent.h | 4 ++++ include/uapi/linux/sctp.h | 16 ++++++++++++++++ net/sctp/ulpevent.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+)
include/net/sctp/ulpevent.h +4 -0
@@ -128,6 +128,10 @@ struct sctp_ulpevent *sctp_ulpevent_make_authkey(struct sctp_ulpevent *sctp_ulpevent_make_sender_dry_event (const struct sctp_association *asoc,gfp_t gfp); +struct sctp_ulpevent *sctp_ulpevent_make_stream_reset_event ( +const struct sctp_association *asoc,__u16 flags, +__u16 stream_num,__u16 *stream_list,gfp_t gfp); +void sctp_ulpevent_read_sndrcvinfo (const struct sctp_ulpevent *event,struct msghdr *); void sctp_ulpevent_read_rcvinfo(const struct sctp_ulpevent *event,
include/uapi/linux/sctp.h +16 -0
@@ -490,6 +490,18 @@ struct sctp_sender_dry_event {sctp_assoc_t sender_dry_assoc_id; }; +#define SCTP_STREAM_RESET_INCOMING_SSN 0x0001 +#define SCTP_STREAM_RESET_OUTGOING_SSN 0x0002 +#define SCTP_STREAM_RESET_DENIED 0x0004 +#define SCTP_STREAM_RESET_FAILED 0x0008 +struct sctp_stream_reset_event { +__u16 strreset_type; +__u16 strreset_flags; +__u32 strreset_length; +sctp_assoc_t strreset_assoc_id; +__u16 strreset_stream_list[]; +}; +/* * Described in Section 7.3 * Ancillary Data and Notification Interest Options
@@ -505,6 +517,7 @@ struct sctp_event_subscribe {__u8 sctp_adaptation_layer_event;__u8 sctp_authentication_event;__u8 sctp_sender_dry_event; +__u8 sctp_stream_reset_event; };/*
@@ -529,6 +542,7 @@ union sctp_notification {struct sctp_pdapi_event sn_pdapi_event;struct sctp_authkey_event sn_authkey_event;struct sctp_sender_dry_event sn_sender_dry_event; +struct sctp_stream_reset_event sn_strreset_event; };/* Section 5.3.1
@@ -556,6 +570,8 @@ enum sctp_sn_type {#define SCTP_AUTHENTICATION_INDICATION SCTP_AUTHENTICATION_EVENT SCTP_SENDER_DRY_EVENT,#define SCTP_SENDER_DRY_EVENT SCTP_SENDER_DRY_EVENT + SCTP_STREAM_RESET_EVENT, +#define SCTP_STREAM_RESET_EVENT SCTP_STREAM_RESET_EVENT };/* Notification error codes used to fill up the error fields in some
net/sctp/ulpevent.c +29 -0
@@ -854,6 +854,35 @@ struct sctp_ulpevent *sctp_ulpevent_make_sender_dry_event(return event; } +struct sctp_ulpevent *sctp_ulpevent_make_stream_reset_event ( +const struct sctp_association *asoc,__u16 flags,__u16 stream_num, +__u16 *stream_list,gfp_t gfp) +{ +struct sctp_stream_reset_event *sreset; +struct sctp_ulpevent *event; +struct sk_buff *skb; +int length, i; + + length =sizeof (struct sctp_stream_reset_event ) +2 * stream_num; + event =sctp_ulpevent_new (length,MSG_NOTIFICATION , gfp); +if (!event) +return NULL ; + + skb =sctp_event2skb (event); + sreset = (struct sctp_stream_reset_event *)skb_put (skb, length); + + sreset->strreset_type =SCTP_STREAM_RESET_EVENT ; + sreset->strreset_flags = flags; + sreset->strreset_length = length; +sctp_ulpevent_set_owner (event, asoc); + sreset->strreset_assoc_id =sctp_assoc2id (asoc); + +for (i =0 ; i < stream_num; i++) + sreset->strreset_stream_list[i] =ntohs (stream_list[i]); + +return event; +} +/* Return the notification type, assuming this is a notification * event. */
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 3/7 sctp: implement receiver-side procedures for the Outgoing SSN Reset Request Parameter
This patch is to implement Receiver-Side Procedures for the Outgoing SSN Reset Request Parameter described in rfc6525 section 5.2.2.
Note that some checks must be after request_seq check, as even those checks fail, strreset_inseq still has to be increase by 1.
--- include/net/sctp/sm.h | 6 +++ net/sctp/stream.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 119 insertions(+)
include/net/sctp/sm.h +6 -0
@@ -280,6 +280,12 @@ struct sctp_chunk *sctp_make_strreset_tsnresp(void sctp_chunk_assign_tsn (struct sctp_chunk *);void sctp_chunk_assign_ssn (struct sctp_chunk *); +/* Prototypes for stream-processing functions. */ +struct sctp_chunk *sctp_process_strreset_outreq ( +struct sctp_association *asoc, +union sctp_params param, +struct sctp_ulpevent **evp); +/* Prototypes for statetable processing. */ int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,
net/sctp/stream.c +112 -0
115 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 4/7 sctp: implement receiver-side procedures for the Incoming SSN Reset Request Parameter
This patch is to implement Receiver-Side Procedures for the Incoming SSN Reset Request Parameter described in rfc6525 section 5.2.3.
It's also to move str_list endian conversion out of sctp_make_strreset_req, so that sctp_make_strreset_req can be used more conveniently to process inreq.
--- include/net/sctp/sm.h | 4 +++ net/sctp/sm_make_chunk.c | 8 +----- net/sctp/stream.c | 70 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 7 deletions(-)
include/net/sctp/sm.h +4 -0
@@ -285,6 +285,10 @@ struct sctp_chunk *sctp_process_strreset_outreq(struct sctp_association *asoc, union sctp_params param, struct sctp_ulpevent **evp); +struct sctp_chunk *sctp_process_strreset_inreq ( +struct sctp_association *asoc, +union sctp_params param, +struct sctp_ulpevent **evp);/* Prototypes for statetable processing. */
net/sctp/sm_make_chunk.c +1 -7
@@ -3617,7 +3617,7 @@ struct sctp_chunk *sctp_make_strreset_req(__u16 stream_len = stream_num *2 ;struct sctp_strreset_inreq inreq;struct sctp_chunk *retval; -__u16 outlen, inlen, i; +__u16 outlen, inlen; outlen = (sizeof (outreq) + stream_len) * out; inlen = (sizeof (inreq) + stream_len) * in;
@@ -3626,9 +3626,6 @@ struct sctp_chunk *sctp_make_strreset_req(if (!retval)return NULL ; -for (i =0 ; i < stream_num; i++) - stream_list[i] =htons (stream_list[i]); -if (outlen) { outreq.param_hdr.type =SCTP_PARAM_RESET_OUT_REQUEST ; outreq.param_hdr.length =htons (outlen);
@@ -3653,9 +3650,6 @@ struct sctp_chunk *sctp_make_strreset_req(sctp_addto_chunk (retval, stream_len, stream_list); } -for (i =0 ; i < stream_num; i++) - stream_list[i] =ntohs (stream_list[i]); -return retval; }
net/sctp/stream.c +69 -0
79 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 5/7 sctp: add a function to verify the sctp reconf chunk
This patch is to add a function sctp_verify_reconf to do some length check and multi-params check for sctp stream reconf according to rfc6525 section 3.1.
--- include/net/sctp/sm.h | 3 +++ net/sctp/sm_make_chunk.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+)
include/net/sctp/sm.h +3 -0
@@ -277,6 +277,9 @@ struct sctp_chunk *sctp_make_strreset_tsnresp(struct sctp_association *asoc, __u32 result, __u32 sn, __u32 sender_tsn, __u32 receiver_tsn); +bool sctp_verify_reconf (const struct sctp_association *asoc, +struct sctp_chunk *chunk, +struct sctp_paramhdr **errp);void sctp_chunk_assign_tsn (struct sctp_chunk *);void sctp_chunk_assign_ssn (struct sctp_chunk *);
net/sctp/sm_make_chunk.c +58 -0
61 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 6/7 sctp: add reconf chunk process
This patch is to add a function to process the incoming reconf chunk, in which it verifies the chunk, and traverses the param and process it with the right function one by one.
sctp_sf_do_reconf would be the process function of reconf chunk event.
--- include/net/sctp/sm.h | 1 + net/sctp/sm_statefuns.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+)
include/net/sctp/sm.h +1 -0
@@ -135,6 +135,7 @@ sctp_state_fn_t sctp_sf_do_8_5_1_E_sa;sctp_state_fn_t sctp_sf_cookie_echoed_err;sctp_state_fn_t sctp_sf_do_asconf;sctp_state_fn_t sctp_sf_do_asconf_ack; +sctp_state_fn_t sctp_sf_do_reconf;sctp_state_fn_t sctp_sf_do_9_2_reshutack;sctp_state_fn_t sctp_sf_eat_fwd_tsn;sctp_state_fn_t sctp_sf_eat_fwd_tsn_fast;
net/sctp/sm_statefuns.c +54 -0
60 lines not on this page · raw message
Signature · 1 line
2.1.0
Xin Long
maintainerPATCH v2 7/7 sctp: add reconf chunk event
This patch is to add reconf chunk event based on the sctp event frame in rx path, it will call sctp_sf_do_reconf to process the reconf chunk.
--- include/net/sctp/constants.h | 3 +++ net/sctp/sm_statetable.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)
include/net/sctp/constants.h +3 -0
@@ -60,11 +60,14 @@ enum { SCTP_DEFAULT_INSTREAMS = SCTP_MAX_STREAM };#define SCTP_NUM_PRSCTP_CHUNK_TYPES 1 +#define SCTP_NUM_RECONF_CHUNK_TYPES 1 +#define SCTP_NUM_AUTH_CHUNK_TYPES 1#define SCTP_NUM_CHUNK_TYPES (SCTP_NUM_BASE_CHUNK_TYPES + \ SCTP_NUM_ADDIP_CHUNK_TYPES +\ SCTP_NUM_PRSCTP_CHUNK_TYPES +\ + SCTP_NUM_RECONF_CHUNK_TYPES +\ SCTP_NUM_AUTH_CHUNK_TYPES)/* These are the different flavours of event. */
net/sctp/sm_statetable.c +30 -0
@@ -482,6 +482,32 @@ static const sctp_sm_table_entry_t prsctp_chunk_event_table[SCTP_NUM_PRSCTP_CHUN TYPE_SCTP_FWD_TSN, };/*state_fn_t prsctp_chunk_event_table[][] */ +#define TYPE_SCTP_RECONF { \ +/* SCTP_STATE_CLOSED */ \ +TYPE_SCTP_FUNC (sctp_sf_discard_chunk), \ +/* SCTP_STATE_COOKIE_WAIT */ \ +TYPE_SCTP_FUNC (sctp_sf_discard_chunk ), \ +/* SCTP_STATE_COOKIE_ECHOED */ \ +TYPE_SCTP_FUNC (sctp_sf_discard_chunk ), \ +/* SCTP_STATE_ESTABLISHED */ \ +TYPE_SCTP_FUNC (sctp_sf_do_reconf ), \ +/* SCTP_STATE_SHUTDOWN_PENDING */ \ +TYPE_SCTP_FUNC (sctp_sf_do_reconf ), \ +/* SCTP_STATE_SHUTDOWN_SENT */ \ +TYPE_SCTP_FUNC (sctp_sf_discard_chunk ), \ +/* SCTP_STATE_SHUTDOWN_RECEIVED */ \ +TYPE_SCTP_FUNC (sctp_sf_discard_chunk ), \ +/* SCTP_STATE_SHUTDOWN_ACK_SENT */ \ +TYPE_SCTP_FUNC (sctp_sf_discard_chunk ), \ +} /* TYPE_SCTP_RECONF */ + +/* The primary index for this table is the chunk type. + * The secondary index for this table is the state. + */ +static const sctp_sm_table_entry_t reconf_chunk_event_table[SCTP_NUM_RECONF_CHUNK_TYPES][SCTP_STATE_NUM_STATES] = { +TYPE_SCTP_RECONF , +};/*state_fn_t reconf_chunk_event_table[][] */ + #define TYPE_SCTP_AUTH { \ /* SCTP_STATE_CLOSED */ \TYPE_SCTP_FUNC (sctp_sf_ootb), \
@@ -964,6 +990,10 @@ static const sctp_sm_table_entry_t *sctp_chunk_event_lookup(struct net *net,return &addip_chunk_event_table[1 ][state]; } +if (net->sctp.reconf_enable) +if (cid =SCTP_CID_RECONF ) +return &reconf_chunk_event_table[0 ][state]; +if (net->sctp.auth_enable) {if (cid =SCTP_CID_AUTH )return &auth_chunk_event_table[0 ][state];
Signature · 1 line
2.1.0
David Miller
maintainerFrom: Xin Long <[email protected]>
Date: Fri, 17 Feb 2017 12:45:36 +0800
Quoted 4 lines
Patch 3/7 and 4/7 are to implement receiver-side procedures for the Outgoing and Incoming SSN Reset Request Parameter described in rfc6525 section 5.2.2 and 5.2.3
Quoted 8 lines
Patch 1/7 and 2/7 are ahead of them to define some apis.
Patch 5/7-7/7 are to add the process of reconf chunk event in rx path.
Note that with this patchset,
asoc->reconf_enablehas no chance yet to be set, until the patch "sctp: add get and set sockopt forreconf_enable" is applied in the future. As we can not just enable it when sctp is not capable of processing reconf chunk yet.
...
Series applied, thanks.