Skip to content

Fixes WebSocket frame length too large error #60

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

Merged
merged 2 commits into from
Jun 1, 2015
Merged

Fixes WebSocket frame length too large error #60

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6042ad
fix websocket packets encapsulation for packets larger than 64kb
artygus Jun 12, 2014
56b6a43
htobe64 fallback
artygus Mar 1, 2015
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
24 changes: 21 additions & 3 deletions src/websocket.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,15 @@

#include "validate_utf8.h"

#ifndef htobe64
#ifdef __APPLE__
#include <libkern/OSByteOrder.h>
#define htobe64(h) OSSwapHostToBigInt64(h)
#elif _MSC_VER
#define htobe64(h) _byteswap_uint64(h)
#endif
#endif

typedef int8_t ws_state;
#define STATE_ERROR 1
#define STATE_READ_HTTP_REQUEST 2
Expand Down Expand Up @@ -304,9 +313,18 @@ ws_status ws_send_frame(ws_t self,
*out_tail++ = ((is_masking ? 0x80 : 0) | (!payload_n ? payload_length :
payload_n == 2 ? 126: 127));

int8_t j;
for (j = payload_n - 1; j >= 0; j--) {
*out_tail++ = (unsigned char)((payload_length >> (j<<3)) & 0xFF);
if (payload_n != 0) {
if (payload_n == 2) {
uint16_t sz16 = htons(payload_length);
memcpy(out_tail, &sz16, payload_n);
} else {
uint64_t sz64 = htobe64(payload_length);
memcpy(out_tail, &sz64, payload_n);
}

int i;
for (i = 0; i < payload_n; i++)
*out_tail++;
}

if (is_masking) {
Expand Down