Skip to content

stunclient: connect() UDP socket to STUN server #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kimapr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

stunclient: connect() UDP socket to STUN server #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions client/clientmain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,6 +457,7 @@ HRESULT UdpClientLoop(StunClientLogicConfig& config, const ClientSocketConfig& s
CSocketAddress addrRemote; // who we
CSocketAddress addrLocal;
int ret;
bool connected = false;
fd_set set;
timeval tv = {};
std::string strAddr;
Expand Down Expand Up @@ -498,6 +499,26 @@ HRESULT UdpClientLoop(StunClientLogicConfig& config, const ClientSocketConfig& s
{
addrDest.ToString(&strAddr);
ASSERT(spMsg->GetSize() > 0);

if (!config.fFilteringTest)
{
std::string strAddr;
addrDest.ToString(&strAddr);
Logging::LogMsg(LL_DEBUG, "Connecting UDP socket to %s", strAddr.c_str());

ret = ::connect(sock, addrDest.GetSockAddr(), addrDest.GetSockAddrLength());

if (ret)
{
HRESULT hrRet = ERRNOHR;
Logging::LogMsg(LL_DEBUG, "ERROR. connect failed (errno = %d)", errno);
Chk(hrRet);
}
else
{
connected = true;
}
}

if (Logging::GetLogLevel() >= LL_DEBUG)
{
Expand All @@ -506,11 +527,18 @@ HRESULT UdpClientLoop(StunClientLogicConfig& config, const ClientSocketConfig& s
Logging::LogMsg(LL_DEBUG, "Sending message to %s", strAddr.c_str());
}

ret = ::sendto(sock, spMsg->GetData(), spMsg->GetSize(), 0, addrDest.GetSockAddr(), addrDest.GetSockAddrLength());
if (connected)
{
ret = ::send(sock, spMsg->GetData(), spMsg->GetSize(), 0);
}
else
{
ret = ::sendto(sock, spMsg->GetData(), spMsg->GetSize(), 0, addrDest.GetSockAddr(), addrDest.GetSockAddrLength());
}

if (ret <= 0)
{
Logging::LogMsg(LL_DEBUG, "ERROR. sendto failed (errno = %d)", errno);
Logging::LogMsg(LL_DEBUG, "ERROR. %s failed (errno = %d)", connected ? "send" : "sendto", errno);
}
// there's not much we can do if "sendto" fails except time out and try again
}
Expand Down