arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-13 13:01:55 +03:00
Code Activity

WifiClient::write refactoring (second attempt) (#2177)

Browse Source 
* WiFiClient: use DataSource for writes

* ESP8266WebServer: delegate writing to WiFiClient

* ESP8266WebServer: set write timeout before sending content
This commit is contained in:
Ivan Grokhotkov
2016-06-23 17:47:18 +08:00
committed by GitHub
parent 5e3df08273
commit 8db4dcea42
7 changed files with 565 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/ESP8266WiFi/src/WiFiClient.cpp
View File

@ -172,8 +172,21 @@ size_t WiFiClient::write(const uint8_t *buf, size_t size)
{
return 0;
}
return _client->write(buf, size);
}
return _client->write(reinterpret_cast<const char*>(buf), size);
size_t WiFiClient::write(Stream& stream, size_t unused)
{
return WiFiClient::write(stream);
}
size_t WiFiClient::write(Stream& stream)
{
if (!_client || !stream.available())
{
return 0;
}
return _client->write(stream);
}
size_t WiFiClient::write_P(PGM_P buf, size_t size)
@ -182,25 +195,7 @@ size_t WiFiClient::write_P(PGM_P buf, size_t size)
{
return 0;
}
char chunkUnit[WIFICLIENT_MAX_PACKET_SIZE + 1];
chunkUnit[WIFICLIENT_MAX_PACKET_SIZE] = '\0';
size_t remaining_size = size;
while (buf != NULL && remaining_size > 0) {
size_t chunkUnitLen = WIFICLIENT_MAX_PACKET_SIZE;
if (remaining_size < WIFICLIENT_MAX_PACKET_SIZE) chunkUnitLen = remaining_size;
// due to the memcpy signature, lots of casts are needed
memcpy_P((void*)chunkUnit, (PGM_VOID_P)buf, chunkUnitLen);
buf += chunkUnitLen;
remaining_size -= chunkUnitLen;
// write is so overloaded, had to use the cast to get it pick the right one
_client->write((const char*)chunkUnit, chunkUnitLen);
}
return size;
return _client->write_P(buf, size);
}
int WiFiClient::available()