Browse Source

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

pull/2/head
Joseph Henry 7 years ago
parent
commit
15e44f0ddd
  1. 5
      node/Multicaster.cpp
  2. 6
      osdep/LinuxNetLink.cpp
  3. 2
      zerotier-one.spec

5
node/Multicaster.cpp

@ -275,6 +275,11 @@ void Multicaster::send(
}
}
} 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;
if ((gs.members.empty())||((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY)) {

6
osdep/LinuxNetLink.cpp

@ -105,7 +105,11 @@ void LinuxNetLink::_setSocketTimeout(int fd, int seconds)
#define ZT_NL_BUF_SIZE 16384
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) {
fprintf(stderr,"malloc failed!\n");
::exit(1);

2
zerotier-one.spec

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

Loading…
Cancel
Save