Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix client ws #605

Merged
merged 2 commits into from
Jun 22, 2024
Merged

fix client ws #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1a3c48
fix client ws
qicosmos Jun 22, 2024
c9a3ab6
update
qicosmos Jun 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 20 additions & 18 deletions include/cinatra/coro_http_client.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,7 +1835,6 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
resp_data data{};

head_buf_.consume(head_buf_.size());
size_t header_size = 2;
std::shared_ptr sock = socket_;
asio::streambuf &read_buf = sock->head_buf_;
bool has_init_ssl = false;
Expand All @@ -1844,8 +1843,8 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
#endif
websocket ws{};
while (true) {
if (auto [ec, _] =
co_await async_read_ws(sock, read_buf, header_size, has_init_ssl);
if (auto [ec, _] = co_await async_read_ws(
sock, read_buf, ws.left_header_len(), has_init_ssl);
ec) {
data.net_err = ec;
data.status = 404;
Expand All @@ -1859,27 +1858,31 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
}

const char *data_ptr = asio::buffer_cast<const char *>(read_buf.data());
auto ret = ws.parse_header(data_ptr, header_size, false);
if (ret == -2) {
header_size += ws.left_header_len();
auto ret = ws.parse_header(data_ptr, read_buf.size(), false);
if (ret == ws_header_status::incomplete) {
continue;
}
else if (ret == ws_header_status::error) {
data.net_err = std::make_error_code(std::errc::protocol_error);
data.status = 404;
close_socket(*sock);
co_return data;
}

frame_header *header = (frame_header *)data_ptr;
bool is_close_frame = header->opcode == opcode::close;

read_buf.consume(header_size);
read_buf.consume(read_buf.size());

size_t payload_len = ws.payload_length();
if (payload_len > read_buf.size()) {
size_t size_to_read = payload_len - read_buf.size();
if (auto [ec, size] = co_await async_read_ws(
sock, read_buf, size_to_read, has_init_ssl);
ec) {
data.net_err = ec;
data.status = 404;
close_socket(*sock);
co_return data;
}

if (auto [ec, size] =
co_await async_read_ws(sock, read_buf, payload_len, has_init_ssl);
ec) {
data.net_err = ec;
data.status = 404;
close_socket(*sock);
co_return data;
}

data_ptr = asio::buffer_cast<const char *>(read_buf.data());
Expand Down Expand Up @@ -1913,7 +1916,6 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
}
#endif
read_buf.consume(read_buf.size());
header_size = 2;

if (is_close_frame) {
std::string reason = "close";
Expand Down
2 changes: 1 addition & 1 deletion include/cinatra/websocket.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ class websocket {

size_t payload_length_ = 0;

size_t left_header_len_ = 0;
size_t left_header_len_ = 2;
uint8_t mask_key_[4] = {};
unsigned char msg_opcode_ = 0;
unsigned char msg_fin_ = 0;
Expand Down
Loading