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

Merge remote-tracking branch 'origin/dev' into multipath

Browse source
This commit is contained in:
Joseph Henry 2019-08-14 11:25:40 -07:00
commit 15e44f0ddd
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
node/Multicaster.cpp
View file

@ -275,6 +275,11 @@ void Multicaster::send(
} }
} }
} else { } else {
if (gs.txQueue.size() >= ZT_TX_QUEUE_SIZE) {
RR->t->outgoingNetworkFrameDropped(tPtr,network,src,mg.mac(),etherType,0,len,"multicast TX queue is full");
return;
}
const unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1; const unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;
if ((gs.members.empty())||((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY)) { if ((gs.members.empty())||((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY)) {

6
osdep/LinuxNetLink.cpp
View file

@ -105,7 +105,11 @@ void LinuxNetLink::_setSocketTimeout(int fd, int seconds)
#define ZT_NL_BUF_SIZE 16384 #define ZT_NL_BUF_SIZE 16384
int LinuxNetLink::_doRecv(int fd) int LinuxNetLink::_doRecv(int fd)
{ {
char *const buf = (char *)valloc(ZT_NL_BUF_SIZE); char *buf = nullptr;
if (posix_memalign((void **)&buf,16,ZT_NL_BUF_SIZE) != 0) {
fprintf(stderr,"malloc failed!\n");
::exit(1);
}
if (!buf) { if (!buf) {
fprintf(stderr,"malloc failed!\n"); fprintf(stderr,"malloc failed!\n");
::exit(1); ::exit(1);

2
zerotier-one.spec
View file

@ -14,7 +14,7 @@ BuildRequires: systemd
BuildRequires: systemd BuildRequires: systemd
%endif %endif
Requires: iproute Requires: iproute libstdc++
%if 0%{?rhel} >= 7 %if 0%{?rhel} >= 7
Requires: systemd Requires: systemd