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

client fix reaction to tls failure

Browse source 
https://github.com/warmcat/libwebsockets/issues/508

Signed-off-by: Andy Green <andy@warmcat.com>
This commit is contained in:
Andy Green 2016-05-03 08:08:32 +08:00
parent c6e497ea48
commit 381cbf2dc1
5 changed files with 33 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.test-apps.md
View file

@ -78,6 +78,16 @@ same time as drawing random circles in the mirror protocol;
if you connect to the test server using a browser at the
same time you will be able to see the circles being drawn.
The test client supports SSL too, use
```bash
$ libwebsockets-test-client localhost --ssl -s
```
the -s tells it to accept the default selfsigned cert from the server,
otherwise it will strictly fail the connection if there is no CA cert to
validate the server's certificate.
Testing simple echo
-------------------

3
lib/client-handshake.c
View file

@ -171,6 +171,9 @@ lws_client_connect_2(struct lws *wsi)
* past here, we can't simply free the structs as error
* handling as oom4 does. We have to run the whole close flow.
*/
if (!wsi->protocol)
wsi->protocol = &wsi->context->protocols[0];
wsi->protocol->callback(wsi, LWS_CALLBACK_WSI_CREATE,
wsi->user_space, NULL, 0);
lws_set_timeout(wsi,

10
lib/client.c
View file

@ -264,7 +264,7 @@ some_wait:
if (n != SSL_ERROR_NONE) {
lwsl_err("SSL connect error %lu: %s\n",
n, ERR_error_string(n, sb));
return 0;
goto bail3;
}
}
} else
@ -318,7 +318,7 @@ some_wait:
if (n != SSL_ERROR_NONE) {
lwsl_err("SSL connect error %lu: %s\n",
n, ERR_error_string(n, sb));
return 0;
goto bail3;
}
}
}
@ -343,7 +343,7 @@ some_wait:
n, ERR_error_string(n, sb));
lws_close_free_wsi(wsi,
LWS_CLOSE_STATUS_NOSTATUS);
return 0;
return -1;
}
}
#endif /* USE_WOLFSSL */
@ -462,6 +462,10 @@ some_wait:
bail3:
lwsl_info("closing conn at LWS_CONNMODE...SERVER_REPLY\n");
wsi->context->protocols[0].callback(wsi,
LWS_CALLBACK_CLIENT_CONNECTION_ERROR,
wsi->user_space, NULL, 0);
lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS);
return -1;

4
lib/service.c
View file

@ -325,6 +325,10 @@ lws_service_timeout_check(struct lws *wsi, unsigned int sec)
* cleanup like flush partials.
*/
wsi->socket_is_permanently_unusable = 1;
if (wsi->mode == LWSCM_WSCL_WAITING_SSL)
wsi->context->protocols[0].callback(wsi,
LWS_CALLBACK_CLIENT_CONNECTION_ERROR,
wsi->user_space, NULL, 0);
lws_close_free_wsi(wsi, LWS_CLOSE_STATUS_NOSTATUS);
return 1;

10
test-server/test-client.c
View file

@ -335,7 +335,15 @@ int main(int argc, char **argv)
if (!strcmp(prot, "http") || !strcmp(prot, "ws"))
use_ssl = 0;
if (!strcmp(prot, "https") || !strcmp(prot, "wss"))
use_ssl = 1;
if (!use_ssl)
use_ssl = 1;
if (use_ssl) {
if (use_ssl == 1)
lwsl_notice(" Cert must validate correctly (use -s to allow selfsigned)\n");
else
lwsl_notice(" Selfsigned certs allowed\n");
}
/*
* create the websockets context. This tracks open connections and