gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Yank potentially costly support for TTL out of UdpSocket since we dont use this anymore.

Browse Source
This commit is contained in:
Adam Ierymenko
2014-10-13 09:37:17 -07:00
parent 7943414c89
commit 05309037a8
2 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
node/UdpSocket.cpp
View File

@@ -64,33 +64,20 @@ UdpSocket::~UdpSocket()
}
bool UdpSocket::send(const InetAddress &to,const void *msg,unsigned int msglen)
{
return sendWithHopLimit(to,msg,msglen,0);
}
bool UdpSocket::sendWithHopLimit(const InetAddress &to,const void *msg,unsigned int msglen,int hopLimit)
{
#ifdef ZT_BREAK_UDP
return true;
#else
if (hopLimit <= 0)
hopLimit = 255;
if (to.isV6()) {
#ifdef __WINDOWS__
DWORD hltmp = (DWORD)hopLimit;
setsockopt(_sock,IPPROTO_IPV6,IPV6_UNICAST_HOPS,(const char *)&hltmp,sizeof(hltmp));
return ((int)sendto(_sock,(const char *)msg,msglen,0,to.saddr(),to.saddrLen()) == (int)msglen);
#else
setsockopt(_sock,IPPROTO_IPV6,IPV6_UNICAST_HOPS,&hopLimit,sizeof(hopLimit));
return ((int)sendto(_sock,msg,msglen,0,to.saddr(),to.saddrLen()) == (int)msglen);
#endif
} else {
#ifdef __WINDOWS__
DWORD hltmp = (DWORD)hopLimit;
setsockopt(_sock,IPPROTO_IP,IP_TTL,(const char *)&hltmp,sizeof(hltmp));
return ((int)sendto(_sock,(const char *)msg,msglen,0,to.saddr(),to.saddrLen()) == (int)msglen);
#else
setsockopt(_sock,IPPROTO_IP,IP_TTL,&hopLimit,sizeof(hopLimit));
return ((int)sendto(_sock,msg,msglen,0,to.saddr(),to.saddrLen()) == (int)msglen);
#endif
}