Re: [PATCH 1/3] sctp: Export struct sctp_info to userspace

[Phil Sutter]

Hi Stephen,

On Sun, Jul 31, 2016 at 02:18:24PM -0700, Stephen Hemminger wrote:
> On Fri, 29 Jul 2016 18:59:38 +0200
> Phil Sutter  wrote:
> 
> > This is required to correctly interpret INET_DIAG_INFO messages exported
> > by sctp_diag module.
> > 
> > Signed-off-by: Phil Sutter 
> 
> You need to add sctp.h to include/linux/Kbuild to get it exported correctly

Thanks for the heads-up! Luckily it is in there already.

Cheers, Phil

Re: [PATCH 1/3] sctp: Export struct sctp_info to userspace

[Stephen Hemminger]

On Fri, 29 Jul 2016 18:59:38 +0200
Phil Sutter  wrote:

> This is required to correctly interpret INET_DIAG_INFO messages exported
> by sctp_diag module.
> 
> Signed-off-by: Phil Sutter 

You need to add sctp.h to include/linux/Kbuild to get it exported correctly

[PATCH 1/3] sctp: Export struct sctp_info to userspace

[Phil Sutter]

This is required to correctly interpret INET_DIAG_INFO messages exported
by sctp_diag module.

Signed-off-by: Phil Sutter 
---
 include/linux/sctp.h  | 64 ---
 include/uapi/linux/sctp.h | 64 +++
 2 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/include/linux/sctp.h b/include/linux/sctp.h
index de1f64318fc4e..fcb4c36461732 100644
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
@@ -705,70 +705,6 @@ typedef struct sctp_auth_chunk {
sctp_authhdr_t auth_hdr;
 } __packed sctp_auth_chunk_t;
 
-struct sctp_info {
-   __u32   sctpi_tag;
-   __u32   sctpi_state;
-   __u32   sctpi_rwnd;
-   __u16   sctpi_unackdata;
-   __u16   sctpi_penddata;
-   __u16   sctpi_instrms;
-   __u16   sctpi_outstrms;
-   __u32   sctpi_fragmentation_point;
-   __u32   sctpi_inqueue;
-   __u32   sctpi_outqueue;
-   __u32   sctpi_overall_error;
-   __u32   sctpi_max_burst;
-   __u32   sctpi_maxseg;
-   __u32   sctpi_peer_rwnd;
-   __u32   sctpi_peer_tag;
-   __u8sctpi_peer_capable;
-   __u8sctpi_peer_sack;
-   __u16   __reserved1;
-
-   /* assoc status info */
-   __u64   sctpi_isacks;
-   __u64   sctpi_osacks;
-   __u64   sctpi_opackets;
-   __u64   sctpi_ipackets;
-   __u64   sctpi_rtxchunks;
-   __u64   sctpi_outofseqtsns;
-   __u64   sctpi_idupchunks;
-   __u64   sctpi_gapcnt;
-   __u64   sctpi_ouodchunks;
-   __u64   sctpi_iuodchunks;
-   __u64   sctpi_oodchunks;
-   __u64   sctpi_iodchunks;
-   __u64   sctpi_octrlchunks;
-   __u64   sctpi_ictrlchunks;
-
-   /* primary transport info */
-   struct sockaddr_storage sctpi_p_address;
-   __s32   sctpi_p_state;
-   __u32   sctpi_p_cwnd;
-   __u32   sctpi_p_srtt;
-   __u32   sctpi_p_rto;
-   __u32   sctpi_p_hbinterval;
-   __u32   sctpi_p_pathmaxrxt;
-   __u32   sctpi_p_sackdelay;
-   __u32   sctpi_p_sackfreq;
-   __u32   sctpi_p_ssthresh;
-   __u32   sctpi_p_partial_bytes_acked;
-   __u32   sctpi_p_flight_size;
-   __u16   sctpi_p_error;
-   __u16   __reserved2;
-
-   /* sctp sock info */
-   __u32   sctpi_s_autoclose;
-   __u32   sctpi_s_adaptation_ind;
-   __u32   sctpi_s_pd_point;
-   __u8sctpi_s_nodelay;
-   __u8sctpi_s_disable_fragments;
-   __u8sctpi_s_v4mapped;
-   __u8sctpi_s_frag_interleave;
-   __u32   sctpi_s_type;
-   __u32   __reserved3;
-};
-
 struct sctp_infox {
struct sctp_info *sctpinfo;
struct sctp_association *asoc;
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index d304f4c9792c4..a406adcc0793e 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -944,4 +944,68 @@ struct sctp_default_prinfo {
__u16 pr_policy;
 };
 
+struct sctp_info {
+   __u32   sctpi_tag;
+   __u32   sctpi_state;
+   __u32   sctpi_rwnd;
+   __u16   sctpi_unackdata;
+   __u16   sctpi_penddata;
+   __u16   sctpi_instrms;
+   __u16   sctpi_outstrms;
+   __u32   sctpi_fragmentation_point;
+   __u32   sctpi_inqueue;
+   __u32   sctpi_outqueue;
+   __u32   sctpi_overall_error;
+   __u32   sctpi_max_burst;
+   __u32   sctpi_maxseg;
+   __u32   sctpi_peer_rwnd;
+   __u32   sctpi_peer_tag;
+   __u8sctpi_peer_capable;
+   __u8sctpi_peer_sack;
+   __u16   __reserved1;
+
+   /* assoc status info */
+   __u64   sctpi_isacks;
+   __u64   sctpi_osacks;
+   __u64   sctpi_opackets;
+   __u64   sctpi_ipackets;
+   __u64   sctpi_rtxchunks;
+   __u64   sctpi_outofseqtsns;
+   __u64   sctpi_idupchunks;
+   __u64   sctpi_gapcnt;
+   __u64   sctpi_ouodchunks;
+   __u64   sctpi_iuodchunks;
+   __u64   sctpi_oodchunks;
+   __u64   sctpi_iodchunks;
+   __u64   sctpi_octrlchunks;
+   __u64   sctpi_ictrlchunks;
+
+   /* primary transport info */
+   struct sockaddr_storage sctpi_p_address;
+   __s32   sctpi_p_state;
+   __u32   sctpi_p_cwnd;
+   __u32   sctpi_p_srtt;
+   __u32   sctpi_p_rto;
+   __u32   sctpi_p_hbinterval;
+   __u32   sctpi_p_pathmaxrxt;
+   __u32   sctpi_p_sackdelay;
+   __u32   sctpi_p_sackfreq;
+   __u32   sctpi_p_ssthresh;
+   __u32   sctpi_p_partial_bytes_acked;
+   __u32   sctpi_p_flight_size;
+   __u16   sctpi_p_error;
+   __u16   __reserved2;
+
+   /* sctp sock info */
+   __u32   sctpi_s_autoclose;
+   __u32   sctpi_s_adaptation_ind;
+   __u32   sctpi_s_pd_point;
+   __u8sctpi_s_nodelay;
+   __u8sctpi_s_disable_fragments;
+   __u8sctpi_s_v4mapped;
+   __u8sctpi_s_frag_interleave;
+   __u32   sctpi_s_type;
+   __u32   __reserved3;
+};
+
 #endif /* _UAPI_SCTP_H */
-- 
2.8.2