Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/httpd_accept_conn_v3.3' into 'release/v3.3'

Browse source 
esp_http_server : Only accept new connections if server has capacity to handle more (backport v3.3)

See merge request idf/esp-idf!4720
This commit is contained in:
Angus Gratton 2019-04-10 13:47:09 +08:00
parent 21fb5085bd 8bd09fb0a5
commit 7bbbf2d4b3
2 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
components/esp_http_server/src/httpd_main.c
View file

@ -156,7 +156,12 @@ static esp_err_t httpd_server(struct httpd_data *hd)
{
fd_set read_set;
FD_ZERO(&read_set);
FD_SET(hd->listen_fd, &read_set);
if (hd->config.lru_purge_enable || httpd_is_sess_available(hd)) {
/* Only listen for new connections if server has capacity to
* handle more (or when LRU purge is enabled, in which case
* older connections will be closed) */
FD_SET(hd->listen_fd, &read_set);
}
FD_SET(hd->ctrl_fd, &read_set);
int tmp_max_fd;
@ -348,6 +353,23 @@ esp_err_t httpd_start(httpd_handle_t *handle, const httpd_config_t *config)
return ESP_ERR_INVALID_ARG;
}
/* Sanity check about whether LWIP is configured for providing the
* maximum number of open sockets sufficient for the server. Though,
* this check doesn't guarantee that many sockets will actually be
* available at runtime as other processes may use up some sockets.
* Note that server also uses 3 sockets for its internal use :
* 1) listening for new TCP connections
* 2) for sending control messages over UDP
* 3) for receiving control messages over UDP
* So the total number of required sockets is max_open_sockets + 3
*/
if (CONFIG_LWIP_MAX_SOCKETS < config->max_open_sockets + 3) {
ESP_LOGE(TAG, "Configuration option max_open_sockets is too large (max allowed %d)\n\t"
"Either decrease this or configure LWIP_MAX_SOCKETS to a larger value",
CONFIG_LWIP_MAX_SOCKETS - 3);
return ESP_ERR_INVALID_ARG;
}
struct httpd_data *hd = httpd_create(config);
if (hd == NULL) {
/* Failed to allocate memory */

19
components/esp_http_server/test/test_http_server.c
View file

@ -232,3 +232,22 @@ TEST_CASE("URI Wildcard Matcher Tests", "[HTTP SERVER]")
ut++;
}
}
TEST_CASE("Max Allowed Sockets Test", "[HTTP SERVER]")
{
test_case_uses_tcpip();
httpd_handle_t hd;
httpd_config_t config = HTTPD_DEFAULT_CONFIG();
/* Starting server with default config options should pass */
TEST_ASSERT(httpd_start(&hd, &config) == ESP_OK);
TEST_ASSERT(httpd_stop(hd) == ESP_OK);
/* Default value of max_open_sockets is already set as per
* maximum limit imposed by LWIP. Increasing this beyond the
* maximum allowed value, without increasing LWIP limit,
* should fail */
config.max_open_sockets += 1;
TEST_ASSERT(httpd_start(&hd, &config) != ESP_OK);
}