net: Use nlmsg_unicast() instead of netlink_unicast()

[linux-2.6-microblaze.git] / net / sctp / socket.c

diff --git a/net/sctp/socket.c b/net/sctp/socket.c
index a79d193..e64e01f 100644 (file)
--- a/net/sctp/socket.c
+++ b/net/sctp/socket.c
@@ -2496,6 +2496,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
                                sctp_transport_pmtu(trans, sctp_opt2sk(sp));
                                sctp_assoc_sync_pmtu(asoc);
                        }
+                       sctp_transport_pl_reset(trans);
                } else if (asoc) {
                        asoc->param_flags =
                                (asoc->param_flags & ~SPP_PMTUD) | pmtud_change;
@@ -4481,6 +4482,61 @@ static int sctp_setsockopt_encap_port(struct sock *sk,
        return 0;
 }
 
+static int sctp_setsockopt_probe_interval(struct sock *sk,
+                                         struct sctp_probeinterval *params,
+                                         unsigned int optlen)
+{
+       struct sctp_association *asoc;
+       struct sctp_transport *t;
+       __u32 probe_interval;
+
+       if (optlen != sizeof(*params))
+               return -EINVAL;
+
+       probe_interval = params->spi_interval;
+       if (probe_interval && probe_interval < SCTP_PROBE_TIMER_MIN)
+               return -EINVAL;
+
+       /* If an address other than INADDR_ANY is specified, and
+        * no transport is found, then the request is invalid.
+        */
+       if (!sctp_is_any(sk, (union sctp_addr *)&params->spi_address)) {
+               t = sctp_addr_id2transport(sk, &params->spi_address,
+                                          params->spi_assoc_id);
+               if (!t)
+                       return -EINVAL;
+
+               t->probe_interval = msecs_to_jiffies(probe_interval);
+               sctp_transport_pl_reset(t);
+               return 0;
+       }
+
+       /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
+        * socket is a one to many style socket, and an association
+        * was not found, then the id was invalid.
+        */
+       asoc = sctp_id2assoc(sk, params->spi_assoc_id);
+       if (!asoc && params->spi_assoc_id != SCTP_FUTURE_ASSOC &&
+           sctp_style(sk, UDP))
+               return -EINVAL;
+
+       /* If changes are for association, also apply probe_interval to
+        * each transport.
+        */
+       if (asoc) {
+               list_for_each_entry(t, &asoc->peer.transport_addr_list, transports) {
+                       t->probe_interval = msecs_to_jiffies(probe_interval);
+                       sctp_transport_pl_reset(t);
+               }
+
+               asoc->probe_interval = msecs_to_jiffies(probe_interval);
+               return 0;
+       }
+
+       sctp_sk(sk)->probe_interval = probe_interval;
+       return 0;
+}
+
 /* API 6.2 setsockopt(), getsockopt()
  *
  * Applications use setsockopt() and getsockopt() to set or retrieve
@@ -4703,6 +4759,9 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
        case SCTP_REMOTE_UDP_ENCAPS_PORT:
                retval = sctp_setsockopt_encap_port(sk, kopt, optlen);
                break;
+       case SCTP_PLPMTUD_PROBE_INTERVAL:
+               retval = sctp_setsockopt_probe_interval(sk, kopt, optlen);
+               break;
        default:
                retval = -ENOPROTOOPT;
                break;
@@ -4989,6 +5048,7 @@ static int sctp_init_sock(struct sock *sk)
        atomic_set(&sp->pd_mode, 0);
        skb_queue_head_init(&sp->pd_lobby);
        sp->frag_interleave = 0;
+       sp->probe_interval = net->sctp.probe_interval;
 
        /* Create a per socket endpoint structure.  Even if we
         * change the data structure relationships, this may still
@@ -7905,6 +7965,66 @@ out:
        return 0;
 }
 
+static int sctp_getsockopt_probe_interval(struct sock *sk, int len,
+                                         char __user *optval,
+                                         int __user *optlen)
+{
+       struct sctp_probeinterval params;
+       struct sctp_association *asoc;
+       struct sctp_transport *t;
+       __u32 probe_interval;
+
+       if (len < sizeof(params))
+               return -EINVAL;
+
+       len = sizeof(params);
+       if (copy_from_user(&params, optval, len))
+               return -EFAULT;
+
+       /* If an address other than INADDR_ANY is specified, and
+        * no transport is found, then the request is invalid.
+        */
+       if (!sctp_is_any(sk, (union sctp_addr *)&params.spi_address)) {
+               t = sctp_addr_id2transport(sk, &params.spi_address,
+                                          params.spi_assoc_id);
+               if (!t) {
+                       pr_debug("%s: failed no transport\n", __func__);
+                       return -EINVAL;
+               }
+
+               probe_interval = jiffies_to_msecs(t->probe_interval);
+               goto out;
+       }
+
+       /* Get association, if assoc_id != SCTP_FUTURE_ASSOC and the
+        * socket is a one to many style socket, and an association
+        * was not found, then the id was invalid.
+        */
+       asoc = sctp_id2assoc(sk, params.spi_assoc_id);
+       if (!asoc && params.spi_assoc_id != SCTP_FUTURE_ASSOC &&
+           sctp_style(sk, UDP)) {
+               pr_debug("%s: failed no association\n", __func__);
+               return -EINVAL;
+       }
+
+       if (asoc) {
+               probe_interval = jiffies_to_msecs(asoc->probe_interval);
+               goto out;
+       }
+
+       probe_interval = sctp_sk(sk)->probe_interval;
+
+out:
+       params.spi_interval = probe_interval;
+       if (copy_to_user(optval, &params, len))
+               return -EFAULT;
+
+       if (put_user(len, optlen))
+               return -EFAULT;
+
+       return 0;
+}
+
 static int sctp_getsockopt(struct sock *sk, int level, int optname,
                           char __user *optval, int __user *optlen)
 {
@@ -8128,6 +8248,9 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname,
        case SCTP_REMOTE_UDP_ENCAPS_PORT:
                retval = sctp_getsockopt_encap_port(sk, len, optval, optlen);
                break;
+       case SCTP_PLPMTUD_PROBE_INTERVAL:
+               retval = sctp_getsockopt_probe_interval(sk, len, optval, optlen);
+               break;
        default:
                retval = -ENOPROTOOPT;
                break;