godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-05 12:10:55 +00:00
Code Releases Wiki Activity

Merge pull request #7510 from Faless/tcp_connect

Browse Source 
TCP connect always opens the correct socket type
This commit is contained in:
Rémi Verschelde
2017-01-15 00:26:46 +01:00
committed by GitHub
parent d4eb8ec884 55b4f3686d
commit a992d3f74f
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/unix/stream_peer_tcp_posix.cpp
View File

@@ -98,7 +98,7 @@ Error StreamPeerTCPPosix::_poll_connection(bool p_block) const {
};
struct sockaddr_storage their_addr;
size_t addr_size = _set_sockaddr(&their_addr, peer_host, peer_port, ip_type);
size_t addr_size = _set_sockaddr(&their_addr, peer_host, peer_port, sock_type);
if (::connect(sockfd, (struct sockaddr *)&their_addr,addr_size) == -1) {
@@ -125,6 +125,7 @@ Error StreamPeerTCPPosix::_poll_connection(bool p_block) const {
void StreamPeerTCPPosix::set_socket(int p_sockfd, IP_Address p_host, int p_port, IP::Type p_ip_type) {
ip_type = p_ip_type;
sock_type = p_ip_type;
sockfd = p_sockfd;
#ifndef NO_FCNTL
fcntl(sockfd, F_SETFL, O_NONBLOCK);
@@ -143,7 +144,8 @@ Error StreamPeerTCPPosix::connect_to_host(const IP_Address& p_host, uint16_t p_p
ERR_FAIL_COND_V( p_host == IP_Address(), ERR_INVALID_PARAMETER);
sockfd = _socket_create(ip_type, SOCK_STREAM, IPPROTO_TCP);
sock_type = p_host.is_ipv4() ? IP::TYPE_IPV4 : IP::TYPE_IPV6;
sockfd = _socket_create(sock_type, SOCK_STREAM, IPPROTO_TCP);
if (sockfd == -1) {
ERR_PRINT("Socket creation failed!");
disconnect_from_host();
@@ -159,7 +161,7 @@ Error StreamPeerTCPPosix::connect_to_host(const IP_Address& p_host, uint16_t p_p
#endif
struct sockaddr_storage their_addr;
size_t addr_size = _set_sockaddr(&their_addr, p_host, p_port, ip_type);
size_t addr_size = _set_sockaddr(&their_addr, p_host, p_port, sock_type);
errno = 0;
if (::connect(sockfd, (struct sockaddr *)&their_addr,addr_size) == -1 && errno != EINPROGRESS) {
@@ -340,6 +342,8 @@ void StreamPeerTCPPosix::disconnect_from_host() {
if (sockfd != -1)
close(sockfd);
sock_type = IP::TYPE_NONE;
sockfd=-1;
status = STATUS_NONE;
@@ -390,6 +394,7 @@ uint16_t StreamPeerTCPPosix::get_connected_port() const {
StreamPeerTCPPosix::StreamPeerTCPPosix() {
sock_type = IP::TYPE_NONE;
sockfd = -1;
status = STATUS_NONE;
peer_port = 0;