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

Commit 585396bc authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sctp-rcv-side-stream-reconf-ssn-reset-req-chunk' 



Xin Long says:

====================
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.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61845d20 d884aa63

include/linux/sctp.h

+24 −0
Original line number Diff line number Diff line
@@ -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/constants.h

+3 −0
Original line number Diff line number Diff line
@@ -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.  */

include/net/sctp/sm.h

+21 −0
Original line number Diff line number Diff line
@@ -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;
@@ -270,9 +271,29 @@ 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);

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 *);



/* Prototypes for stream-processing functions.  */

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. */



int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,

include/net/sctp/ulpevent.h

+4 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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