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

fixup! ipv6 move disable to vhost option

Browse source 
client ipv6 check vhost not context
This commit is contained in:
Denis Osvald 2016-06-04 08:37:19 +08:00 • committed by Andy Green
parent c16c6c8536
commit 4507da486d
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/client-handshake.c
View file

@ -35,7 +35,7 @@ lws_client_connect_2(struct lws *wsi)
ads = wsi->vhost->http_proxy_address;
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(context)) {
if (LWS_IPV6_ENABLED(wsi->vhost)) {
memset(&server_addr6, 0, sizeof(struct sockaddr_in6));
server_addr6.sin6_port = htons(wsi->vhost->http_proxy_port);
} else
@ -45,7 +45,7 @@ lws_client_connect_2(struct lws *wsi)
} else {
ads = lws_hdr_simple_ptr(wsi, _WSI_TOKEN_CLIENT_PEER_ADDRESS);
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(context)) {
if (LWS_IPV6_ENABLED(wsi->vhost)) {
memset(&server_addr6, 0, sizeof(struct sockaddr_in6));
server_addr6.sin6_port = htons(wsi->u.hdr.c_port);
} else
@ -59,7 +59,7 @@ lws_client_connect_2(struct lws *wsi)
lwsl_client("%s: address %s\n", __func__, ads);
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(context)) {
if (LWS_IPV6_ENABLED(wsi->vhost)) {
memset(&hints, 0, sizeof(struct addrinfo));
#if !defined(__ANDROID__)
hints.ai_family = AF_INET6;
@ -143,7 +143,7 @@ lws_client_connect_2(struct lws *wsi)
if (!lws_socket_is_valid(wsi->sock)) {
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(context))
if (LWS_IPV6_ENABLED(wsi->vhost))
wsi->sock = socket(AF_INET6, SOCK_STREAM, 0);
else
#endif
@ -189,7 +189,7 @@ lws_client_connect_2(struct lws *wsi)
}
#ifdef LWS_USE_IPV6
if (LWS_IPV6_ENABLED(context)) {
if (LWS_IPV6_ENABLED(wsi->vhost)) {
v = (struct sockaddr *)&server_addr6;
n = sizeof(struct sockaddr_in6);
} else