alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/esp_http_client_tx_buf_size' into 'master'

Browse Source 
esp_http_client: separate buffer_size config option for transmit

See merge request espressif/esp-idf!5337
This commit is contained in:
Angus Gratton 2019-07-08 15:15:14 +08:00
commit c25fe765a9
2 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
components/esp_http_client/esp_http_client.c
View File

@ -110,7 +110,8 @@ struct esp_http_client {
esp_http_state_t state; esp_http_state_t state;
http_event_handle_cb event_handler; http_event_handle_cb event_handler;
int timeout_ms; int timeout_ms;
int buffer_size; int buffer_size_rx;
int buffer_size_tx;
bool disable_auto_redirect; bool disable_auto_redirect;
esp_http_client_event_t event; esp_http_client_event_t event;
int data_written_index; int data_written_index;
@ -312,11 +313,16 @@ static esp_err_t _set_config(esp_http_client_handle_t client, const esp_http_cli
client->timeout_ms = config->timeout_ms; client->timeout_ms = config->timeout_ms;
client->max_redirection_count = config->max_redirection_count; client->max_redirection_count = config->max_redirection_count;
client->user_data = config->user_data; client->user_data = config->user_data;
client->buffer_size = config->buffer_size; client->buffer_size_rx = config->buffer_size;
client->buffer_size_tx = config->buffer_size_tx;
client->disable_auto_redirect = config->disable_auto_redirect; client->disable_auto_redirect = config->disable_auto_redirect;
if (config->buffer_size == 0) { if (config->buffer_size == 0) {
client->buffer_size = DEFAULT_HTTP_BUF_SIZE; client->buffer_size_rx = DEFAULT_HTTP_BUF_SIZE;
}
if (config->buffer_size_tx == 0) {
client->buffer_size_tx = DEFAULT_HTTP_BUF_SIZE;
} }
if (client->max_redirection_count == 0) { if (client->max_redirection_count == 0) {
@ -517,8 +523,8 @@ esp_http_client_handle_t esp_http_client_init(const esp_http_client_config_t *co
goto error; goto error;
} }
_success = ( _success = (
(client->request->buffer->data = malloc(client->buffer_size)) && (client->request->buffer->data = malloc(client->buffer_size_tx)) &&
(client->response->buffer->data = malloc(client->buffer_size)) (client->response->buffer->data = malloc(client->buffer_size_rx))
); );
if (!_success) { if (!_success) {
@ -762,7 +768,7 @@ static int esp_http_client_get_data(esp_http_client_handle_t client)
ESP_LOGD(TAG, "data_process=%d, content_length=%d", client->response->data_process, client->response->content_length); ESP_LOGD(TAG, "data_process=%d, content_length=%d", client->response->data_process, client->response->content_length);
int rlen = esp_transport_read(client->transport, res_buffer->data, client->buffer_size, client->timeout_ms); int rlen = esp_transport_read(client->transport, res_buffer->data, client->buffer_size_rx, client->timeout_ms);
if (rlen >= 0) { if (rlen >= 0) {
http_parser_execute(client->parser, client->parser_settings, res_buffer->data, rlen); http_parser_execute(client->parser, client->parser_settings, res_buffer->data, rlen);
} }
@ -797,8 +803,8 @@ int esp_http_client_read(esp_http_client_handle_t client, char *buffer, int len)
break; break;
} }
int byte_to_read = need_read; int byte_to_read = need_read;
if (byte_to_read > client->buffer_size) { if (byte_to_read > client->buffer_size_rx) {
byte_to_read = client->buffer_size; byte_to_read = client->buffer_size_rx;
} }
rlen = esp_transport_read(client->transport, res_buffer->data, byte_to_read, client->timeout_ms); rlen = esp_transport_read(client->transport, res_buffer->data, byte_to_read, client->timeout_ms);
ESP_LOGD(TAG, "need_read=%d, byte_to_read=%d, rlen=%d, ridx=%d", need_read, byte_to_read, rlen, ridx); ESP_LOGD(TAG, "need_read=%d, byte_to_read=%d, rlen=%d, ridx=%d", need_read, byte_to_read, rlen, ridx);
@ -915,7 +921,7 @@ int esp_http_client_fetch_headers(esp_http_client_handle_t client)
client->response->status_code = -1; client->response->status_code = -1;
while (client->state < HTTP_STATE_RES_COMPLETE_HEADER) { while (client->state < HTTP_STATE_RES_COMPLETE_HEADER) {
buffer->len = esp_transport_read(client->transport, buffer->data, client->buffer_size, client->timeout_ms); buffer->len = esp_transport_read(client->transport, buffer->data, client->buffer_size_rx, client->timeout_ms);
if (buffer->len <= 0) { if (buffer->len <= 0) {
return ESP_FAIL; return ESP_FAIL;
} }
@ -993,26 +999,26 @@ static int http_client_prepare_first_line(esp_http_client_handle_t client, int w
const char *method = HTTP_METHOD_MAPPING[client->connection_info.method]; const char *method = HTTP_METHOD_MAPPING[client->connection_info.method];
int first_line_len = snprintf(client->request->buffer->data, int first_line_len = snprintf(client->request->buffer->data,
client->buffer_size, "%s %s", client->buffer_size_tx, "%s %s",
method, method,
client->connection_info.path); client->connection_info.path);
if (first_line_len >= client->buffer_size) { if (first_line_len >= client->buffer_size_tx) {
ESP_LOGE(TAG, "Out of buffer"); ESP_LOGE(TAG, "Out of buffer");
return -1; return -1;
} }
if (client->connection_info.query) { if (client->connection_info.query) {
first_line_len += snprintf(client->request->buffer->data + first_line_len, first_line_len += snprintf(client->request->buffer->data + first_line_len,
client->buffer_size - first_line_len, "?%s", client->connection_info.query); client->buffer_size_tx - first_line_len, "?%s", client->connection_info.query);
if (first_line_len >= client->buffer_size) { if (first_line_len >= client->buffer_size_tx) {
ESP_LOGE(TAG, "Out of buffer"); ESP_LOGE(TAG, "Out of buffer");
return -1; return -1;
} }
} }
first_line_len += snprintf(client->request->buffer->data + first_line_len, first_line_len += snprintf(client->request->buffer->data + first_line_len,
client->buffer_size - first_line_len, " %s\r\n", DEFAULT_HTTP_PROTOCOL); client->buffer_size_tx - first_line_len, " %s\r\n", DEFAULT_HTTP_PROTOCOL);
if (first_line_len >= client->buffer_size) { if (first_line_len >= client->buffer_size_tx) {
ESP_LOGE(TAG, "Out of buffer"); ESP_LOGE(TAG, "Out of buffer");
return -1; return -1;
} }
@ -1047,7 +1053,7 @@ static esp_err_t esp_http_client_request_send(esp_http_client_handle_t client, i
} }
} }
int wlen = client->buffer_size - first_line_len; int wlen = client->buffer_size_tx - first_line_len;
while ((client->header_index = http_header_generate_string(client->request->headers, client->header_index, client->request->buffer->data + first_line_len, &wlen))) { while ((client->header_index = http_header_generate_string(client->request->headers, client->header_index, client->request->buffer->data + first_line_len, &wlen))) {
if (wlen <= 0) { if (wlen <= 0) {
break; break;
@ -1071,7 +1077,7 @@ static esp_err_t esp_http_client_request_send(esp_http_client_handle_t client, i
client->data_write_left -= wret; client->data_write_left -= wret;
client->data_written_index += wret; client->data_written_index += wret;
} }
wlen = client->buffer_size; wlen = client->buffer_size_tx;
} }
client->data_written_index = 0; client->data_written_index = 0;
@ -1251,4 +1257,4 @@ void esp_http_client_add_auth(esp_http_client_handle_t client)
client->connection_info.auth_type = HTTP_AUTH_TYPE_NONE; client->connection_info.auth_type = HTTP_AUTH_TYPE_NONE;
ESP_LOGW(TAG, "This request requires authentication, but does not provide header information for that"); ESP_LOGW(TAG, "This request requires authentication, but does not provide header information for that");
} }
} }

