TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Switch to SocketAddress in Windows impl.

Browse Source 
PiperOrigin-RevId: 820862441
This commit is contained in:
Francis Tsui
2025-10-17 16:11:07 -07:00
committed by Copybara-Service
parent 7ccc8ff57e
commit ca82b68dfe
17 changed files with 150 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/windows/nearby_client_socket.cc
+6 -12
View File
@@ -49,8 +49,7 @@ NearbyClientSocket::~NearbyClientSocket() {
}
}
bool NearbyClientSocket ::Connect(const std::string& ip_address, int port,
bool dual_stack) {
bool NearbyClientSocket ::Connect(const SocketAddress& server_address) {
if (!is_socket_initiated_) {
LOG(WARNING) << "Windows socket is not initiated.";
return false;
@@ -60,19 +59,14 @@ bool NearbyClientSocket ::Connect(const std::string& ip_address, int port,
LOG(ERROR) << "Socket is already connected.";
return false;
}
SocketAddress serv_address(dual_stack);
if (!SocketAddress::FromString(serv_address, ip_address, port)) {
LOG(ERROR) << "Failed to parse address " << ip_address << ":" << port;
return false;
}
socket_ = socket(dual_stack ? AF_INET6 : AF_INET, SOCK_STREAM, IPPROTO_TCP);
socket_ = socket(server_address.dual_stack() ? AF_INET6 : AF_INET,
SOCK_STREAM, IPPROTO_TCP);
if (socket_ == INVALID_SOCKET) {
LOG(ERROR) << "Failed to get socket with error " << WSAGetLastError();
return false;
}
if (dual_stack) {
if (server_address.dual_stack()) {
// On Windows dual stack is not the default.
// https://learn.microsoft.com/en-us/windows/win32/winsock/dual-stack-sockets#creating-a-dual-stack-socket
DWORD v6_only = 0;
@@ -106,7 +100,7 @@ bool NearbyClientSocket ::Connect(const std::string& ip_address, int port,
setsockopt(socket_, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char*>(&flag),
sizeof(flag));
if (connect(socket_, serv_address.address(), sizeof(sockaddr_storage)) ==
if (connect(socket_, server_address.address(), sizeof(sockaddr_storage)) ==
SOCKET_ERROR) {
LOG(ERROR) << "Failed to connect socket with error: " << WSAGetLastError();
closesocket(socket_);
@@ -120,7 +114,7 @@ bool NearbyClientSocket ::Connect(const std::string& ip_address, int port,
int address_length = sizeof(sockaddr_storage);
if (getsockname(socket_, local_address.address(), &address_length) !=
SOCKET_ERROR) {
VLOG(1) << "Connected to " << serv_address.ToString() << " from "
VLOG(1) << "Connected to " << server_address.ToString() << " from "
<< local_address.ToString();
}
}