From 361adab583a4fd57ee5faa21c8bfe581700219dd Mon Sep 17 00:00:00 2001
From: Pradip De <pradipd@google.com>
Date: Tue, 17 Dec 2024 23:02:54 +0000
Subject: [PATCH] Fix for Bug #36731.

Add CloseActiveConnections() call in TCPBase::Close(), which
is called as part of Server::Shutdown().
Active connections should be closed as part of Server shutdown.
This allows the TCPConnectionState to also close the associated
TCPEndpoint object as part of this shutdown flow.

Previously, the CloseActiveConnections() call was present in the
TCPBase destructor alone.
---
 src/transport/raw/ActiveTCPConnectionState.h | 5 ++++-
 src/transport/raw/TCP.cpp                    | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/transport/raw/ActiveTCPConnectionState.h b/src/transport/raw/ActiveTCPConnectionState.h
index 0f53d4479e9300..2176048cc25364 100644
--- a/src/transport/raw/ActiveTCPConnectionState.h
+++ b/src/transport/raw/ActiveTCPConnectionState.h
@@ -62,7 +62,10 @@ struct ActiveTCPConnectionState
 
     void Free()
     {
-        mEndPoint->Free();
+        if (mEndPoint)
+        {
+            mEndPoint->Free();
+        }
         mPeerAddr = PeerAddress::Uninitialized();
         mEndPoint = nullptr;
         mReceived = nullptr;
diff --git a/src/transport/raw/TCP.cpp b/src/transport/raw/TCP.cpp
index b73540d7956f29..e9b9f0b12a7c97 100644
--- a/src/transport/raw/TCP.cpp
+++ b/src/transport/raw/TCP.cpp
@@ -125,6 +125,9 @@ void TCPBase::Close()
         mListenSocket->Free();
         mListenSocket = nullptr;
     }
+
+    CloseActiveConnections();
+
     mState = TCPState::kNotReady;
 }