From 4f6b49338e96612ed4c55cf6aa850d32b6f56ea2 Mon Sep 17 00:00:00 2001 From: Randall Stewart Date: Fri, 13 Feb 2009 14:43:46 +0000 Subject: [PATCH] Move the new rwnd field down to the very end of the xsctp structure. This is where all new fields belong (not that we will be ABI compatiable with 7.x anyway.. sigh). --- sys/netinet/sctp_sysctl.c | 4 ++-- sys/netinet/sctp_uio.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index bcba5b5f705..a64aec46ca6 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -409,8 +409,9 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS) xstcb.primary_addr = stcb->asoc.primary_destination->ro._l_addr; xstcb.heartbeat_interval = stcb->asoc.heart_beat_delay; xstcb.state = SCTP_GET_STATE(&stcb->asoc); /* FIXME */ - /* 7.0 does not support this */ + /* 7.0 does not support these */ xstcb.assoc_id = sctp_get_associd(stcb); + xstcb.peers_rwnd = stcb->asoc.peers_rwnd; xstcb.in_streams = stcb->asoc.streamincnt; xstcb.out_streams = stcb->asoc.streamoutcnt; xstcb.max_nr_retrans = stcb->asoc.overall_error_count; @@ -432,7 +433,6 @@ sctp_assoclist(SYSCTL_HANDLER_ARGS) xstcb.cumulative_tsn = stcb->asoc.last_acked_seq; xstcb.cumulative_tsn_ack = stcb->asoc.cumulative_tsn; xstcb.mtu = stcb->asoc.smallest_mtu; - xstcb.peers_rwnd = stcb->asoc.peers_rwnd; xstcb.refcnt = stcb->asoc.refcnt; SCTP_INP_RUNLOCK(inp); SCTP_INP_INFO_RUNLOCK(); diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h index 02d2b4bdbe4..f9b3d8fd645 100644 --- a/sys/netinet/sctp_uio.h +++ b/sys/netinet/sctp_uio.h @@ -1011,12 +1011,12 @@ struct xsctp_tcb { uint32_t cumulative_tsn; uint32_t cumulative_tsn_ack; uint32_t mtu; - uint32_t peers_rwnd; uint32_t refcnt; uint16_t local_port; /* sctpAssocEntry 3 */ uint16_t remote_port; /* sctpAssocEntry 4 */ struct sctp_timeval start_time; /* sctpAssocEntry 16 */ struct sctp_timeval discontinuity_time; /* sctpAssocEntry 17 */ + uint32_t peers_rwnd; sctp_assoc_t assoc_id; /* sctpAssocEntry 1 */ uint32_t extra_padding[8]; /* future */ };