netfilter: Fix format string of nfnetlink_log proc file

[sfrench/cifs-2.6.git] / net / sctp / ulpevent.c

diff --git a/net/sctp/ulpevent.c b/net/sctp/ulpevent.c
index b6842fdb53d4b09ffdafec78c2bab535e6eaad2d..d1e38308f6159c0e4da7db966c16afc6a956b554 100644 (file)
--- a/net/sctp/ulpevent.c
+++ b/net/sctp/ulpevent.c
@@ -341,7 +341,7 @@ struct sctp_ulpevent *sctp_ulpevent_make_peer_addr_change(
        memcpy(&spc->spc_aaddr, aaddr, sizeof(struct sockaddr_storage));
 
        /* Map ipv4 address into v4-mapped-on-v6 address.  */
-       sctp_get_pf_specific(asoc->base.sk->sk_family)->addr_v4map(
+       sctp_get_pf_specific(asoc->base.sk->sk_family)->addr_to_user(
                                        sctp_sk(asoc->base.sk),
                                        (union sctp_addr *)&spc->spc_aaddr);
 
@@ -886,6 +886,69 @@ void sctp_ulpevent_read_sndrcvinfo(const struct sctp_ulpevent *event,
                 sizeof(sinfo), &sinfo);
 }
 
+/* RFC6458, Section 5.3.5 SCTP Receive Information Structure
+ * (SCTP_SNDRCV)
+ */
+void sctp_ulpevent_read_rcvinfo(const struct sctp_ulpevent *event,
+                               struct msghdr *msghdr)
+{
+       struct sctp_rcvinfo rinfo;
+
+       if (sctp_ulpevent_is_notification(event))
+               return;
+
+       memset(&rinfo, 0, sizeof(struct sctp_rcvinfo));
+       rinfo.rcv_sid = event->stream;
+       rinfo.rcv_ssn = event->ssn;
+       rinfo.rcv_ppid = event->ppid;
+       rinfo.rcv_flags = event->flags;
+       rinfo.rcv_tsn = event->tsn;
+       rinfo.rcv_cumtsn = event->cumtsn;
+       rinfo.rcv_assoc_id = sctp_assoc2id(event->asoc);
+       rinfo.rcv_context = event->asoc->default_rcv_context;
+
+       put_cmsg(msghdr, IPPROTO_SCTP, SCTP_RCVINFO,
+                sizeof(rinfo), &rinfo);
+}
+
+/* RFC6458, Section 5.3.6. SCTP Next Receive Information Structure
+ * (SCTP_NXTINFO)
+ */
+static void __sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event,
+                                        struct msghdr *msghdr,
+                                        const struct sk_buff *skb)
+{
+       struct sctp_nxtinfo nxtinfo;
+
+       memset(&nxtinfo, 0, sizeof(nxtinfo));
+       nxtinfo.nxt_sid = event->stream;
+       nxtinfo.nxt_ppid = event->ppid;
+       nxtinfo.nxt_flags = event->flags;
+       if (sctp_ulpevent_is_notification(event))
+               nxtinfo.nxt_flags |= SCTP_NOTIFICATION;
+       nxtinfo.nxt_length = skb->len;
+       nxtinfo.nxt_assoc_id = sctp_assoc2id(event->asoc);
+
+       put_cmsg(msghdr, IPPROTO_SCTP, SCTP_NXTINFO,
+                sizeof(nxtinfo), &nxtinfo);
+}
+
+void sctp_ulpevent_read_nxtinfo(const struct sctp_ulpevent *event,
+                               struct msghdr *msghdr,
+                               struct sock *sk)
+{
+       struct sk_buff *skb;
+       int err;
+
+       skb = sctp_skb_recv_datagram(sk, MSG_PEEK, 1, &err);
+       if (skb != NULL) {
+               __sctp_ulpevent_read_nxtinfo(sctp_skb2event(skb),
+                                            msghdr, skb);
+               /* Just release refcount here. */
+               kfree_skb(skb);
+       }
+}
+
 /* Do accounting for bytes received and hold a reference to the association
  * for each skb.
  */