|
@@ -3356,6 +3356,46 @@ static int sctp_setsockopt_del_key(struct sock *sk,
|
|
|
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * 8.1.23 SCTP_AUTO_ASCONF
|
|
|
+ *
|
|
|
+ * This option will enable or disable the use of the automatic generation of
|
|
|
+ * ASCONF chunks to add and delete addresses to an existing association. Note
|
|
|
+ * that this option has two caveats namely: a) it only affects sockets that
|
|
|
+ * are bound to all addresses available to the SCTP stack, and b) the system
|
|
|
+ * administrator may have an overriding control that turns the ASCONF feature
|
|
|
+ * off no matter what setting the socket option may have.
|
|
|
+ * This option expects an integer boolean flag, where a non-zero value turns on
|
|
|
+ * the option, and a zero value turns off the option.
|
|
|
+ * Note. In this implementation, socket operation overrides default parameter
|
|
|
+ * being set by sysctl as well as FreeBSD implementation
|
|
|
+ */
|
|
|
+static int sctp_setsockopt_auto_asconf(struct sock *sk, char __user *optval,
|
|
|
+ unsigned int optlen)
|
|
|
+{
|
|
|
+ int val;
|
|
|
+ struct sctp_sock *sp = sctp_sk(sk);
|
|
|
+
|
|
|
+ if (optlen < sizeof(int))
|
|
|
+ return -EINVAL;
|
|
|
+ if (get_user(val, (int __user *)optval))
|
|
|
+ return -EFAULT;
|
|
|
+ if (!sctp_is_ep_boundall(sk) && val)
|
|
|
+ return -EINVAL;
|
|
|
+ if ((val && sp->do_auto_asconf) || (!val && !sp->do_auto_asconf))
|
|
|
+ return 0;
|
|
|
+
|
|
|
+ if (val == 0 && sp->do_auto_asconf) {
|
|
|
+ list_del(&sp->auto_asconf_list);
|
|
|
+ sp->do_auto_asconf = 0;
|
|
|
+ } else if (val && !sp->do_auto_asconf) {
|
|
|
+ list_add_tail(&sp->auto_asconf_list,
|
|
|
+ &sctp_auto_asconf_splist);
|
|
|
+ sp->do_auto_asconf = 1;
|
|
|
+ }
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
|
|
|
/* API 6.2 setsockopt(), getsockopt()
|
|
|
*
|
|
@@ -3503,6 +3543,9 @@ SCTP_STATIC int sctp_setsockopt(struct sock *sk, int level, int optname,
|
|
|
case SCTP_AUTH_DELETE_KEY:
|
|
|
retval = sctp_setsockopt_del_key(sk, optval, optlen);
|
|
|
break;
|
|
|
+ case SCTP_AUTO_ASCONF:
|
|
|
+ retval = sctp_setsockopt_auto_asconf(sk, optval, optlen);
|
|
|
+ break;
|
|
|
default:
|
|
|
retval = -ENOPROTOOPT;
|
|
|
break;
|
|
@@ -5308,6 +5351,28 @@ static int sctp_getsockopt_assoc_number(struct sock *sk, int len,
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * 8.1.23 SCTP_AUTO_ASCONF
|
|
|
+ * See the corresponding setsockopt entry as description
|
|
|
+ */
|
|
|
+static int sctp_getsockopt_auto_asconf(struct sock *sk, int len,
|
|
|
+ char __user *optval, int __user *optlen)
|
|
|
+{
|
|
|
+ int val = 0;
|
|
|
+
|
|
|
+ if (len < sizeof(int))
|
|
|
+ return -EINVAL;
|
|
|
+
|
|
|
+ len = sizeof(int);
|
|
|
+ if (sctp_sk(sk)->do_auto_asconf && sctp_is_ep_boundall(sk))
|
|
|
+ val = 1;
|
|
|
+ if (put_user(len, optlen))
|
|
|
+ return -EFAULT;
|
|
|
+ if (copy_to_user(optval, &val, len))
|
|
|
+ return -EFAULT;
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* 8.2.6. Get the Current Identifiers of Associations
|
|
|
* (SCTP_GET_ASSOC_ID_LIST)
|
|
@@ -5492,6 +5557,9 @@ SCTP_STATIC int sctp_getsockopt(struct sock *sk, int level, int optname,
|
|
|
case SCTP_GET_ASSOC_ID_LIST:
|
|
|
retval = sctp_getsockopt_assoc_ids(sk, len, optval, optlen);
|
|
|
break;
|
|
|
+ case SCTP_AUTO_ASCONF:
|
|
|
+ retval = sctp_getsockopt_auto_asconf(sk, len, optval, optlen);
|
|
|
+ break;
|
|
|
default:
|
|
|
retval = -ENOPROTOOPT;
|
|
|
break;
|