sovereign-rf/DAPNETGateway
1
0
Fork 0
mirror of https://github.com/g4klx/DAPNETGateway.git synced 2026-08-26 12:32:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace sockaddr_in -> sockaddr_storage to support IPv6

Browse source
This commit is contained in:
SASANO Takayoshi 2019-10-02 16:37:47 +09:00
parent 7adbb1ced1
commit 11707bfa60
5 changed files with 69 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

11
TCPSocket.cpp
View file

@ -71,18 +71,13 @@ bool CTCPSocket::open()
return false;
}
struct sockaddr_in addr;
::memset(&addr, 0x00, sizeof(struct sockaddr_in));
addr.sin_family = AF_INET;
addr.sin_port = htons(m_port);
addr.sin_addr = CUDPSocket::lookup(m_address);
if (addr.sin_addr.s_addr == INADDR_NONE) {
struct sockaddr_storage addr;
if (CUDPSocket::lookup(m_address, m_port, addr)) {
close();
return false;
}
if (::connect(m_fd, (sockaddr*)&addr, sizeof(struct sockaddr_in)) == -1) {
if (::connect(m_fd, (sockaddr*)&addr, ((sockaddr*)&addr)->sa_len) == -1) {
#if defined(_WIN32) || defined(_WIN64)
LogError("Cannot connect the TCP client socket, err=%d", ::GetLastError());
#else