1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QHttpSocketEngine: de-duplicate some code

Browse Source 
Change-Id: I4699e3ea0d4687a9772f6f90e6033f5582c1a346
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-07-26 18:53:40 +03:00
parent 738a5ad4f2
commit 6ecf43120f
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/network/socket/qhttpsocketengine.cpp
View File

@ -329,11 +329,7 @@ bool QHttpSocketEngine::waitForRead(QDeadlineTimer deadline, bool *timedOut)
} }
} }
// If we're not connected yet, wait until we are, or until an error waitForProtocolHandshake(deadline);
// occurs.
while (d->state != Connected && d->socket->waitForReadyRead(deadline.remainingTime())) {
// Loop while the protocol handshake is taking place.
}
// Report any error that may occur. // Report any error that may occur.
if (d->state != Connected) { if (d->state != Connected) {
@ -361,12 +357,7 @@ bool QHttpSocketEngine::waitForWrite(QDeadlineTimer deadline, bool *timedOut)
return true; return true;
} }
// If we're not connected yet, wait until we are, and until bytes have waitForProtocolHandshake(deadline);
// been received (i.e., the socket has connected, we have sent the
// greeting, and then received the response).
while (d->state != Connected && d->socket->waitForReadyRead(deadline.remainingTime())) {
// Loop while the protocol handshake is taking place.
}
// Report any error that may occur. // Report any error that may occur.
if (d->state != Connected) { if (d->state != Connected) {
@ -399,6 +390,18 @@ bool QHttpSocketEngine::waitForReadOrWrite(bool *readyToRead, bool *readyToWrite
return canWrite; return canWrite;
} }
void QHttpSocketEngine::waitForProtocolHandshake(QDeadlineTimer deadline) const
{
Q_D(const QHttpSocketEngine);
// If we're not connected yet, wait until we are (and until bytes have
// been received, i.e. the socket has connected, we have sent the
// greeting, and then received the response), or until an error occurs.
while (d->state != Connected && d->socket->waitForReadyRead(deadline.remainingTime())) {
// Loop while the protocol handshake is taking place.
}
}
bool QHttpSocketEngine::isReadNotificationEnabled() const bool QHttpSocketEngine::isReadNotificationEnabled() const
{ {
Q_D(const QHttpSocketEngine); Q_D(const QHttpSocketEngine);

2
src/network/socket/qhttpsocketengine_p.h
View File

@ -101,6 +101,8 @@ public:
QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout}, QDeadlineTimer deadline = QDeadlineTimer{DefaultTimeout},
bool *timedOut = nullptr) override; bool *timedOut = nullptr) override;
void waitForProtocolHandshake(QDeadlineTimer deadline) const;
bool isReadNotificationEnabled() const override; bool isReadNotificationEnabled() const override;
void setReadNotificationEnabled(bool enable) override; void setReadNotificationEnabled(bool enable) override;
bool isWriteNotificationEnabled() const override; bool isWriteNotificationEnabled() const override;