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

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

sctp: add SCTP_PR_SUPPORTED on sctp sockopt 



According to section 4.5 of rfc7496, prsctp_enable should be per asoc.
We will add prsctp_enable to both asoc and ep, and replace the places
where it used net.sctp->prsctp_enable with asoc->prsctp_enable.

ep->prsctp_enable will be initialized with net.sctp->prsctp_enable, and
asoc->prsctp_enable will be initialized with ep->prsctp_enable. We can
also modify it's value through sockopt SCTP_PR_SUPPORTED.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bac65c4b

include/net/sctp/structs.h

+4 −2
Original line number Diff line number Diff line
@@ -1256,7 +1256,8 @@ struct sctp_endpoint { 
	/* SCTP-AUTH: endpoint shared keys */

	struct list_head endpoint_shared_keys;

	__u16 active_key_id;

	__u8  auth_enable;

	__u8  auth_enable:1,

	      prsctp_enable:1;

};



/* Recover the outter endpoint structure. */
@@ -1848,7 +1849,8 @@ struct sctp_association { 
	__u16 active_key_id;



	__u8 need_ecne:1,	/* Need to send an ECNE Chunk? */

	     temp:1;		/* Is it a temporary association? */

	     temp:1,		/* Is it a temporary association? */

	     prsctp_enable:1;



	struct sctp_priv_assoc_stats stats;

};

include/uapi/linux/sctp.h

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ typedef __s32 sctp_assoc_t; 
#define SCTP_SOCKOPT_CONNECTX	110		/* CONNECTX requests. */

#define SCTP_SOCKOPT_CONNECTX3	111	/* CONNECTX requests (updated) */

#define SCTP_GET_ASSOC_STATS	112	/* Read only */

#define SCTP_PR_SUPPORTED	113



/* These are bit fields for msghdr->msg_flags.  See section 5.1.  */

/* On user space Linux, these live in <bits/socket.h> as an enum.  */

net/sctp/associola.c

+1 −0
Original line number Diff line number Diff line
@@ -268,6 +268,7 @@ static struct sctp_association *sctp_association_init(struct sctp_association *a 
		goto fail_init;



	asoc->active_key_id = ep->active_key_id;

	asoc->prsctp_enable = ep->prsctp_enable;



	/* Save the hmacs and chunks list into this association */

	if (ep->auth_hmacs_list)

net/sctp/endpointola.c

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ static struct sctp_endpoint *sctp_endpoint_init(struct sctp_endpoint *ep, 
	 */

	ep->auth_hmacs_list = auth_hmacs;

	ep->auth_chunk_list = auth_chunks;

	ep->prsctp_enable = net->sctp.prsctp_enable;



	return ep;

net/sctp/sm_make_chunk.c

+6 −6
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, 
	chunksize += WORD_ROUND(SCTP_SAT_LEN(num_types));

	chunksize += sizeof(ecap_param);



	if (net->sctp.prsctp_enable)

	if (asoc->prsctp_enable)

		chunksize += sizeof(prsctp_param);



	/* ADDIP: Section 4.2.7:
@@ -355,7 +355,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, 
		sctp_addto_param(retval, num_ext, extensions);

	}



	if (net->sctp.prsctp_enable)

	if (asoc->prsctp_enable)

		sctp_addto_chunk(retval, sizeof(prsctp_param), &prsctp_param);



	if (sp->adaptation_ind) {
@@ -2024,7 +2024,7 @@ static void sctp_process_ext_param(struct sctp_association *asoc, 
	for (i = 0; i < num_ext; i++) {

		switch (param.ext->chunks[i]) {

		case SCTP_CID_FWD_TSN:

			if (net->sctp.prsctp_enable && !asoc->peer.prsctp_capable)

			if (asoc->prsctp_enable && !asoc->peer.prsctp_capable)

				asoc->peer.prsctp_capable = 1;

			break;

		case SCTP_CID_AUTH:
@@ -2169,7 +2169,7 @@ static sctp_ierror_t sctp_verify_param(struct net *net, 
		break;



	case SCTP_PARAM_FWD_TSN_SUPPORT:

		if (net->sctp.prsctp_enable)

		if (ep->prsctp_enable)

			break;

		goto fallthrough;
@@ -2653,7 +2653,7 @@ static int sctp_process_param(struct sctp_association *asoc, 
		break;



	case SCTP_PARAM_FWD_TSN_SUPPORT:

		if (net->sctp.prsctp_enable) {

		if (asoc->prsctp_enable) {

			asoc->peer.prsctp_capable = 1;

			break;

		}