summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorent Le Coz <louiz@louiz.org>2014-07-15 15:56:37 +0200
committerFlorent Le Coz <louiz@louiz.org>2014-07-15 15:56:37 +0200
commit609722b4e742de10edd0d035c6927862ad5f160f (patch)
treee920833a1b38dcb2099caf2939f0cde962fcd819 /src
parentb94247813bfdcb95b2b3cde9a7d27f90254f2a2f (diff)
parent6a4e17cb0a2d48695af2af488068f98515d714a1 (diff)
downloadbiboumi-609722b4e742de10edd0d035c6927862ad5f160f.tar.gz
biboumi-609722b4e742de10edd0d035c6927862ad5f160f.tar.bz2
biboumi-609722b4e742de10edd0d035c6927862ad5f160f.tar.xz
biboumi-609722b4e742de10edd0d035c6927862ad5f160f.zip
Merge branch 'v1'
Conflicts: src/network/socket_handler.hpp
Diffstat (limited to 'src')
-rw-r--r--src/network/tcp_socket_handler.cpp2
-rw-r--r--src/network/tcp_socket_handler.hpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/tcp_socket_handler.cpp b/src/network/tcp_socket_handler.cpp
index 01adf04..c5d254e 100644
--- a/src/network/tcp_socket_handler.cpp
+++ b/src/network/tcp_socket_handler.cpp
@@ -139,7 +139,7 @@ void TCPSocketHandler::connect(const std::string& address, const std::string& po
this->ai_addrlen = rp->ai_addrlen;
memcpy(&this->ai_addr, rp->ai_addr, this->ai_addrlen);
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;
// If the connection has not succeeded or failed in 5s, we consider
// it to have failed
diff --git a/src/network/tcp_socket_handler.hpp b/src/network/tcp_socket_handler.hpp
index 876cd57..c25ad83 100644
--- a/src/network/tcp_socket_handler.hpp
+++ b/src/network/tcp_socket_handler.hpp
@@ -189,7 +189,7 @@ private:
* again.
*/
struct addrinfo addrinfo;
- struct sockaddr ai_addr;
+ struct sockaddr_in6 ai_addr;
socklen_t ai_addrlen;
protected: