gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added differentiation of LIBZT_DEBUG and NS_DEBUG flags, other minor tweaks

Browse Source
This commit is contained in:
Joseph Henry
2017-09-13 16:26:27 -07:00
parent bd68e808c1
commit 0dc390ddcf
8 changed files with 139 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/VirtualTap.cpp
View File

@@ -529,7 +529,7 @@ namespace ZeroTier {
{
/* FIXME: There is a call to *_Connect for each send, we should probably figure out a better way to do this,
possibly consult the stack for "connection" state */
// TODO: flags
int err = 0;
#if defined(STACK_PICO)
@@ -546,8 +546,12 @@ namespace ZeroTier {
#endif
#if defined(STACK_LWIP)
if(lwipstack) {
err = lwipstack->lwip_Connect(vs, addr, addrlen); // implicit
err = lwipstack->lwip_Write(vs, (void*)buf, len);
if((err = lwipstack->lwip_Connect(vs, addr, addrlen)) < 0) { // implicit
return err;
}
if((err = lwipstack->lwip_Write(vs, (void*)buf, len)) < 0) {
return err;
}
}
#endif
return err;
@@ -586,14 +590,13 @@ namespace ZeroTier {
if(picostack) {
err = picostack->pico_Shutdown(vs, how);
}
return err;
#endif
#if defined(STACK_LWIP)
if(lwipstack) {
err = lwipstack->lwip_Shutdown(vs, how);
}
return err;
#endif
return err;
}
void VirtualTap::Housekeeping()