Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-08 12:37:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

fully remove ctrl_fd (was uninitialized in server loop) - release

Browse Source
This commit is contained in:
Philippe G
2021-11-18 12:22:48 -08:00
parent 5d09d4f853
commit 635d382d71
1 changed files with 3 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
components/wifi-manager/_esp_httpd_main.c
View File

@@ -80,35 +80,6 @@ static esp_err_t _httpd_server_init(struct httpd_data *hd)
return ESP_OK; return ESP_OK;
} }
static void _httpd_process_ctrl_msg(struct httpd_data *hd)
{
struct httpd_ctrl_data msg;
int ret = recv(hd->ctrl_fd, &msg, sizeof(msg), 0);
if (ret <= 0) {
ESP_LOGW(TAG, LOG_FMT("error in recv (%d)"), errno);
return;
}
if (ret != sizeof(msg)) {
ESP_LOGW(TAG, LOG_FMT("incomplete msg"));
return;
}
switch (msg.hc_msg) {
case HTTPD_CTRL_WORK:
if (msg.hc_work) {
ESP_LOGD(TAG, LOG_FMT("work"));
(*msg.hc_work)(msg.hc_work_arg);
}
break;
case HTTPD_CTRL_SHUTDOWN:
ESP_LOGD(TAG, LOG_FMT("shutdown"));
hd->hd_td.status = THREAD_STOPPING;
break;
default:
break;
}
}
static esp_err_t _httpd_accept_conn(struct httpd_data *hd, int listen_fd) static esp_err_t _httpd_accept_conn(struct httpd_data *hd, int listen_fd)
{ {
/* If no space is available for new session, close the least recently used one */ /* If no space is available for new session, close the least recently used one */
@@ -164,13 +135,10 @@ static esp_err_t _httpd_server(struct httpd_data *hd)
* older connections will be closed) */ * older connections will be closed) */
FD_SET(hd->listen_fd, &read_set); FD_SET(hd->listen_fd, &read_set);
} }
FD_SET(hd->ctrl_fd, &read_set);
int tmp_max_fd; int maxfd;
httpd_sess_set_descriptors(hd, &read_set, &tmp_max_fd); httpd_sess_set_descriptors(hd, &read_set, &maxfd);
int maxfd = MAX(hd->listen_fd, tmp_max_fd); maxfd = MAX(hd->listen_fd, maxfd);
tmp_max_fd = maxfd;
maxfd = MAX(hd->ctrl_fd, tmp_max_fd);
ESP_LOGD(TAG, LOG_FMT("doing select maxfd+1 = %d"), maxfd + 1); ESP_LOGD(TAG, LOG_FMT("doing select maxfd+1 = %d"), maxfd + 1);
int active_cnt = select(maxfd + 1, &read_set, NULL, NULL, NULL); int active_cnt = select(maxfd + 1, &read_set, NULL, NULL, NULL);
@@ -180,8 +148,6 @@ static esp_err_t _httpd_server(struct httpd_data *hd)
return ESP_OK; return ESP_OK;
} }
/* Case0: Do we have a control message? */
/* Case1: Do we have any activity on the current data /* Case1: Do we have any activity on the current data
* sessions? */ * sessions? */
int fd = -1; int fd = -1;