Skip to content

Commit 7fc7960

Browse files
authored
Remove erroneous assertion on operation state during ntcr::StreamSocket::privateSendRaw(ntsa::Data)
1 parent 8697f57 commit 7fc7960

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

groups/ntc/ntcp/ntcp_streamsocket.cpp

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ void StreamSocket::processUpgradeTimer(
453453
NTCI_LOG_CONTEXT_GUARD_REMOTE_ENDPOINT(d_systemRemoteEndpoint);
454454

455455
if (event.type() == ntca::TimerEventType::e_DEADLINE) {
456-
// MRM: Log upgrade timeout
456+
// TODO: Log upgrade timeout
457457

458458
if (d_upgradeInProgress) {
459459
this->privateFailUpgrade(self,
@@ -3376,11 +3376,6 @@ void StreamSocket::processRemoteEndpointResolution(
33763376

33773377
ntsa::Error error;
33783378

3379-
// MRM: Downgrade to TRACE.
3380-
NTCI_LOG_STREAM_INFO
3381-
<< "Stream socket processing remote endpoint resolution "
3382-
<< getEndpointEvent << NTCI_LOG_STREAM_END;
3383-
33843379
if (!d_connectInProgress) {
33853380
NTCI_LOG_STREAM_TRACE
33863381
<< "Stream socket socket ignored remote endpoint resolution "
@@ -3573,7 +3568,7 @@ ntsa::Error StreamSocket::privateUpgrade(
35733568
NTCCFG_WARNING_PROMOTE(bsl::size_t,
35743569
d_receiveQueue.data()->length()));
35753570

3576-
// MRM: Announce watermarks if neccessary?
3571+
// TODO: Announce watermarks if neccessary?
35773572
}
35783573

35793574
// Pop any outgoing cipher text generated as a result of initiating the
@@ -4009,7 +4004,7 @@ void StreamSocket::privateClose(const bsl::shared_ptr<StreamSocket>& self,
40094004
true);
40104005
}
40114006
else {
4012-
// MRM: Announce discarded.
4007+
// TODO: Announce discarded.
40134008

40144009
this->privateShutdown(self,
40154010
ntsa::ShutdownType::e_BOTH,

groups/ntc/ntcr/ntcr_streamsocket.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3638,9 +3638,6 @@ ntsa::Error StreamSocket::privateSendRaw(
36383638
}
36393639
}
36403640

3641-
BSLS_ASSERT((!error && context.bytesSent() > 0) ||
3642-
(error == ntsa::Error::e_WOULD_BLOCK));
3643-
36443641
if (context.bytesSent() == data.size()) {
36453642
if (context.zeroCopy()) {
36463643
ntcq::ZeroCopyCounter zeroCopyCounter =
@@ -4268,11 +4265,6 @@ void StreamSocket::processRemoteEndpointResolution(
42684265

42694266
ntsa::Error error;
42704267

4271-
// MRM: Downgrade to TRACE.
4272-
NTCI_LOG_STREAM_INFO
4273-
<< "Stream socket processing remote endpoint resolution "
4274-
<< getEndpointEvent << NTCI_LOG_STREAM_END;
4275-
42764268
if (!d_connectInProgress) {
42774269
NTCI_LOG_STREAM_TRACE
42784270
<< "Stream socket ignored remote endpoint resolution "

0 commit comments

Comments
 (0)