svn commit: r332188 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Sat Apr  7 17:54:38 2018
New Revision: 332188
URL: https://svnweb.freebsd.org/changeset/base/332188

Log:
  MFC r323505:
  
  Export the UDP encapsualation port and the path state.

Modified:
  stable/11/sys/netinet/sctp_sysctl.c
  stable/11/sys/netinet/sctp_uio.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_sysctl.c
==============================================================================
--- stable/11/sys/netinet/sctp_sysctl.c	Sat Apr  7 17:41:32 2018	(r332187)
+++ stable/11/sys/netinet/sctp_sysctl.c	Sat Apr  7 17:54:38 2018	(r332188)
@@ -505,6 +505,14 @@ sctp_sysctl_handle_assoclist(SYSCTL_HANDLER_ARGS)
 				xraddr.rtt = net->rtt / 1000;
 				xraddr.heartbeat_interval = net->heart_beat_delay;
 				xraddr.ssthresh = net->ssthresh;
+				xraddr.encaps_port = net->port;
+				if (net->dest_state & SCTP_ADDR_UNCONFIRMED) {
+					xraddr.state = SCTP_UNCONFIRMED;
+				} else if (net->dest_state & SCTP_ADDR_REACHABLE) {
+					xraddr.state = SCTP_ACTIVE;
+				} else {
+					xraddr.state = SCTP_INACTIVE;
+				}
 				xraddr.start_time.tv_sec = (uint32_t)net->start_time.tv_sec;
 				xraddr.start_time.tv_usec = (uint32_t)net->start_time.tv_usec;
 				SCTP_INP_RUNLOCK(inp);

Modified: stable/11/sys/netinet/sctp_uio.h
==============================================================================
--- stable/11/sys/netinet/sctp_uio.h	Sat Apr  7 17:41:32 2018	(r332187)
+++ stable/11/sys/netinet/sctp_uio.h	Sat Apr  7 17:54:38 2018	(r332188)
@@ -1239,7 +1239,9 @@ struct xsctp_raddr {
 	uint32_t rtt;
 	uint32_t heartbeat_interval;
 	uint32_t ssthresh;
-	uint32_t extra_padding[30];	/* future */
+	uint16_t encaps_port;
+	uint16_t state;
+	uint32_t extra_padding[29];	/* future */
 };
 
 #define SCTP_MAX_LOGGING_SIZE 30000