Skip to content

Add sent/return value check to client.print() #1979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TD-er merged 4 commits into from
Nov 5, 2018
Merged

Add sent/return value check to client.print() #1979

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
383206b
Add sent/return value check to client.print()
clumsy-stefan Oct 30, 2018
11e4add
Merge remote-tracking branch 'origin/mega' into check_client_send
clumsy-stefan Oct 31, 2018
4ae5e2c
Merge remote-tracking branch 'origin/mega' into check_client_send
clumsy-stefan Nov 1, 2018
e28f466
Add comment why we check for %256
clumsy-stefan Nov 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 29 additions & 1 deletion src/_CPlugin_Helper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,7 +629,35 @@ bool client_available(WiFiClient& client) {
bool send_via_http(const String& logIdentifier, WiFiClient& client, const String& postStr, bool must_check_reply) {
bool success = !must_check_reply;
// This will send the request to the server
client.print(postStr);
byte written = client.print(postStr);
// as of 2018/11/01 the print function only returns one byte (upd to 256 chars sent). However if the string sent can be longer than this therefore we calculate modulo 256.
// see discussion here https://github.com/letscontrolit/ESPEasy/pull/1979
// and implementation here https://github.com/esp8266/Arduino/blob/561426c0c77e9d05708f2c4bf2a956d3552a3706/libraries/ESP8266WiFi/src/include/ClientContext.h#L437-L467
// this needs to be adjusted if the WiFiClient.print method changes.
if (written != (postStr.length()%256)) {
if (loglevelActiveFor(LOG_LEVEL_ERROR)) {
String log = F("HTTP : ");
log += logIdentifier;
log += F(" Error: could not write to client (");
log += written;
log += "/";
log += postStr.length();
log += ")";
addLog(LOG_LEVEL_ERROR, log);
}
success = false;
} else {
if (loglevelActiveFor(LOG_LEVEL_DEBUG)) {
String log = F("HTTP : ");
log += logIdentifier;
log += F(" written to client (");
log += written;
log += "/";
log += postStr.length();
log += ")";
addLog(LOG_LEVEL_DEBUG, log);
}
}

if (must_check_reply) {
unsigned long timer = millis() + 200;
Expand Down