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

fix no extensions build

Browse source 
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2013-02-18 10:43:18 +08:00
parent a7521debde
commit 760c3d4aa5
3 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/client-handshake.c
View file

@ -166,8 +166,8 @@ libwebsocket_client_connect(struct libwebsocket_context *context,
int ietf_version_or_minus_one)
{
struct libwebsocket *wsi;
int n;
#ifndef LWS_NO_EXTENSIONS
int n;
int m;
struct libwebsocket_extension *ext;
int handled;

7
lib/client-parser.c
View file

@ -23,11 +23,11 @@
int libwebsocket_client_rx_sm(struct libwebsocket *wsi, unsigned char c)
{
int n;
int callback_action = LWS_CALLBACK_CLIENT_RECEIVE;
int handled;
struct lws_tokens eff_buf;
#ifndef LWS_NO_EXTENSIONS
int n;
int m;
#endif
@ -274,11 +274,10 @@ spill:
lwsl_parser("client sees server close len = %d\n",
wsi->u.ws.rx_user_buffer_head);
/* parrot the close packet payload back */
n = libwebsocket_write(wsi, (unsigned char *)
libwebsocket_write(wsi, (unsigned char *)
&wsi->u.ws.rx_user_buffer[
LWS_SEND_BUFFER_PRE_PADDING],
wsi->u.ws.rx_user_buffer_head, LWS_WRITE_CLOSE);
lwsl_parser("client send close ack returned %d\n", n);
wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY;
/* close the connection */
return -1;
@ -286,7 +285,7 @@ spill:
case LWS_WS_OPCODE_07__PING:
lwsl_info("client received ping, doing pong\n");
/* parrot the ping packet payload back as a pong*/
n = libwebsocket_write(wsi, (unsigned char *)
libwebsocket_write(wsi, (unsigned char *)
&wsi->u.ws.rx_user_buffer[
LWS_SEND_BUFFER_PRE_PADDING],
wsi->u.ws.rx_user_buffer_head,

2
lib/libwebsockets.c
View file

@ -331,9 +331,7 @@ libwebsocket_close_and_free_session(struct libwebsocket_context *context,
/* else, the send failed and we should just hang up */
}
#ifndef LWS_NO_EXTENSIONS
just_kill_connection:
#endif
lwsl_debug("close: just_kill_connection\n");