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

Commit ecbed6a4 authored by Vlad Yasevich's avatar Vlad Yasevich Committed by David S. Miller
Browse files

sctp: Mark GET_PEER|LOCAL_ADDR_OLD deprecated. 



Socket options SCTP_GET_PEER_ADDR_OLD, SCTP_GET_PEER_ADDR_NUM_OLD,
SCTP_GET_LOCAL_ADDR_OLD, and SCTP_GET_PEER_LOCAL_ADDR_NUM_OLD
have been replaced by newer versions a since 2005.  It's time
to officially deprecate them and schedule them for removal.

Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6dbf4bca

Documentation/feature-removal-schedule.txt

+12 −0
Original line number Original line Diff line number Diff line
@@ -312,3 +312,15 @@ When: 2.6.26 
Why:	Implementation became generic; users should now include

Why:	Implementation became generic; users should now include

	linux/semaphore.h instead.

	linux/semaphore.h instead.

Who:	Matthew Wilcox <willy@linux.intel.com>

Who:	Matthew Wilcox <willy@linux.intel.com>



---------------------------



What:	SCTP_GET_PEER_ADDRS_NUM_OLD, SCTP_GET_PEER_ADDRS_OLD,

	SCTP_GET_LOCAL_ADDRS_NUM_OLD, SCTP_GET_LOCAL_ADDRS_OLD

When: 	June 2009

Why:    A newer version of the options have been introduced in 2005 that

	removes the limitions of the old API.  The sctp library has been

        converted to use these new options at the same time.  Any user

	space app that directly uses the old options should convert to using

	the new options.

Who:	Vlad Yasevich <vladislav.yasevich@hp.com>

net/sctp/socket.c

+12 −0
Original line number Original line Diff line number Diff line
@@ -4223,6 +4223,8 @@ static int sctp_getsockopt_peer_addrs_num_old(struct sock *sk, int len, 
	if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))

	if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))

		return -EFAULT;

		return -EFAULT;





	printk(KERN_WARNING "SCTP: Use of SCTP_GET_PEER_ADDRS_NUM_OLD "

			    "socket option deprecated\n");

	/* For UDP-style sockets, id specifies the association to query.  */

	/* For UDP-style sockets, id specifies the association to query.  */

	asoc = sctp_id2assoc(sk, id);

	asoc = sctp_id2assoc(sk, id);

	if (!asoc)

	if (!asoc)
@@ -4262,6 +4264,9 @@ static int sctp_getsockopt_peer_addrs_old(struct sock *sk, int len, 




	if (getaddrs.addr_num <= 0) return -EINVAL;

	if (getaddrs.addr_num <= 0) return -EINVAL;





	printk(KERN_WARNING "SCTP: Use of SCTP_GET_PEER_ADDRS_OLD "

			    "socket option deprecated\n");



	/* For UDP-style sockets, id specifies the association to query.  */

	/* For UDP-style sockets, id specifies the association to query.  */

	asoc = sctp_id2assoc(sk, getaddrs.assoc_id);

	asoc = sctp_id2assoc(sk, getaddrs.assoc_id);

	if (!asoc)

	if (!asoc)
@@ -4355,6 +4360,9 @@ static int sctp_getsockopt_local_addrs_num_old(struct sock *sk, int len, 
	if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))

	if (copy_from_user(&id, optval, sizeof(sctp_assoc_t)))

		return -EFAULT;

		return -EFAULT;





	printk(KERN_WARNING "SCTP: Use of SCTP_GET_LOCAL_ADDRS_NUM_OLD "

			    "socket option deprecated\n");



	/*

	/*

	 *  For UDP-style sockets, id specifies the association to query.

	 *  For UDP-style sockets, id specifies the association to query.

	 *  If the id field is set to the value '0' then the locally bound

	 *  If the id field is set to the value '0' then the locally bound
@@ -4515,6 +4523,10 @@ static int sctp_getsockopt_local_addrs_old(struct sock *sk, int len, 
	if (getaddrs.addr_num <= 0 ||

	if (getaddrs.addr_num <= 0 ||

	    getaddrs.addr_num >= (INT_MAX / sizeof(union sctp_addr)))

	    getaddrs.addr_num >= (INT_MAX / sizeof(union sctp_addr)))

		return -EINVAL;

		return -EINVAL;



	printk(KERN_WARNING "SCTP: Use of SCTP_GET_LOCAL_ADDRS_OLD "

			    "socket option deprecated\n");



	/*

	/*

	 *  For UDP-style sockets, id specifies the association to query.

	 *  For UDP-style sockets, id specifies the association to query.

	 *  If the id field is set to the value '0' then the locally bound

	 *  If the id field is set to the value '0' then the locally bound