mirror of
https://github.com/me-no-dev/ESPAsyncWebServer.git
synced 2025-09-30 16:20:55 +02:00
code cleanup
This commit is contained in:
@@ -544,7 +544,7 @@ void AsyncWebSocketClient::_onData(void* pbuf, size_t plen) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (datalen > 0)
|
if (datalen > 0)
|
||||||
_server->_handleEvent(this, WS_EVT_DATA, (void*)&_pinfo, (uint8_t*)data, datalen);
|
_server->_handleEvent(this, WS_EVT_DATA, (void*)&_pinfo, data, datalen);
|
||||||
|
|
||||||
_pinfo.index += datalen;
|
_pinfo.index += datalen;
|
||||||
} else if ((datalen + _pinfo.index) == _pinfo.len) {
|
} else if ((datalen + _pinfo.index) == _pinfo.len) {
|
||||||
@@ -572,7 +572,7 @@ void AsyncWebSocketClient::_onData(void* pbuf, size_t plen) {
|
|||||||
} else if (_pinfo.opcode == WS_PONG) {
|
} else if (_pinfo.opcode == WS_PONG) {
|
||||||
if (datalen != AWSC_PING_PAYLOAD_LEN || memcmp(AWSC_PING_PAYLOAD, data, AWSC_PING_PAYLOAD_LEN) != 0)
|
if (datalen != AWSC_PING_PAYLOAD_LEN || memcmp(AWSC_PING_PAYLOAD, data, AWSC_PING_PAYLOAD_LEN) != 0)
|
||||||
_server->_handleEvent(this, WS_EVT_PONG, NULL, data, datalen);
|
_server->_handleEvent(this, WS_EVT_PONG, NULL, data, datalen);
|
||||||
} else if (_pinfo.opcode < 8) { // continuation or text/binary frame
|
} else if (_pinfo.opcode < WS_DISCONNECT) { // continuation or text/binary frame
|
||||||
_server->_handleEvent(this, WS_EVT_DATA, (void*)&_pinfo, data, datalen);
|
_server->_handleEvent(this, WS_EVT_DATA, (void*)&_pinfo, data, datalen);
|
||||||
if (_pinfo.final)
|
if (_pinfo.final)
|
||||||
_pinfo.num = 0;
|
_pinfo.num = 0;
|
||||||
@@ -586,7 +586,7 @@ void AsyncWebSocketClient::_onData(void* pbuf, size_t plen) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// restore byte as _handleEvent may have added a null terminator i.e., data[len] = 0;
|
// restore byte as _handleEvent may have added a null terminator i.e., data[len] = 0;
|
||||||
if (datalen > 0)
|
if (datalen)
|
||||||
data[datalen] = datalast;
|
data[datalen] = datalast;
|
||||||
|
|
||||||
data += datalen;
|
data += datalen;
|
||||||
|
Reference in New Issue
Block a user