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

Commit 92fc3bd9 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_DEFAULT_SNDINFO sockopt 



Check with SCTP_ALL_ASSOC instead in sctp_setsockopt_default_sndinfo and
check with SCTP_FUTURE_ASSOC instead in sctp_getsockopt_default_sndinfo,
it's compatible with 0.

SCTP_CURRENT_ASSOC is supported for SCTP_DEFAULT_SNDINFO in this patch.

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

net/sctp/socket.c

+22 −3
Original line number Diff line number Diff line
@@ -3067,20 +3067,37 @@ static int sctp_setsockopt_default_sndinfo(struct sock *sk, 
		return -EINVAL;



	asoc = sctp_id2assoc(sk, info.snd_assoc_id);

	if (!asoc && info.snd_assoc_id && sctp_style(sk, UDP))

	if (!asoc && info.snd_assoc_id > SCTP_ALL_ASSOC &&

	    sctp_style(sk, UDP))

		return -EINVAL;



	if (asoc) {

		asoc->default_stream = info.snd_sid;

		asoc->default_flags = info.snd_flags;

		asoc->default_ppid = info.snd_ppid;

		asoc->default_context = info.snd_context;

	} else {



		return 0;

	}



	if (info.snd_assoc_id == SCTP_FUTURE_ASSOC ||

	    info.snd_assoc_id == SCTP_ALL_ASSOC) {

		sp->default_stream = info.snd_sid;

		sp->default_flags = info.snd_flags;

		sp->default_ppid = info.snd_ppid;

		sp->default_context = info.snd_context;

	}



	if (info.snd_assoc_id == SCTP_CURRENT_ASSOC ||

	    info.snd_assoc_id == SCTP_ALL_ASSOC) {

		list_for_each_entry(asoc, &sp->ep->asocs, asocs) {

			asoc->default_stream = info.snd_sid;

			asoc->default_flags = info.snd_flags;

			asoc->default_ppid = info.snd_ppid;

			asoc->default_context = info.snd_context;

		}

	}



	return 0;

}
@@ -6287,8 +6304,10 @@ static int sctp_getsockopt_default_sndinfo(struct sock *sk, int len, 
		return -EFAULT;



	asoc = sctp_id2assoc(sk, info.snd_assoc_id);

	if (!asoc && info.snd_assoc_id && sctp_style(sk, UDP))

	if (!asoc && info.snd_assoc_id != SCTP_FUTURE_ASSOC &&

	    sctp_style(sk, UDP))

		return -EINVAL;



	if (asoc) {

		info.snd_sid = asoc->default_stream;

		info.snd_flags = asoc->default_flags;