svn commit: r283988 - head/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu Jun  4 12:46:56 2015
New Revision: 283988
URL: https://svnweb.freebsd.org/changeset/base/283988

Log:
  Export a pointer to the SCTP socket. This is needed to add SCTP support
  to sockstat.
  
  MFC after: 3 days

Modified:
  head/sys/netinet/sctp_sysctl.c
  head/sys/netinet/sctp_uio.h

Modified: head/sys/netinet/sctp_sysctl.c
==============================================================================
--- head/sys/netinet/sctp_sysctl.c	Thu Jun  4 12:35:00 2015	(r283987)
+++ head/sys/netinet/sctp_sysctl.c	Thu Jun  4 12:46:56 2015	(r283988)
@@ -418,6 +418,7 @@ sctp_sysctl_handle_assoclist(SYSCTL_HAND
 		xinpcb.total_recvs = inp->total_recvs;
 		xinpcb.total_nospaces = inp->total_nospaces;
 		xinpcb.fragmentation_point = inp->sctp_frag_point;
+		xinpcb.socket = inp->sctp_socket;
 		so = inp->sctp_socket;
 		if ((so == NULL) ||
 		    (inp->sctp_flags & SCTP_PCB_FLAGS_SOCKET_GONE)) {

Modified: head/sys/netinet/sctp_uio.h
==============================================================================
--- head/sys/netinet/sctp_uio.h	Thu Jun  4 12:35:00 2015	(r283987)
+++ head/sys/netinet/sctp_uio.h	Thu Jun  4 12:46:56 2015	(r283988)
@@ -1165,7 +1165,12 @@ struct xsctp_inpcb {
 	uint16_t local_port;
 	uint16_t qlen;
 	uint16_t maxqlen;
-	uint32_t extra_padding[31];	/* future */
+	void *socket;
+#if defined(__LP64__)
+	uint32_t extra_padding[29];	/* future */
+#else
+	uint32_t extra_padding[30];	/* future */
+#endif
 };
 
 struct xsctp_tcb {