From d77846dcea8db97c9b07d7439fdbf3ee8bdb51b3 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 29 Mar 2019 12:45:02 -0700 Subject: Add bigness to buffers to prevent overflow on high traffic (Mac tap). --- osdep/MacEthernetTap.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'osdep/MacEthernetTap.cpp') diff --git a/osdep/MacEthernetTap.cpp b/osdep/MacEthernetTap.cpp index 22b2b399..42e76b84 100644 --- a/osdep/MacEthernetTap.cpp +++ b/osdep/MacEthernetTap.cpp @@ -350,10 +350,14 @@ void MacEthernetTap::setMtu(unsigned int mtu) _mtu = mtu; } +#define ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE 1048576 + void MacEthernetTap::threadMain() throw() { - char agentReadBuf[262144]; + char *const agentReadBuf = (char *)valloc(ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE); + if (!agentReadBuf) + return; fd_set readfds,nullfds; MAC to,from; @@ -375,7 +379,7 @@ void MacEthernetTap::threadMain() break; } if (FD_ISSET(_agentStdout,&readfds)) { - long n = (long)read(_agentStdout,agentReadBuf + agentReadPtr,sizeof(agentReadBuf) - agentReadPtr); + long n = (long)read(_agentStdout,agentReadBuf + agentReadPtr,ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE - agentReadPtr); if (n > 0) { agentReadPtr += n; while (agentReadPtr >= 2) { @@ -401,9 +405,11 @@ void MacEthernetTap::threadMain() } } if (FD_ISSET(_agentStderr,&readfds)) { - read(_agentStderr,agentReadBuf,sizeof(agentReadBuf)); + read(_agentStderr,agentReadBuf,ZT_MACETHERNETTAP_AGENT_READ_BUF_SIZE); } } + + free(agentReadBuf); } } // namespace ZeroTier -- cgit v1.2.3