From ee0645d7b54fab11eab64fc8b0944aa35c56b563 Mon Sep 17 00:00:00 2001 From: David Galeano Date: Wed, 9 Jan 2013 18:01:23 +0800 Subject: [PATCH] Added private macro AWAITING_TIMEOUT instead of harcoded value 5. --- lib/client-handshake.c | 4 ++-- lib/libwebsockets.c | 4 ++-- lib/private-libwebsockets.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/client-handshake.c b/lib/client-handshake.c index 556b518..fa9afa6 100644 --- a/lib/client-handshake.c +++ b/lib/client-handshake.c @@ -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; diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c index fd4196a..51a6b44 100644 --- a/lib/libwebsockets.c +++ b/lib/libwebsockets.c @@ -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; diff --git a/lib/private-libwebsockets.h b/lib/private-libwebsockets.h index b51a852..ed398d2 100644 --- a/lib/private-libwebsockets.h +++ b/lib/private-libwebsockets.h @@ -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" -- 2.7.4