arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00
Code

Merge pull request #1530 from Links2004/master

Browse Source 
improve http client
This commit is contained in:
Ivan Grokhotkov 2016-01-31 22:38:41 +03:00
commit 6c8ca2d363
3 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cores/esp8266/WMath.cpp
View File

@ -26,10 +26,11 @@
extern "C" { extern "C" {
#include <stdlib.h> #include <stdlib.h>
} }
#include "esp8266_peri.h"
void randomSeed(unsigned long seed) { void randomSeed(unsigned long seed) {
if(seed != 0) { if(seed != 0) {
srand(seed); srand((seed ^ RANDOM_REG32));
} }
} }
@ -37,7 +38,7 @@ long random(long howbig) {
if(howbig == 0) { if(howbig == 0) {
return 0; return 0;
} }
return rand() % howbig; return (rand() ^ RANDOM_REG32) % howbig;
} }
long random(long howsmall, long howbig) { long random(long howsmall, long howbig) {

29
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.cpp
View File

@ -264,7 +264,7 @@ void HTTPClient::setAuthorization(const char * auth) {
/** /**
* set the timeout for the TCP connection * set the timeout for the TCP connection
* @param timeout unsigned int * @param timeout unsigned int
*/ */
void HTTPClient::setTimeout(uint16_t timeout) { void HTTPClient::setTimeout(uint16_t timeout) {
_tcpTimeout = timeout; _tcpTimeout = timeout;
@ -273,14 +273,12 @@ void HTTPClient::setTimeout(uint16_t timeout) {
} }
} }
/** /**
* use HTTP1.0 * use HTTP1.0
* @param timeout * @param timeout
*/ */
void HTTPClient::useHTTP10(bool useHTTP10) { void HTTPClient::useHTTP10(bool useHTTP10) {
_useHTTP10 = useHTTP10; _useHTTP10 = useHTTP10;
} }
/** /**
@ -305,6 +303,16 @@ int HTTPClient::POST(String payload) {
return POST((uint8_t *) payload.c_str(), payload.length()); return POST((uint8_t *) payload.c_str(), payload.length());
} }
/**
* sendRequest
* @param type const char * "GET", "POST", ....
* @param payload String data for the message body
* @return
*/
int HTTPClient::sendRequest(const char * type, String payload) {
return sendRequest(type, (uint8_t *) payload.c_str(), payload.length());
}
/** /**
* sendRequest * sendRequest
* @param type const char * "GET", "POST", .... * @param type const char * "GET", "POST", ....
@ -382,7 +390,6 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size) {
// create buffer for read // create buffer for read
uint8_t * buff = (uint8_t *) malloc(buff_size); uint8_t * buff = (uint8_t *) malloc(buff_size);
if(buff) { if(buff) {
// read all data from stream and send it to server // read all data from stream and send it to server
while(connected() && (stream->available() > -1) && (len > 0 || len == -1)) { while(connected() && (stream->available() > -1) && (len > 0 || len == -1)) {
@ -461,8 +468,7 @@ int HTTPClient::sendRequest(const char * type, Stream * stream, size_t size) {
free(buff); free(buff);
if(size && (int) size != bytesWritten) { if(size && (int) size != bytesWritten) {
DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %d mismatch!.\n", bytesWritten, size); DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload bytesWritten %d and size %d mismatch!.\n", bytesWritten, size); DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] ERROR SEND PAYLOAD FAILED!");
DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] ERROR SEND PAYLOAD FAILED!");
return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED); return returnError(HTTPC_ERROR_SEND_PAYLOAD_FAILED);
} else { } else {
DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload written: %d\n", bytesWritten); DEBUG_HTTPCLIENT("[HTTP-Client][sendRequest] Stream payload written: %d\n", bytesWritten);
@ -819,10 +825,12 @@ int HTTPClient::handleHeaderResponse() {
if(!connected()) { if(!connected()) {
return HTTPC_ERROR_NOT_CONNECTED; return HTTPC_ERROR_NOT_CONNECTED;
} }
String transferEncoding; String transferEncoding;
_returnCode = -1; _returnCode = -1;
_size = -1; _size = -1;
_transferEncoding = HTTPC_TE_IDENTITY; _transferEncoding = HTTPC_TE_IDENTITY;
unsigned long lastDataTime = millis();
while(connected()) { while(connected()) {
size_t len = _tcp->available(); size_t len = _tcp->available();
@ -830,6 +838,8 @@ int HTTPClient::handleHeaderResponse() {
String headerLine = _tcp->readStringUntil('\n'); String headerLine = _tcp->readStringUntil('\n');
headerLine.trim(); // remove \r headerLine.trim(); // remove \r
lastDataTime = millis();
DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] RX: '%s'\n", headerLine.c_str()); DEBUG_HTTPCLIENT("[HTTP-Client][handleHeaderResponse] RX: '%s'\n", headerLine.c_str());
if(headerLine.startsWith("HTTP/1.")) { if(headerLine.startsWith("HTTP/1.")) {
@ -885,6 +895,9 @@ int HTTPClient::handleHeaderResponse() {
} }
} else { } else {
if((millis() - lastDataTime) > _tcpTimeout) {
return HTTPC_ERROR_READ_TIMEOUT;
}
delay(0); delay(0);
} }
} }
@ -892,8 +905,6 @@ int HTTPClient::handleHeaderResponse() {
return HTTPC_ERROR_CONNECTION_LOST; return HTTPC_ERROR_CONNECTION_LOST;
} }
/** /**
* write one Data Block to Stream * write one Data Block to Stream
* @param stream Stream * * @param stream Stream *

1
libraries/ESP8266HTTPClient/src/ESP8266HTTPClient.h
View File

@ -147,6 +147,7 @@ class HTTPClient {
int GET(); int GET();
int POST(uint8_t * payload, size_t size); int POST(uint8_t * payload, size_t size);
int POST(String payload); int POST(String payload);
int sendRequest(const char * type, String payload);
int sendRequest(const char * type, uint8_t * payload = NULL, size_t size = 0); int sendRequest(const char * type, uint8_t * payload = NULL, size_t size = 0);
int sendRequest(const char * type, Stream * stream, size_t size = 0); int sendRequest(const char * type, Stream * stream, size_t size = 0);