Skip to content

Commit 8e68322

Browse files
committed
Reverse changes in sockets impl
1 parent 9820df8 commit 8e68322

File tree

2 files changed

+0
-6
lines changed

2 files changed

+0
-6
lines changed

src/inet/TCPEndPointImplSockets.cpp

-2
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ CHIP_ERROR TCPEndPointImplSockets::BindImpl(IPAddressType addrType, const IPAddr
127127

128128
if (res == CHIP_NO_ERROR)
129129
{
130-
VerifyOrReturnValue(mSocket >= 0, CHIP_ERROR_INCORRECT_STATE);
131130
if (bind(mSocket, &sa.any, sockaddrsize) != 0)
132131
{
133132
res = CHIP_ERROR_POSIX(errno);
@@ -249,7 +248,6 @@ CHIP_ERROR TCPEndPointImplSockets::ConnectImpl(const IPAddress & addr, uint16_t
249248
return INET_ERROR_WRONG_ADDRESS_TYPE;
250249
}
251250

252-
VerifyOrReturnError(mSocket >= 0, CHIP_ERROR_INCORRECT_STATE);
253251
int conRes = connect(mSocket, &sa.any, sockaddrsize);
254252

255253
if (conRes == -1 && errno != EINPROGRESS)

src/inet/UDPEndPointImplSockets.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ CHIP_ERROR IPv6Bind(int socket, const IPAddress & address, uint16_t port, Interf
106106
sa.sin6_scope_id = static_cast<decltype(sa.sin6_scope_id)>(interfaceId);
107107

108108
CHIP_ERROR status = CHIP_NO_ERROR;
109-
VerifyOrReturnError(socket >= 0, CHIP_ERROR_INCORRECT_STATE);
110109
if (bind(socket, reinterpret_cast<const sockaddr *>(&sa), static_cast<unsigned>(sizeof(sa))) != 0)
111110
{
112111
status = CHIP_ERROR_POSIX(errno);
@@ -140,7 +139,6 @@ CHIP_ERROR IPv4Bind(int socket, const IPAddress & address, uint16_t port)
140139
sa.sin_addr = address.ToIPv4();
141140

142141
CHIP_ERROR status = CHIP_NO_ERROR;
143-
VerifyOrReturnError(socket >= 0, CHIP_ERROR_INCORRECT_STATE);
144142
if (bind(socket, reinterpret_cast<const sockaddr *>(&sa), static_cast<unsigned>(sizeof(sa))) != 0)
145143
{
146144
status = CHIP_ERROR_POSIX(errno);
@@ -187,7 +185,6 @@ CHIP_ERROR UDPEndPointImplSockets::BindImpl(IPAddressType addressType, const IPA
187185
#if INET_CONFIG_ENABLE_IPV4
188186
else if (addressType == IPAddressType::kIPv4)
189187
{
190-
VerifyOrReturnError(mSocket >= 0, CHIP_ERROR_INVALID_ARGUMENT);
191188
ReturnErrorOnFailure(IPv4Bind(mSocket, addr, port));
192189
}
193190
#endif // INET_CONFIG_ENABLE_IPV4
@@ -413,7 +410,6 @@ CHIP_ERROR UDPEndPointImplSockets::SendMsgImpl(const IPPacketInfo * aPktInfo, Sy
413410
#endif // INET_CONFIG_UDP_SOCKET_PKTINFO
414411

415412
// Send IP packet.
416-
VerifyOrReturnError(mSocket >= 0, CHIP_ERROR_INCORRECT_STATE);
417413
const ssize_t lenSent = sendmsg(mSocket, &msgHeader, 0);
418414
if (lenSent == -1)
419415
{

0 commit comments

Comments
 (0)