Minor fixes in TCP Disconnect to simplify the logic. (#34142)
Use the available IPAddress and port info in the member PeerAddress in
the ActiveConnection object to compare with the passed PeerAddress
instead of calling GetPeerInfo() from within TCPEndPoint to fetch
those.
Log the connection closure in the CloseConnectionInternal function
which is also called by CloseActiveConnections() from the TCPBase
destructor.
diff --git a/src/transport/raw/TCP.cpp b/src/transport/raw/TCP.cpp
index 3c3e6da..8a15f75 100644
--- a/src/transport/raw/TCP.cpp
+++ b/src/transport/raw/TCP.cpp
@@ -398,6 +398,10 @@
if (connection->mConnectionState != TCPState::kClosed && connection->mEndPoint)
{
+ char addrStr[Transport::PeerAddress::kMaxToStringSize];
+ connection->mPeerAddr.ToString(addrStr);
+ ChipLogProgress(Inet, "Closing connection with peer %s.", addrStr);
+
if (err == CHIP_NO_ERROR)
{
connection->mEndPoint->Close();
@@ -616,36 +620,20 @@
void TCPBase::TCPDisconnect(const PeerAddress & address)
{
- CHIP_ERROR err = CHIP_NO_ERROR;
// Closes an existing connection
for (size_t i = 0; i < mActiveConnectionsSize; i++)
{
if (mActiveConnections[i].IsConnected())
{
- Inet::IPAddress ipAddress;
- uint16_t port;
- Inet::InterfaceId interfaceId;
+ const Inet::IPAddress & ipAddress = mActiveConnections[i].mPeerAddr.GetIPAddress();
+ uint16_t port = mActiveConnections[i].mPeerAddr.GetPort();
- err = mActiveConnections[i].mEndPoint->GetPeerInfo(&ipAddress, &port);
- if (err != CHIP_NO_ERROR)
+ // Ignoring the InterfaceID in the check as it may not have been provided in
+ // the PeerAddress during connection establishment. The IPAddress and Port
+ // are the necessary and sufficient set of parameters for searching
+ // through the connections.
+ if (ipAddress == address.GetIPAddress() && port == address.GetPort() && address.GetTransportType() == Type::kTcp)
{
- ChipLogError(Inet, "TCPDisconnect: GetPeerInfo error: %" CHIP_ERROR_FORMAT, err.Format());
- return;
- }
-
- err = mActiveConnections[i].mEndPoint->GetInterfaceId(&interfaceId);
- if (err != CHIP_NO_ERROR)
- {
- ChipLogError(Inet, "TCPDisconnect: GetInterfaceId error: %" CHIP_ERROR_FORMAT, err.Format());
- return;
- }
- // if (address == PeerAddress::TCP(ipAddress, port, interfaceId))
- if (ipAddress == address.GetIPAddress() && port == address.GetPort())
- {
- char addrStr[Transport::PeerAddress::kMaxToStringSize];
- address.ToString(addrStr);
- ChipLogProgress(Inet, "Disconnecting with peer %s.", addrStr);
-
// NOTE: this leaves the socket in TIME_WAIT.
// Calling Abort() would clean it since SO_LINGER would be set to 0,
// however this seems not to be useful.
