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

Added private macro AWAITING_TIMEOUT instead of harcoded value 5.

Browse source
This commit is contained in:
David Galeano 2013-01-09 18:01:23 +08:00 • committed by Andy Green
parent dae2dcb09e
commit c9f1ff843f
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/client-handshake.c
View file

@ -121,7 +121,7 @@ struct libwebsocket *__libwebsocket_client_connect_2(
}
libwebsocket_set_timeout(wsi,
PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE, 5);
PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE, AWAITING_TIMEOUT);
wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_PROXY_REPLY;
@ -340,7 +340,7 @@ libwebsocket_client_connect(struct libwebsocket_context *context,
debug("libwebsocket_client_connect: ext handling conn\n");
libwebsocket_set_timeout(wsi,
PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE, 5);
PENDING_TIMEOUT_AWAITING_EXTENSION_CONNECT_RESPONSE, AWAITING_TIMEOUT);
wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_EXTENSION_CONNECT;
return wsi;

4
lib/libwebsockets.c
View file

@ -278,7 +278,7 @@ libwebsocket_close_and_free_session(struct libwebsocket_context *context,
/* and we should wait for a reply for a bit */
libwebsocket_set_timeout(wsi,
PENDING_TIMEOUT_CLOSE_ACK, 5);
PENDING_TIMEOUT_CLOSE_ACK, AWAITING_TIMEOUT);
debug("sent close indication, awaiting ack\n");
@ -1876,7 +1876,7 @@ libwebsocket_service_fd(struct libwebsocket_context *context,
wsi->parser_state = WSI_TOKEN_NAME_PART;
wsi->mode = LWS_CONNMODE_WS_CLIENT_WAITING_SERVER_REPLY;
libwebsocket_set_timeout(wsi,
PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE, 5);
PENDING_TIMEOUT_AWAITING_SERVER_RESPONSE, AWAITING_TIMEOUT);
break;

1
lib/private-libwebsockets.h
View file

@ -128,6 +128,7 @@ void debug(const char *format, ...)
#define LWS_MAX_PROTOCOLS 10
#define LWS_MAX_EXTENSIONS_ACTIVE 10
#define SPEC_LATEST_SUPPORTED 13
#define AWAITING_TIMEOUT 5
#define MAX_WEBSOCKET_04_KEY_LEN 128
#define SYSTEM_RANDOM_FILEPATH "/dev/urandom"