stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

workaround-32bit-size_t.patch

Browse source 
Signed-off-by: Andy Green <andy@warmcat.com>
This commit is contained in:
Andy Green 2011-01-27 06:45:53 +00:00
parent b6e6ebeece
commit f55830dba5
2 changed files with 21 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/parsers.c
View file

@ -442,22 +442,32 @@ static int libwebsocket_rx_sm(struct libwebsocket *wsi, unsigned char c)
/* kill the connection */
return -1;
}
#if defined __LP64__
wsi->rx_packet_length = ((size_t)c) << 56;
#else
wsi->rx_packet_length = 0;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7;
break;
case LWS_RXPS_04_FRAME_HDR_LEN64_7:
#if defined __LP64__
wsi->rx_packet_length |= ((size_t)xor_mask(wsi, c)) << 48;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6;
break;
case LWS_RXPS_04_FRAME_HDR_LEN64_6:
#if defined __LP64__
wsi->rx_packet_length |= ((size_t)xor_mask(wsi, c)) << 40;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5;
break;
case LWS_RXPS_04_FRAME_HDR_LEN64_5:
#if defined __LP64__
wsi->rx_packet_length |= ((size_t)xor_mask(wsi, c)) << 32;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4;
break;
@ -742,22 +752,32 @@ int libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c)
/* kill the connection */
return -1;
}
#if defined __LP64__
wsi->rx_packet_length = ((size_t)c) << 56;
#else
wsi->rx_packet_length =0;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_7;
break;
case LWS_RXPS_04_FRAME_HDR_LEN64_7:
#if defined __LP64__
wsi->rx_packet_length |= ((size_t)c) << 48;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_6;
break;
case LWS_RXPS_04_FRAME_HDR_LEN64_6:
#if defined __LP64__
wsi->rx_packet_length |= ((size_t)c) << 40;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_5;
break;
case LWS_RXPS_04_FRAME_HDR_LEN64_5:
#if defined __LP64__
wsi->rx_packet_length |= ((size_t)c) << 32;
#endif
wsi->lws_rx_parse_state = LWS_RXPS_04_FRAME_HDR_LEN64_4;
break;

2
libwebsockets.spec
View file

@ -1,6 +1,6 @@
Name: libwebsockets
Version: 0.1
Release: 41.gmaster_91ef816b%{?dist}
Release: 43.gmaster_b6e6ebee%{?dist}
Summary: Websocket Server Library
Group: System