ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2024-12-21 22:07:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.int.zerotier.com/ZeroTier/ZeroTierOne into dev

Browse Source
This commit is contained in:
Joseph Henry 2018-10-26 12:00:01 -07:00
commit 79086f0858
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
make-mac.mk
View File

@ -79,7 +79,7 @@ ext/x64-salsa2012-asm/salsa2012.o:
$(CC) $(CFLAGS) -c ext/x64-salsa2012-asm/salsa2012.s -o ext/x64-salsa2012-asm/salsa2012.o $(CC) $(CFLAGS) -c ext/x64-salsa2012-asm/salsa2012.s -o ext/x64-salsa2012-asm/salsa2012.o
mac-agent: FORCE mac-agent: FORCE
$(CC) -O -s -o MacEthernetTapAgent osdep/MacEthernetTapAgent.c $(CC) -Ofast -o MacEthernetTapAgent osdep/MacEthernetTapAgent.c
$(CODESIGN) -f -s $(CODESIGN_APP_CERT) MacEthernetTapAgent $(CODESIGN) -f -s $(CODESIGN_APP_CERT) MacEthernetTapAgent
one: $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent one: $(CORE_OBJS) $(ONE_OBJS) one.o mac-agent
@ -138,11 +138,4 @@ distclean: clean
realclean: clean realclean: clean
# For those building from source -- installs signed binary tap driver in system ZT home
#install-mac-tap: FORCE
# mkdir -p /Library/Application\ Support/ZeroTier/One
# rm -rf /Library/Application\ Support/ZeroTier/One/tap.kext
# cp -R ext/bin/tap-mac/tap.kext /Library/Application\ Support/ZeroTier/One
# chown -R root:wheel /Library/Application\ Support/ZeroTier/One/tap.kext
FORCE: FORCE:

4
osdep/MacEthernetTapAgent.c
View File

@ -336,6 +336,10 @@ int main(int argc,char **argv)
FD_SET(STDIN_FILENO,&rfds); FD_SET(STDIN_FILENO,&rfds);
FD_SET(s_bpffd,&rfds); FD_SET(s_bpffd,&rfds);
if (select(s_bpffd+1,&rfds,&wfds,&efds,(struct timeval *)0) < 0) { if (select(s_bpffd+1,&rfds,&wfds,&efds,(struct timeval *)0) < 0) {
if ((errno == EAGAIN)||(errno == EINTR)) {
usleep(10);
continue;
}
return ZT_MACETHERNETTAPAGENT_EXIT_CODE_READ_ERROR; return ZT_MACETHERNETTAPAGENT_EXIT_CODE_READ_ERROR;
} }