5
components/esp_http_client/include/esp_http_client.h
View File

@ -116,7 +116,8 @@ typedef struct {
int max_redirection_count; /*!< Max redirection number, using default value if zero*/ int max_redirection_count; /*!< Max redirection number, using default value if zero*/
http_event_handle_cb event_handler; /*!< HTTP Event Handle */ http_event_handle_cb event_handler; /*!< HTTP Event Handle */
esp_http_client_transport_t transport_type; /*!< HTTP transport type, see `esp_http_client_transport_t` */ esp_http_client_transport_t transport_type; /*!< HTTP transport type, see `esp_http_client_transport_t` */
int buffer_size; /*!< HTTP buffer size (both send and receive) */ int buffer_size; /*!< HTTP receive buffer size */
int buffer_size_tx; /*!< HTTP transmit buffer size */
void *user_data; /*!< HTTP user_data context */ void *user_data; /*!< HTTP user_data context */
bool is_async; /*!< Set asynchronous mode, only supported with HTTPS for now */ bool is_async; /*!< Set asynchronous mode, only supported with HTTPS for now */
bool use_global_ca_store; /*!< Use a global ca_store for all the connections in which this bool is set. */ bool use_global_ca_store; /*!< Use a global ca_store for all the connections in which this bool is set. */
@ -427,7 +428,7 @@ esp_http_client_transport_t esp_http_client_get_transport_type(esp_http_client_h
* *
* @param[in] client The esp_http_client handle * @param[in] client The esp_http_client handle
* *
* @return * @return
* - ESP_OK * - ESP_OK
* - ESP_FAIL * - ESP_FAIL
*/ */