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

client: always set port even if sockfd already created

Browse source
This commit is contained in:
Andy Green 2017-07-21 20:35:58 +08:00
parent 8ccc64679f
commit 75bbb3b2c0
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/client-handshake.c
View file

@ -213,15 +213,11 @@ lws_client_connect_2(struct lws *wsi)
#endif #endif
#ifdef LWS_USE_IPV6 #ifdef LWS_USE_IPV6
if (wsi->ipv6) { if (wsi->ipv6)
sa46.sa6.sin6_port = htons(port);
wsi->desc.sockfd = socket(AF_INET6, SOCK_STREAM, 0); wsi->desc.sockfd = socket(AF_INET6, SOCK_STREAM, 0);
} else else
#endif #endif
{
sa46.sa4.sin_port = htons(port);
wsi->desc.sockfd = socket(AF_INET, SOCK_STREAM, 0); wsi->desc.sockfd = socket(AF_INET, SOCK_STREAM, 0);
}
if (!lws_socket_is_valid(wsi->desc.sockfd)) { if (!lws_socket_is_valid(wsi->desc.sockfd)) {
lwsl_warn("Unable to open socket\n"); lwsl_warn("Unable to open socket\n");
@ -276,11 +272,15 @@ lws_client_connect_2(struct lws *wsi)
} }
#ifdef LWS_USE_IPV6 #ifdef LWS_USE_IPV6
if (wsi->ipv6) if (wsi->ipv6) {
sa46.sa6.sin6_port = htons(port);
n = sizeof(struct sockaddr_in6); n = sizeof(struct sockaddr_in6);
else } else
#endif #endif
{
sa46.sa4.sin_port = htons(port);
n = sizeof(struct sockaddr); n = sizeof(struct sockaddr);
}
if (connect(wsi->desc.sockfd, (const struct sockaddr *)&sa46, n) == -1 || if (connect(wsi->desc.sockfd, (const struct sockaddr *)&sa46, n) == -1 ||
LWS_ERRNO == LWS_EISCONN) { LWS_ERRNO == LWS_EISCONN) {