ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-24 19:00:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Get stuff building on Windows

Browse Source 
Been a minute since any of this has been updated
This commit is contained in:
Grant Limberg 2020-08-05 16:04:02 -07:00
parent 85a5b0b948
commit 6868e98904
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/EmbeddedNetworkController.cpp
View File

@ -585,7 +585,7 @@ unsigned int EmbeddedNetworkController::handleControlPlaneHttpGET(
responseBody.reserve((members.size() + 2) * 32); responseBody.reserve((members.size() + 2) * 32);
std::string mid; std::string mid;
for(auto member=members.begin();member!=members.end();++member) { for(auto member=members.begin();member!=members.end();++member) {
mid = (*member)["id"]; mid = OSUtils::jsonString((*member)["id"], "");
char tmp[128]; char tmp[128];
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s\"%s\":%llu",(responseBody.length() > 1) ? "," : "",mid.c_str(),(unsigned long long)OSUtils::jsonInt((*member)["revision"],0)); OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s\"%s\":%llu",(responseBody.length() > 1) ? "," : "",mid.c_str(),(unsigned long long)OSUtils::jsonInt((*member)["revision"],0));
responseBody.append(tmp); responseBody.append(tmp);

5
osdep/WindowsEthernetTap.cpp
View File

@ -1290,4 +1290,9 @@ void WindowsEthernetTap::_syncIps()
} }
} }
void WindowsEthernetTap::setDns(const char* domain, const std::vector<InetAddress>& servers)
{
}
} // namespace ZeroTier } // namespace ZeroTier

1
osdep/WindowsEthernetTap.hpp
View File

@ -97,6 +97,7 @@ public:
virtual void setFriendlyName(const char *friendlyName); virtual void setFriendlyName(const char *friendlyName);
virtual void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed); virtual void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
virtual void setMtu(unsigned int mtu); virtual void setMtu(unsigned int mtu);
virtual void setDns(const char* domain, const std::vector<InetAddress> &servers);
inline const NET_LUID &luid() const { return _deviceLuid; } inline const NET_LUID &luid() const { return _deviceLuid; }
inline const GUID &guid() const { return _deviceGuid; } inline const GUID &guid() const { return _deviceGuid; }

7
windows/ZeroTierOne/ZeroTierOne.vcxproj
View File

@ -33,7 +33,6 @@
<ClCompile Include="..\..\controller\FileDB.cpp" /> <ClCompile Include="..\..\controller\FileDB.cpp" />
<ClCompile Include="..\..\controller\LFDB.cpp" /> <ClCompile Include="..\..\controller\LFDB.cpp" />
<ClCompile Include="..\..\controller\PostgreSQL.cpp" /> <ClCompile Include="..\..\controller\PostgreSQL.cpp" />
<ClCompile Include="..\..\controller\RabbitMQ.cpp" />
<ClCompile Include="..\..\ext\http-parser\http_parser.c" /> <ClCompile Include="..\..\ext\http-parser\http_parser.c" />
<ClCompile Include="..\..\ext\libnatpmp\getgateway.c" /> <ClCompile Include="..\..\ext\libnatpmp\getgateway.c" />
<ClCompile Include="..\..\ext\libnatpmp\natpmp.c" /> <ClCompile Include="..\..\ext\libnatpmp\natpmp.c" />
@ -51,6 +50,8 @@
<ClCompile Include="..\..\ext\miniupnpc\upnpdev.c" /> <ClCompile Include="..\..\ext\miniupnpc\upnpdev.c" />
<ClCompile Include="..\..\ext\miniupnpc\upnperrors.c" /> <ClCompile Include="..\..\ext\miniupnpc\upnperrors.c" />
<ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c" /> <ClCompile Include="..\..\ext\miniupnpc\upnpreplyparse.c" />
<ClCompile Include="..\..\node\Bond.cpp" />
<ClCompile Include="..\..\node\BondController.cpp" />
<ClCompile Include="..\..\node\C25519.cpp"> <ClCompile Include="..\..\node\C25519.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MaxSpeed</Optimization> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MaxSpeed</Optimization>
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MaxSpeed</Optimization> <Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MaxSpeed</Optimization>
@ -135,7 +136,6 @@
<ClInclude Include="..\..\controller\FileDB.hpp" /> <ClInclude Include="..\..\controller\FileDB.hpp" />
<ClInclude Include="..\..\controller\LFDB.hpp" /> <ClInclude Include="..\..\controller\LFDB.hpp" />
<ClInclude Include="..\..\controller\PostgreSQL.hpp" /> <ClInclude Include="..\..\controller\PostgreSQL.hpp" />
<ClInclude Include="..\..\controller\RabbitMQ.hpp" />
<ClInclude Include="..\..\ext\cpp-httplib\httplib.h" /> <ClInclude Include="..\..\ext\cpp-httplib\httplib.h" />
<ClInclude Include="..\..\ext\http-parser\http_parser.h" /> <ClInclude Include="..\..\ext\http-parser\http_parser.h" />
<ClInclude Include="..\..\ext\json\json.hpp" /> <ClInclude Include="..\..\ext\json\json.hpp" />
@ -162,6 +162,8 @@
<ClInclude Include="..\..\include\ZeroTierOne.h" /> <ClInclude Include="..\..\include\ZeroTierOne.h" />
<ClInclude Include="..\..\node\Address.hpp" /> <ClInclude Include="..\..\node\Address.hpp" />
<ClInclude Include="..\..\node\AtomicCounter.hpp" /> <ClInclude Include="..\..\node\AtomicCounter.hpp" />
<ClInclude Include="..\..\node\Bond.hpp" />
<ClInclude Include="..\..\node\BondController.hpp" />
<ClInclude Include="..\..\node\Buffer.hpp" /> <ClInclude Include="..\..\node\Buffer.hpp" />
<ClInclude Include="..\..\node\C25519.hpp" /> <ClInclude Include="..\..\node\C25519.hpp" />
<ClInclude Include="..\..\node\CertificateOfMembership.hpp" /> <ClInclude Include="..\..\node\CertificateOfMembership.hpp" />
@ -240,6 +242,7 @@
<UseDebugLibraries>true</UseDebugLibraries> <UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset> <PlatformToolset>v142</PlatformToolset>
<CharacterSet>MultiByte</CharacterSet> <CharacterSet>MultiByte</CharacterSet>
<UseOfMfc>false</UseOfMfc>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType> <ConfigurationType>Application</ConfigurationType>

18
windows/ZeroTierOne/ZeroTierOne.vcxproj.filters
View File

@ -264,9 +264,6 @@
<ClCompile Include="..\..\controller\PostgreSQL.cpp"> <ClCompile Include="..\..\controller\PostgreSQL.cpp">
<Filter>Source Files\controller</Filter> <Filter>Source Files\controller</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\controller\RabbitMQ.cpp">
<Filter>Source Files\controller</Filter>
</ClCompile>
<ClCompile Include="..\..\controller\LFDB.cpp"> <ClCompile Include="..\..\controller\LFDB.cpp">
<Filter>Source Files\controller</Filter> <Filter>Source Files\controller</Filter>
</ClCompile> </ClCompile>
@ -276,6 +273,12 @@
<ClCompile Include="..\..\osdep\EthernetTap.cpp"> <ClCompile Include="..\..\osdep\EthernetTap.cpp">
<Filter>Source Files\osdep</Filter> <Filter>Source Files\osdep</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\node\Bond.cpp">
<Filter>Source Files\node</Filter>
</ClCompile>
<ClCompile Include="..\..\node\BondController.cpp">
<Filter>Source Files\node</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="resource.h"> <ClInclude Include="resource.h">
@ -515,9 +518,6 @@
<ClInclude Include="..\..\controller\PostgreSQL.hpp"> <ClInclude Include="..\..\controller\PostgreSQL.hpp">
<Filter>Header Files\controller</Filter> <Filter>Header Files\controller</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\controller\RabbitMQ.hpp">
<Filter>Header Files\controller</Filter>
</ClInclude>
<ClInclude Include="..\..\controller\LFDB.hpp"> <ClInclude Include="..\..\controller\LFDB.hpp">
<Filter>Header Files\controller</Filter> <Filter>Header Files\controller</Filter>
</ClInclude> </ClInclude>
@ -530,6 +530,12 @@
<ClInclude Include="..\..\osdep\EthernetTap.hpp"> <ClInclude Include="..\..\osdep\EthernetTap.hpp">
<Filter>Header Files\osdep</Filter> <Filter>Header Files\osdep</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\node\Bond.hpp">
<Filter>Header Files\node</Filter>
</ClInclude>
<ClInclude Include="..\..\node\BondController.hpp">
<Filter>Header Files\node</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="ZeroTierOne.rc"> <ResourceCompile Include="ZeroTierOne.rc">