Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 22 Aug 2013 20:29:58 +0000 (UTC)
From:      Michael Tuexen <tuexen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r254672 - in head/sys: netinet sys
Message-ID:  <201308222029.r7MKTwWL014898@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: tuexen
Date: Thu Aug 22 20:29:57 2013
New Revision: 254672
URL: http://svnweb.freebsd.org/changeset/base/254672

Log:
  Export the inpcb features as a 64-bit entity.
  Bump __FreeBSD_version to 1000048 since the
  modified structure is user visible and used
  by netstat, for example.

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

Modified: head/sys/netinet/sctp_sysctl.c
==============================================================================
--- head/sys/netinet/sctp_sysctl.c	Thu Aug 22 20:07:06 2013	(r254671)
+++ head/sys/netinet/sctp_sysctl.c	Thu Aug 22 20:29:57 2013	(r254672)
@@ -402,7 +402,7 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS)
 		xinpcb.last = 0;
 		xinpcb.local_port = ntohs(inp->sctp_lport);
 		xinpcb.flags = inp->sctp_flags;
-		xinpcb.features = (uint32_t) inp->sctp_features;
+		xinpcb.features = inp->sctp_features;
 		xinpcb.total_sends = inp->total_sends;
 		xinpcb.total_recvs = inp->total_recvs;
 		xinpcb.total_nospaces = inp->total_nospaces;

Modified: head/sys/netinet/sctp_uio.h
==============================================================================
--- head/sys/netinet/sctp_uio.h	Thu Aug 22 20:07:06 2013	(r254671)
+++ head/sys/netinet/sctp_uio.h	Thu Aug 22 20:29:57 2013	(r254672)
@@ -1149,7 +1149,7 @@ union sctp_sockstore {
 struct xsctp_inpcb {
 	uint32_t last;
 	uint32_t flags;
-	uint32_t features;
+	uint64_t features;
 	uint32_t total_sends;
 	uint32_t total_recvs;
 	uint32_t total_nospaces;
@@ -1157,7 +1157,7 @@ struct xsctp_inpcb {
 	uint16_t local_port;
 	uint16_t qlen;
 	uint16_t maxqlen;
-	uint32_t extra_padding[32];	/* future */
+	uint32_t extra_padding[31];	/* future */
 };
 
 struct xsctp_tcb {

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Thu Aug 22 20:07:06 2013	(r254671)
+++ head/sys/sys/param.h	Thu Aug 22 20:29:57 2013	(r254672)
@@ -58,7 +58,7 @@
  *		in the range 5 to 9.
  */
 #undef __FreeBSD_version
-#define __FreeBSD_version 1000047	/* Master, propagated to newvers */
+#define __FreeBSD_version 1000048	/* Master, propagated to newvers */
 
 /*
  * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308222029.r7MKTwWL014898>