void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-07 04:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some buffer tuning.

Browse source
This commit is contained in:
Adam Ierymenko 2020-11-17 15:34:42 -05:00
parent 3acd901c88
commit 2fcc344299
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
node/Constants.hpp
View file

@ -669,11 +669,7 @@
/** /**
* Desired buffer size for UDP sockets (used in service and osdep but defined here) * Desired buffer size for UDP sockets (used in service and osdep but defined here)
*/ */
#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__))
#define ZT_UDP_DESIRED_BUF_SIZE 1048576 #define ZT_UDP_DESIRED_BUF_SIZE 1048576
#else
#define ZT_UDP_DESIRED_BUF_SIZE 131072
#endif
/** /**
* Desired / recommended min stack size for threads (used on some platforms to reset thread stack size) * Desired / recommended min stack size for threads (used on some platforms to reset thread stack size)

11
osdep/LinuxEthernetTap.cpp
View file

@ -277,17 +277,14 @@ LinuxEthernetTap::LinuxEthernetTap(
if (_enabled) { if (_enabled) {
_tapq.post(std::pair<void *,int>(buf,r)); _tapq.post(std::pair<void *,int>(buf,r));
buf = nullptr; buf = nullptr;
/*
to.setTo(getBuf,6);
from.setTo(getBuf + 6,6);
unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
_handler(_arg,(void *)0,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
*/
} }
r = 0; r = 0;
} }
} else break; // return to outer select when read() fails } else {
r = 0;
break;
}
} }
} }
} }

4
osdep/Phy.hpp
View file

@ -351,14 +351,14 @@ public:
int tmpbs = bs; int tmpbs = bs;
if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0) if (setsockopt(s,SOL_SOCKET,SO_RCVBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
break; break;
bs -= 16384; bs -= 4096;
} }
bs = bufferSize; bs = bufferSize;
while (bs >= 65536) { while (bs >= 65536) {
int tmpbs = bs; int tmpbs = bs;
if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0) if (setsockopt(s,SOL_SOCKET,SO_SNDBUF,(const char *)&tmpbs,sizeof(tmpbs)) == 0)
break; break;
bs -= 16384; bs -= 4096;
} }
} }