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

client: change all remaining AWAITING_TIMEOUT to use context timeout_secs

Browse source 
https://github.com/warmcat/libwebsockets/issues/1822
This commit is contained in:
Andy Green 2020-01-10 13:37:19 +00:00
parent 673f90d076
commit 60d7daccd2
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/roles/http/client/client-handshake.c
View file

@ -130,7 +130,7 @@ lws_client_connect_4_established(struct lws *wsi, struct lws *wsi_piggyback,
}
lws_set_timeout(wsi, PENDING_TIMEOUT_AWAITING_PROXY_RESPONSE,
AWAITING_TIMEOUT);
wsi->context->timeout_secs);
lwsi_set_state(wsi, LRS_WAITING_PROXY_REPLY);
@ -151,7 +151,7 @@ lws_client_connect_4_established(struct lws *wsi, struct lws *wsi_piggyback,
lws_set_timeout(wsi,
PENDING_TIMEOUT_AWAITING_SOCKS_GREETING_REPLY,
AWAITING_TIMEOUT);
wsi->context->timeout_secs);
lwsi_set_state(wsi, LRS_WAITING_SOCKS_GREETING_REPLY);
@ -244,7 +244,7 @@ send_hs:
*/
lws_set_timeout(wsi, PENDING_TIMEOUT_SENT_CLIENT_HANDSHAKE,
AWAITING_TIMEOUT);
wsi->context->timeout_secs);
assert(lws_socket_is_valid(wsi->desc.sockfd));
@ -560,7 +560,7 @@ ads_known:
wsi->protocol = &wsi->vhost->protocols[0];
lws_set_timeout(wsi, PENDING_TIMEOUT_AWAITING_CONNECT_RESPONSE,
AWAITING_TIMEOUT);
wsi->context->timeout_secs);
iface = lws_wsi_client_stash_item(wsi, CIS_IFACE,
_WSI_TOKEN_CLIENT_IFACE);

3
lib/roles/http/client/client-http.c
View file

@ -244,7 +244,8 @@ socks_send:
goto bail3;
}
lws_set_timeout(wsi, pending_timeout, AWAITING_TIMEOUT);
lws_set_timeout(wsi, pending_timeout,
context->timeout_secs);
lwsi_set_state(wsi, conn_mode);
break;