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/websocket-client-errorhandling' into 'master'

Browse Source 
[ws_transport] -  Added `esp_transport_ws_get_upgrade_request_status` API to get http status code from server

See merge request espressif/esp-idf!20480
This commit is contained in:
Suren Gabrielyan 2023-02-17 16:58:57 +08:00
commit 496843b277
2 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/tcp_transport/include/esp_transport_ws.h
View File

@ -149,6 +149,19 @@ int esp_transport_ws_send_raw(esp_transport_handle_t t, ws_transport_opcodes_t o
*/ */
bool esp_transport_ws_get_fin_flag(esp_transport_handle_t t); bool esp_transport_ws_get_fin_flag(esp_transport_handle_t t);
/**
* @brief Returns the HTTP status code of the websocket handshake
*
* This API should be called after the connection atempt otherwise its result is meaningless
*
* @param t websocket transport handle
*
* @return
* -Response status code
* -1 on failure
*/
int esp_transport_ws_get_upgrade_request_status(esp_transport_handle_t t);
/** /**
* @brief Returns websocket op-code for last received data * @brief Returns websocket op-code for last received data
* *

33
components/tcp_transport/transport_ws.c
View File

@ -56,6 +56,7 @@ typedef struct {
char *user_agent; char *user_agent;
char *headers; char *headers;
char *auth; char *auth;
int http_status_code;
bool propagate_control_frames; bool propagate_control_frames;
ws_transport_frame_state_t frame_state; ws_transport_frame_state_t frame_state;
esp_transport_handle_t parent; esp_transport_handle_t parent;
@ -124,6 +125,26 @@ static char *trimwhitespace(const char *str)
return (char *)str; return (char *)str;
} }
static int get_http_status_code(const char *buffer)
{
const char http[] = "HTTP/";
const char *found = strcasestr(buffer, http);
char status_code[4];
if (found) {
found += sizeof(http)/sizeof(http[0]) - 1;
found = strchr(found, ' ');
if (found) {
found++;
strncpy(status_code, found, 4);
status_code[3] = '\0';
int code = atoi(status_code);
ESP_LOGD(TAG, "HTTP status code is %d", code);
return code == 0 ? -1 : code;
}
}
return -1;
}
static char *get_http_header(const char *buffer, const char *key) static char *get_http_header(const char *buffer, const char *key)
{ {
char *found = strcasestr(buffer, key); char *found = strcasestr(buffer, key);
@ -238,6 +259,12 @@ static int ws_connect(esp_transport_handle_t t, const char *host, int port, int
ESP_LOGD(TAG, "Read header chunk %d, current header size: %d", len, header_len); ESP_LOGD(TAG, "Read header chunk %d, current header size: %d", len, header_len);
} while (NULL == strstr(ws->buffer, "\r\n\r\n") && header_len < WS_BUFFER_SIZE); } while (NULL == strstr(ws->buffer, "\r\n\r\n") && header_len < WS_BUFFER_SIZE);
ws->http_status_code = get_http_status_code(ws->buffer);
if (ws->http_status_code == -1) {
ESP_LOGE(TAG, "HTTP upgrade failed");
return -1;
}
char *server_key = get_http_header(ws->buffer, "Sec-WebSocket-Accept:"); char *server_key = get_http_header(ws->buffer, "Sec-WebSocket-Accept:");
if (server_key == NULL) { if (server_key == NULL) {
ESP_LOGE(TAG, "Sec-WebSocket-Accept not found"); ESP_LOGE(TAG, "Sec-WebSocket-Accept not found");
@ -781,6 +808,12 @@ bool esp_transport_ws_get_fin_flag(esp_transport_handle_t t)
return ws->frame_state.fin; return ws->frame_state.fin;
} }
int esp_transport_ws_get_upgrade_request_status(esp_transport_handle_t t)
{
transport_ws_t *ws = esp_transport_get_context_data(t);
return ws->http_status_code;
}
ws_transport_opcodes_t esp_transport_ws_get_read_opcode(esp_transport_handle_t t) ws_transport_opcodes_t esp_transport_ws_get_read_opcode(esp_transport_handle_t t)
{ {
transport_ws_t *ws = esp_transport_get_context_data(t); transport_ws_t *ws = esp_transport_get_context_data(t);