Date: Mon, 8 Jun 2015 07:06:34 +0000 (UTC) From: Michael Tuexen <tuexen@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r284150 - stable/10/sys/netinet Message-ID: <201506080706.t5876YOJ011502@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tuexen Date: Mon Jun 8 07:06:33 2015 New Revision: 284150 URL: https://svnweb.freebsd.org/changeset/base/284150 Log: MFC r283988: Export a pointer to the SCTP socket. This is needed to add SCTP support to sockstat. Modified: stable/10/sys/netinet/sctp_sysctl.c stable/10/sys/netinet/sctp_uio.h Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netinet/sctp_sysctl.c ============================================================================== --- stable/10/sys/netinet/sctp_sysctl.c Mon Jun 8 05:27:34 2015 (r284149) +++ stable/10/sys/netinet/sctp_sysctl.c Mon Jun 8 07:06:33 2015 (r284150) @@ -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: stable/10/sys/netinet/sctp_uio.h ============================================================================== --- stable/10/sys/netinet/sctp_uio.h Mon Jun 8 05:27:34 2015 (r284149) +++ stable/10/sys/netinet/sctp_uio.h Mon Jun 8 07:06:33 2015 (r284150) @@ -1166,7 +1166,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 {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506080706.t5876YOJ011502>