mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'v1'

Browse Source 
Conflicts:
	src/network/socket_handler.hpp
This commit is contained in:
Florent Le Coz
2014-07-15 15:56:37 +02:00
parent b94247813b 6a4e17cb0a
commit 609722b4e7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/tcp_socket_handler.cpp
+1 -1
View File
@@ -139,7 +139,7 @@ void TCPSocketHandler::connect(const std::string& address, const std::string& po
this->ai_addrlen = rp->ai_addrlen; this->ai_addrlen = rp->ai_addrlen;
memcpy(&this->ai_addr, rp->ai_addr, this->ai_addrlen); memcpy(&this->ai_addr, rp->ai_addr, this->ai_addrlen);
memcpy(&this->addrinfo, rp, sizeof(struct addrinfo)); memcpy(&this->addrinfo, rp, sizeof(struct addrinfo));
this->addrinfo.ai_addr = &this->ai_addr; this->addrinfo.ai_addr = reinterpret_cast<struct sockaddr*>(&this->ai_addr);
this->addrinfo.ai_next = nullptr; this->addrinfo.ai_next = nullptr;
// If the connection has not succeeded or failed in 5s, we consider // If the connection has not succeeded or failed in 5s, we consider
// it to have failed // it to have failed
src/network/tcp_socket_handler.hpp
+1 -1
View File
@@ -189,7 +189,7 @@ private:
* again. * again.
*/ */
struct addrinfo addrinfo; struct addrinfo addrinfo;
struct sockaddr ai_addr; struct sockaddr_in6 ai_addr;
socklen_t ai_addrlen; socklen_t ai_addrlen;
protected: protected: