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

reversed fix for ios/osx xcode build using latest ZTO

Browse Source
This commit is contained in:
Joseph Henry
2016-12-05 11:27:17 -08:00
parent 9a2092acc5
commit e818989125
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
zerotierone/service/OneService.cpp
View File

@@ -907,8 +907,8 @@ public:
{ {
Mutex::Lock _l(_nets_m); Mutex::Lock _l(_nets_m);
for(std::map<uint64_t,NetworkState>::iterator n(_nets.begin());n!=_nets.end();++n) { for(std::map<uint64_t,NetworkState>::iterator n(_nets.begin());n!=_nets.end();++n) {
//if (n->second.tap) if (n->second.tap)
// syncManagedStuff(n->second,false,true); syncManagedStuff(n->second,false,true);
} }
} }
} }
@@ -1093,8 +1093,8 @@ public:
fclose(out); fclose(out);
} }
//if (n->second.tap) if (n->second.tap)
// syncManagedStuff(n->second,true,true); syncManagedStuff(n->second,true,true);
return true; return true;
} }
@@ -1216,7 +1216,7 @@ public:
for(std::list<ManagedRoute>::iterator mr(n.managedRoutes.begin());mr!=n.managedRoutes.end();++mr) { for(std::list<ManagedRoute>::iterator mr(n.managedRoutes.begin());mr!=n.managedRoutes.end();++mr) {
if ( (mr->target() == *target) && ( ((via->ss_family == target->ss_family)&&(mr->via() == *via)) || (tapdev == mr->device()) ) ) { if ( (mr->target() == *target) && ( ((via->ss_family == target->ss_family)&&(mr->via() == *via)) || (tapdev == mr->device()) ) ) {
haveRoute = true; haveRoute = true;
//mr->sync(); mr->sync();
break; break;
} }
} }
@@ -1515,7 +1515,7 @@ public:
case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE: case ZT_VIRTUAL_NETWORK_CONFIG_OPERATION_CONFIG_UPDATE:
memcpy(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig)); memcpy(&(n.config),nwc,sizeof(ZT_VirtualNetworkConfig));
if (n.tap) { // sanity check if (n.tap) { // sanity check
//syncManagedStuff(n,true,true); syncManagedStuff(n,true,true);
} else { } else {
_nets.erase(nwid); _nets.erase(nwid);
return -999; // tap init failed return -999; // tap init failed