Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-09 00:00:04 +01:00
Code Issues Releases Wiki Activity

check errors on shutdown close

Browse source 
Also make sure CLOSE doesn't go through extension munging

Reduce wait for close ack to 1s

Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2013-01-17 14:46:43 +08:00
parent dfb2304168
commit 0303db482e
3 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/libwebsockets.c
View file

@ -262,8 +262,10 @@ libwebsocket_close_and_free_session(struct libwebsocket_context *context,
if (eff_buf.token_len)
if (lws_issue_raw(wsi, (unsigned char *)eff_buf.token,
eff_buf.token_len))
eff_buf.token_len)) {
lwsl_debug("close: sending final extension spill had problems\n");
goto just_kill_connection;
}
}
/*
@ -293,16 +295,18 @@ libwebsocket_close_and_free_session(struct libwebsocket_context *context,
wsi->state = WSI_STATE_AWAITING_CLOSE_ACK;
/* and we should wait for a reply for a bit */
/* and we should wait for a reply for a bit out of politeness */
libwebsocket_set_timeout(wsi,
PENDING_TIMEOUT_CLOSE_ACK, AWAITING_TIMEOUT);
PENDING_TIMEOUT_CLOSE_ACK, 1);
lwsl_debug("sent close indication, awaiting ack\n");
return;
}
lwsl_info("close: sending the close packet failed, hanging up\n");
/* else, the send failed and we should just hang up */
}
@ -377,10 +381,15 @@ just_kill_connection:
SSL_free(wsi->ssl);
} else {
#endif
shutdown(wsi->sock, SHUT_RDWR);
if (wsi->sock) {
n = shutdown(wsi->sock, SHUT_RDWR);
if (n)
lwsl_debug("closing: shutdown returned %d\n", errno);
if (wsi->sock)
compatible_close(wsi->sock);
n = compatible_close(wsi->sock);
if (n)
lwsl_debug("closing: close returned %d\n", errno);
}
#ifdef LWS_OPENSSL_SUPPORT
}
#endif

27
lib/output.c
View file

@ -147,7 +147,7 @@ int lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len)
#if 0
lwsl_debug(" TX: ");
lws_stderr_hexdump(buf, len);
lws_hexdump(buf, len);
#endif
#ifdef LWS_OPENSSL_SUPPORT
@ -160,8 +160,8 @@ int lws_issue_raw(struct libwebsocket *wsi, unsigned char *buf, size_t len)
} else {
#endif
n = send(wsi->sock, buf, len, MSG_NOSIGNAL);
if (n < 0) {
lwsl_debug("ERROR writing to socket\n");
if (n != len) {
lwsl_debug("ERROR writing len %d to socket %d\n", len, n);
return -1;
}
#ifdef LWS_OPENSSL_SUPPORT
@ -312,7 +312,12 @@ int libwebsocket_write(struct libwebsocket *wsi, unsigned char *buf,
eff_buf.token = (char *)buf;
eff_buf.token_len = len;
if (protocol != LWS_WRITE_PING && protocol != LWS_WRITE_PONG) {
switch (protocol) {
case LWS_WRITE_PING:
case LWS_WRITE_PONG:
case LWS_WRITE_CLOSE:
break;
default:
for (n = 0; n < wsi->count_active_extensions; n++) {
m = wsi->active_extensions[n]->callback(
@ -583,18 +588,22 @@ send_raw:
#if 0
lwsl_debug("send %ld: ", len + post);
for (n = -pre; n < ((int)len + post); n++)
lwsl_debug("%02X ", buf[n]);
lwsl_debug("\n");
lwsl_hexdump(&buf[-pre], len + post);
#endif
if (protocol == LWS_WRITE_HTTP || protocol == LWS_WRITE_PONG || protocol == LWS_WRITE_PING) {
switch (protocol) {
case LWS_WRITE_CLOSE:
// lwsl_hexdump(&buf[-pre], len + post);
case LWS_WRITE_HTTP:
case LWS_WRITE_PONG:
case LWS_WRITE_PING:
if (lws_issue_raw(wsi, (unsigned char *)buf - pre,
len + pre + post))
return -1;
return 0;
default:
break;
}
/*

6
lib/parsers.c
View file

@ -774,6 +774,8 @@ spill:
n = libwebsocket_write(wsi, (unsigned char *)
&wsi->rx_user_buffer[LWS_SEND_BUFFER_PRE_PADDING],
wsi->rx_user_buffer_head, LWS_WRITE_CLOSE);
if (n)
lwsl_info("write of close ack failed %d\n", n);
wsi->state = WSI_STATE_RETURNED_CLOSE_ALREADY;
/* close the connection */
return -1;
@ -896,9 +898,7 @@ int libwebsocket_interpret_incoming_packet(struct libwebsocket *wsi,
#ifdef DEBUG
lwsl_parser("received %d byte packet\n", (int)len);
for (n = 0; n < len; n++)
lwsl_parser("%02X ", buf[n]);
lwsl_parser("\n");
lwsl_hexdump(buf, len);
#endif
/* let the rx protocol state machine have as much as it needs */