- Consolidate the code that free's chunks to actually also

  call the sctp_free_remote_address() function.
- Assure that when we allocate a chunk the whoTo is NULL,
  also when we free it and place it into the cache we NULL
  it (that way the consolidation code will always work).
- Fix a small race, when a empty data holder is left on the stream
  out queue, and both sides do a shutdown, the empty data holder
  would prevent us from sending a SHUTDOWN-ACK and at the same time we
  never  would cleanup the empty holder (since nothing was ever in queue).
  We now add a utility function that a) cleans up empty holders and
  b) properly determines if there are still pending data chunks on
  the stream out wheel.
Approved by:	re@freebsd.org (Ken Smith)

1 files changed, 5 insertions, 0 deletions

diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h
index 74e514b..f05a368 100644
--- a/sys/netinet/sctp_var.h
+++ b/sys/netinet/sctp_var.h
@@ -90,6 +90,10 @@ extern struct pr_usrreqs sctp_usrreqs;
 
 
 #define sctp_free_a_chunk(_stcb, _chk) { \
+        if ((_chk)->whoTo) { \
+                sctp_free_remote_addr((_chk)->whoTo); \
+                (_chk)->whoTo = NULL; \
+	} \
 	if (((_stcb)->asoc.free_chunk_cnt > sctp_asoc_free_resc_limit) || \
 	    (sctppcbinfo.ipi_free_chunks > sctp_system_free_resc_limit)) { \
 		SCTP_ZONE_FREE(sctppcbinfo.ipi_zone_chunk, (_chk)); \
@@ -106,6 +110,7 @@ extern struct pr_usrreqs sctp_usrreqs;
 		(_chk) = SCTP_ZONE_GET(sctppcbinfo.ipi_zone_chunk, struct sctp_tmit_chunk); \
 		if ((_chk)) { \
 			SCTP_INCR_CHK_COUNT(); \
+                        (_chk)->whoTo = NULL; \
 		} \
 	} else { \
 		(_chk) = TAILQ_FIRST(&(_stcb)->asoc.free_chunks); \