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

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

sctp: make ecn flag per netns and endpoint 



This patch is to add ecn flag for both netns_sctp and sctp_endpoint,
net->sctp.ecn_enable is set 1 by default, and ep->ecn_enable will
be initialized with net->sctp.ecn_enable.

asoc->peer.ecn_capable will be set during negotiation only when
ep->ecn_enable is set on both sides.

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

include/net/netns/sctp.h

+3 −0
Original line number Diff line number Diff line
@@ -128,6 +128,9 @@ struct netns_sctp { 
	/* Flag to indicate if stream interleave is enabled */

	int intl_enable;



	/* Flag to indicate if ecn is enabled */

	int ecn_enable;



	/*

	 * Policy to control SCTP IPv4 address scoping

	 * 0   - Disable IPv4 address scoping

include/net/sctp/structs.h

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

	struct list_head endpoint_shared_keys;

	__u16 active_key_id;

	__u8  auth_enable:1,

	__u8  ecn_enable:1,

	      auth_enable:1,

	      intl_enable:1,

	      prsctp_enable:1,

	      asconf_enable:1,

net/sctp/endpointola.c

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

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

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

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



	/* Remember who we are attached to.  */

	ep->base.sk = sk;

net/sctp/protocol.c

+3 −0
Original line number Diff line number Diff line
@@ -1254,6 +1254,9 @@ static int __net_init sctp_defaults_init(struct net *net) 
	/* Disable AUTH by default. */

	net->sctp.auth_enable = 0;



	/* Enable ECN by default. */

	net->sctp.ecn_enable = 1;



	/* Set SCOPE policy to enabled */

	net->sctp.scope_policy = SCTP_SCOPE_POLICY_ENABLE;

net/sctp/sm_make_chunk.c

+12 −4
Original line number Diff line number Diff line
@@ -244,6 +244,8 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, 


	chunksize = sizeof(init) + addrs_len;

	chunksize += SCTP_PAD4(SCTP_SAT_LEN(num_types));



	if (asoc->ep->ecn_enable)

		chunksize += sizeof(ecap_param);



	if (asoc->ep->prsctp_enable)
@@ -335,6 +337,7 @@ struct sctp_chunk *sctp_make_init(const struct sctp_association *asoc, 
	sctp_addto_chunk(retval, sizeof(sat), &sat);

	sctp_addto_chunk(retval, num_types * sizeof(__u16), &types);



	if (asoc->ep->ecn_enable)

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



	/* Add the supported extensions parameter.  Be nice and add this
@@ -2597,8 +2600,13 @@ static int sctp_process_param(struct sctp_association *asoc, 
		break;



	case SCTP_PARAM_ECN_CAPABLE:

		if (asoc->ep->ecn_enable) {

			asoc->peer.ecn_capable = 1;

			break;

		}

		/* Fall Through */

		goto fall_through;





	case SCTP_PARAM_ADAPTATION_LAYER_IND:

		asoc->peer.adaptation_ind = ntohl(param.aind->adaptation_ind);