mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2026-09-22 15:29:03 -07:00
Compare commits
356
Commits
sync-main-to-dev
...
root
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b849e23536 | ||
|
|
0ab4e2f750 | ||
|
|
2316a45a45 | ||
|
|
0a6c22a9b8 | ||
|
|
8adf064a04 | ||
|
|
7fe00f4247 | ||
|
|
5eae02068d | ||
|
|
5d429cedbb | ||
|
|
3c85322067 | ||
|
|
9fb902bdf6 | ||
|
|
262cb7a4b5 | ||
|
|
104fade420 | ||
|
|
bcf8c30ce0 | ||
|
|
c2413fca4d | ||
|
|
5028aca372 | ||
|
|
311f9c5c2a | ||
|
|
32ca1a09da | ||
|
|
bba1324145 | ||
|
|
ff655292fb | ||
|
|
2558bd1b9b | ||
|
|
95d0944b9f | ||
|
|
68ac884d47 | ||
|
|
e2f3996843 | ||
|
|
57ade250af | ||
|
|
c3e0f262d1 | ||
|
|
b9911d0db7 | ||
|
|
d1b780c7be | ||
|
|
1711cced3e | ||
|
|
63e6693255 | ||
|
|
9b8d191bb1 | ||
|
|
6db2b8c66d | ||
|
|
47a08ccbd4 | ||
|
|
7fc78129f4 | ||
|
|
c4504fd3ff | ||
|
|
e4799ff8c4 | ||
|
|
f680924585 | ||
|
|
b0d222768a | ||
|
|
4303c43db7 | ||
|
|
3b3e6d2bfc | ||
|
|
7061f13b24 | ||
|
|
5175636d36 | ||
|
|
570032484f | ||
|
|
9c37fc1a5f | ||
|
|
105023bd87 | ||
|
|
8a9669f130 | ||
|
|
e5bd230fb0 | ||
|
|
e3d47e588a | ||
|
|
f4a5abeed9 | ||
|
|
a7e38d2b00 | ||
|
|
84ba396ed3 | ||
|
|
6683280a37 | ||
|
|
1edf680464 | ||
|
|
4df090469a | ||
|
|
3c63f58532 | ||
|
|
64c8171e13 | ||
|
|
b6175bd408 | ||
|
|
b44bd19c53 | ||
|
|
536bc59abb | ||
|
|
70d5da1e2a | ||
|
|
90d4d79828 | ||
|
|
ccc9be2d4d | ||
|
|
3341c4a670 | ||
|
|
bcb9df9cdf | ||
|
|
2eef9d22e6 | ||
|
|
5e35346f17 | ||
|
|
bb53ee9567 | ||
|
|
9934a856dd | ||
|
|
24904c5083 | ||
|
|
6ce4663a31 | ||
|
|
fbf74d3baa | ||
|
|
b540181990 | ||
|
|
02a6b15e6b | ||
|
|
b34aa10bf8 | ||
|
|
e0ddbc2f28 | ||
|
|
ed2024285d | ||
|
|
ae2120eb96 | ||
|
|
3ceb2257e5 | ||
|
|
624efde7e4 | ||
|
|
50009fef6f | ||
|
|
dde937e197 | ||
|
|
07a480b37a | ||
|
|
9f5bccec30 | ||
|
|
ade52bf81e | ||
|
|
71c766a3b2 | ||
|
|
eef66aee9a | ||
|
|
e245eb1eb5 | ||
|
|
e08fc81397 | ||
|
|
9f9032ae36 | ||
|
|
063a16fcd6 | ||
|
|
0db4151492 | ||
|
|
e44d7a553f | ||
|
|
53a2de98de | ||
|
|
2deaaeef28 | ||
|
|
1f9e16f63e | ||
|
|
87fe69c27c | ||
|
|
2d1eeda188 | ||
|
|
5c06d40358 | ||
|
|
31e193756d | ||
|
|
5aa744db84 | ||
|
|
0ad82dad80 | ||
|
|
99c36ed2f2 | ||
|
|
44878e583a | ||
|
|
0723a85ab3 | ||
|
|
d8dae365f6 | ||
|
|
bccb86a401 | ||
|
|
592e743349 | ||
|
|
fb6161e9ac | ||
|
|
787277d282 | ||
|
|
540ee69773 | ||
|
|
0d2c87fe4e | ||
|
|
2460de9713 | ||
|
|
0d32f42d26 | ||
|
|
277497684e | ||
|
|
f4a83e516c | ||
|
|
d2eb1ed9a5 | ||
|
|
a3ec5846df | ||
|
|
b6047899a8 | ||
|
|
3516070b6e | ||
|
|
56ec87e00e | ||
|
|
fe0b896665 | ||
|
|
e4721417e6 | ||
|
|
45f5b3b648 | ||
|
|
3123102211 | ||
|
|
c6141ffbc7 | ||
|
|
c0e92d06a5 | ||
|
|
274b2682d6 | ||
|
|
171d661b84 | ||
|
|
5cea8da664 | ||
|
|
44dd52d08f | ||
|
|
70648d006d | ||
|
|
43e6a9e9ee | ||
|
|
0599c1710b | ||
|
|
abf218a9cd | ||
|
|
55f4f9aaeb | ||
|
|
82b7e1dbcb | ||
|
|
e8f8b0f8e5 | ||
|
|
7566d4fbab | ||
|
|
3a0d385119 | ||
|
|
a465afa83d | ||
|
|
185e90c40f | ||
|
|
e29c2d0260 | ||
|
|
acf6425ae9 | ||
|
|
5e8d49de0f | ||
|
|
1f9456a462 | ||
|
|
a7d8285c3a | ||
|
|
5f1dc4b851 | ||
|
|
b1c22949c5 | ||
|
|
29be175743 | ||
|
|
b6c5ba264b | ||
|
|
8e7e3c2b11 | ||
|
|
0e7df129d8 | ||
|
|
50709cbd21 | ||
|
|
fd6e8d8c5c | ||
|
|
2e7496130c | ||
|
|
9666ab5797 | ||
|
|
4c08ac7873 | ||
|
|
5435ec7545 | ||
|
|
8764d50179 | ||
|
|
62cdb8dc94 | ||
|
|
9918a1092f | ||
|
|
7d89511fda | ||
|
|
795b6d13d1 | ||
|
|
8328b6f657 | ||
|
|
9994e591bd | ||
|
|
b27a38e55e | ||
|
|
f6d747a5a0 | ||
|
|
b7da7574d1 | ||
|
|
dbad9585cd | ||
|
|
2d7a97bb94 | ||
|
|
da19da0360 | ||
|
|
ee7361ee2e | ||
|
|
6e3e09bed4 | ||
|
|
86762d2b40 | ||
|
|
ef12c5af99 | ||
|
|
933404b1dd | ||
|
|
ccec49e444 | ||
|
|
e5f1bf81f7 | ||
|
|
0e627f4f68 | ||
|
|
d33f7d2bf5 | ||
|
|
e07a019615 | ||
|
|
34ca3012e6 | ||
|
|
62634ca2da | ||
|
|
846c96e8d5 | ||
|
|
63775723c1 | ||
|
|
2f7d3e655a | ||
|
|
b19634d7e4 | ||
|
|
a92967a7c1 | ||
|
|
8915b88de5 | ||
|
|
7bca81464b | ||
|
|
b974ece24f | ||
|
|
b1c8e6ad59 | ||
|
|
64f7185e3a | ||
|
|
807cc9afc3 | ||
|
|
0adf306dd4 | ||
|
|
db0f602e86 | ||
|
|
17ec47f5c0 | ||
|
|
cf831d9cd3 | ||
|
|
5e3c633f74 | ||
|
|
4e4b27b6ab | ||
|
|
c0c9590904 | ||
|
|
24c9577e39 | ||
|
|
59ee0cfe88 | ||
|
|
1977b9b764 | ||
|
|
6f9d1fc14c | ||
|
|
8ac59ae2be | ||
|
|
46db37e06c | ||
|
|
9d1207b339 | ||
|
|
6e730cfad1 | ||
|
|
199b3345a0 | ||
|
|
b7f504b8a4 | ||
|
|
1b459b0560 | ||
|
|
40803a4dc1 | ||
|
|
6f22570648 | ||
|
|
8203547cfc | ||
|
|
dad160209e | ||
|
|
8faaaec710 | ||
|
|
012fba617d | ||
|
|
9ca495229b | ||
|
|
e63f624d3a | ||
|
|
e1dd413266 | ||
|
|
b9ef09dd58 | ||
|
|
990333e7ec | ||
|
|
ec9582f3f2 | ||
|
|
ea65386e15 | ||
|
|
a0fd4ad23f | ||
|
|
b6d7a95028 | ||
|
|
1d8f3cee62 | ||
|
|
5ba6e21967 | ||
|
|
52f7f6e6cf | ||
|
|
9fd5ec673b | ||
|
|
e905b3c963 | ||
|
|
f12370c348 | ||
|
|
b727e2a67a | ||
|
|
8e87319925 | ||
|
|
1ab29b1ab0 | ||
|
|
52d55e34e6 | ||
|
|
c79360f58b | ||
|
|
8057c826bc | ||
|
|
6f6138c500 | ||
|
|
903a18db1d | ||
|
|
0731f3f1a9 | ||
|
|
37047a39f9 | ||
|
|
91d0cbe892 | ||
|
|
b66431bc29 | ||
|
|
0e18b14087 | ||
|
|
31bd413166 | ||
|
|
95a6fce2b4 | ||
|
|
0b5472f9fb | ||
|
|
5280d28505 | ||
|
|
67a9898a99 | ||
|
|
fe8815f80f | ||
|
|
3a21fdc304 | ||
|
|
83d723eb79 | ||
|
|
6e771607c0 | ||
|
|
e73b220104 | ||
|
|
5c1fc43610 | ||
|
|
cfbd7e3bf5 | ||
|
|
c8ca1cfa3c | ||
|
|
5cfbb0a423 | ||
|
|
900ec143a8 | ||
|
|
7bda3d0f74 | ||
|
|
7650786fb5 | ||
|
|
ca60d08621 | ||
|
|
b34218c8c2 | ||
|
|
b14a59629c | ||
|
|
0914bf8cf0 | ||
|
|
7bdca83de3 | ||
|
|
846f03504e | ||
|
|
01e8fd0b07 | ||
|
|
7f301c44b7 | ||
|
|
51a25fdec9 | ||
|
|
2b681c37ac | ||
|
|
cb4ebfdbd2 | ||
|
|
206c85222c | ||
|
|
18071e038e | ||
|
|
39f7ce15ad | ||
|
|
e39b42bbd3 | ||
|
|
607d8f72e8 | ||
|
|
c483f75fb4 | ||
|
|
81f0175251 | ||
|
|
f753519729 | ||
|
|
f39693f97e | ||
|
|
f83ae0e39e | ||
|
|
521d371b5d | ||
|
|
b23d551d00 | ||
|
|
1b20cc6075 | ||
|
|
2043e12ac2 | ||
|
|
9461bc948f | ||
|
|
9740ab8bd6 | ||
|
|
6947a6b1d4 | ||
|
|
4da8036222 | ||
|
|
e6b4006c70 | ||
|
|
8f5f7f1baa | ||
|
|
573d3eea87 | ||
|
|
eb84eec0f4 | ||
|
|
d7a31088ba | ||
|
|
a028e04ab9 | ||
|
|
a0520536df | ||
|
|
af137fd5d3 | ||
|
|
f7bc9f01c9 | ||
|
|
e4ce1ffd85 | ||
|
|
2384b49156 | ||
|
|
f5e71f64ed | ||
|
|
927ef22cf8 | ||
|
|
b6eaec1278 | ||
|
|
c7d1eb71da | ||
|
|
7d41d267a3 | ||
|
|
0ead65ad2d | ||
|
|
8c5481a3d5 | ||
|
|
741258051e | ||
|
|
0f4fc8635b | ||
|
|
d02d3f72fe | ||
|
|
710b69fc75 | ||
|
|
4fae382ffd | ||
|
|
68b94a3188 | ||
|
|
8e04f83232 | ||
|
|
cc9fd9f8ce | ||
|
|
1e8fcf1344 | ||
|
|
809c8305b1 | ||
|
|
652c7e8f37 | ||
|
|
beebca98fe | ||
|
|
ce67abc32f | ||
|
|
52cc482521 | ||
|
|
5eacad444d | ||
|
|
e8155cbbeb | ||
|
|
663376e385 | ||
|
|
3c590994db | ||
|
|
14c8564893 | ||
|
|
91a37f8868 | ||
|
|
1a2ff884b3 | ||
|
|
0298719be0 | ||
|
|
d0746da5e2 | ||
|
|
5b1cf33b1b | ||
|
|
54a1bbd016 | ||
|
|
455cd5551b | ||
|
|
b3e1783658 | ||
|
|
906c83af83 | ||
|
|
f9900cc6fb | ||
|
|
8e20187d8c | ||
|
|
28dac7ff0e | ||
|
|
e385b3d377 | ||
|
|
7e5c68c553 | ||
|
|
39ad7bc741 | ||
|
|
c2f9aab068 | ||
|
|
7e105343e2 | ||
|
|
fe2215df00 | ||
|
|
640bbaabbf | ||
|
|
da2965cb4e | ||
|
|
94ba242c33 | ||
|
|
debd5a5c5e | ||
|
|
98bbb84a63 | ||
|
|
9d908a11ed | ||
|
|
4d599e2f9f | ||
|
|
d3b33e5512 | ||
|
|
c8487cc395 | ||
|
|
0b3b5f6174 |
No files matched your search
@@ -0,0 +1,75 @@
|
||||
---
|
||||
BasedOnStyle: LLVM
|
||||
BreakBeforeBraces: Stroustrup
|
||||
IndentWidth: 4
|
||||
TabWidth: 4
|
||||
AlignAfterOpenBracket: AlwaysBreak
|
||||
AlignConsecutiveMacros: 'true'
|
||||
AlignConsecutiveAssignments: 'false'
|
||||
AlignConsecutiveDeclarations: 'false'
|
||||
AlignEscapedNewlines: Right
|
||||
AlignOperands: 'true'
|
||||
AlignTrailingComments: 'true'
|
||||
AllowAllArgumentsOnNextLine: 'false'
|
||||
AllowAllConstructorInitializersOnNextLine: 'false'
|
||||
AllowAllParametersOfDeclarationOnNextLine: 'false'
|
||||
AllowShortBlocksOnASingleLine: 'true'
|
||||
AllowShortCaseLabelsOnASingleLine: 'false'
|
||||
AllowShortFunctionsOnASingleLine: None
|
||||
AllowShortIfStatementsOnASingleLine: Never
|
||||
AlwaysBreakAfterReturnType: None
|
||||
BinPackArguments: 'false'
|
||||
BinPackParameters: 'false'
|
||||
BreakBeforeBinaryOperators: NonAssignment
|
||||
BreakBeforeTernaryOperators: 'true'
|
||||
BreakConstructorInitializers: BeforeComma
|
||||
BreakInheritanceList: BeforeComma
|
||||
CompactNamespaces: 'false'
|
||||
ConstructorInitializerAllOnOneLineOrOnePerLine: 'true'
|
||||
ConstructorInitializerIndentWidth: '4'
|
||||
ContinuationIndentWidth: '4'
|
||||
Cpp11BracedListStyle: 'false'
|
||||
FixNamespaceComments: 'true'
|
||||
IncludeBlocks: Regroup
|
||||
IndentCaseLabels: 'true'
|
||||
IndentPPDirectives: None
|
||||
IndentWrappedFunctionNames: 'false'
|
||||
KeepEmptyLinesAtTheStartOfBlocks: 'false'
|
||||
MaxEmptyLinesToKeep: '1'
|
||||
NamespaceIndentation: None
|
||||
PointerAlignment: Left
|
||||
ReflowComments: 'true'
|
||||
SortIncludes: 'true'
|
||||
SortUsingDeclarations: 'true'
|
||||
SpaceAfterCStyleCast: 'false'
|
||||
SpaceAfterLogicalNot: 'true'
|
||||
SpaceAfterTemplateKeyword: 'true'
|
||||
SpaceBeforeAssignmentOperators: 'true'
|
||||
SpaceBeforeCpp11BracedList: 'true'
|
||||
SpaceBeforeCtorInitializerColon: 'true'
|
||||
SpaceBeforeInheritanceColon: 'true'
|
||||
SpaceBeforeParens: ControlStatements
|
||||
SpaceBeforeRangeBasedForLoopColon: 'true'
|
||||
SpaceInEmptyParentheses: 'false'
|
||||
SpacesBeforeTrailingComments: '3'
|
||||
SpacesInAngles: 'false'
|
||||
SpacesInCStyleCastParentheses: 'false'
|
||||
SpacesInContainerLiterals: 'true'
|
||||
SpacesInParentheses: 'false'
|
||||
SpacesInSquareBrackets: 'false'
|
||||
UseTab: 'Never'
|
||||
|
||||
---
|
||||
Language: Cpp
|
||||
Standard: Cpp03
|
||||
ColumnLimit: '240'
|
||||
---
|
||||
Language: ObjC
|
||||
ColumnLimit: '240'
|
||||
---
|
||||
Language: Java
|
||||
ColumnLimit: '240'
|
||||
---
|
||||
Language: CSharp
|
||||
ColumnLimit: '240'
|
||||
...
|
||||
@@ -0,0 +1,6 @@
|
||||
CompileFlags:
|
||||
Add:
|
||||
- "-std=c++17"
|
||||
- "-I../ext"
|
||||
- "-I../ext/prometheus-cpp-lite-1.0/core/include"
|
||||
- "-I../ext/prometheus-cpp-lite-1.0/simpleapi/include"
|
||||
Executable → Regular
+49
-78
@@ -1,19 +1,56 @@
|
||||
# Main binaries created in *nix builds
|
||||
/zerotier-one
|
||||
/zerotier-idtool
|
||||
/zerotier-cli
|
||||
/zerotier-selftest
|
||||
/zerotier
|
||||
/nltest
|
||||
|
||||
# OS-created garbage files from various platforms
|
||||
build/
|
||||
/version.h
|
||||
.DS_Store
|
||||
.Trashes
|
||||
*.swp
|
||||
._*
|
||||
*~
|
||||
*~.nib
|
||||
.Apple*
|
||||
Thumbs.db
|
||||
@eaDir
|
||||
._*
|
||||
DerivedData/
|
||||
*.pbxuser
|
||||
*.mode1v3
|
||||
*.mode2v3
|
||||
*.perspectivev3
|
||||
!default.pbxuser
|
||||
!default.mode1v3
|
||||
!default.mode2v3
|
||||
!default.perspectivev3
|
||||
*.xccheckout
|
||||
xcuserdata/
|
||||
.vscode
|
||||
__pycache__
|
||||
attic/world/*.c25519
|
||||
attic/world/mkworld
|
||||
*.log
|
||||
*.opensdf
|
||||
*.user
|
||||
*.cache
|
||||
*.obj
|
||||
*.tlog
|
||||
*.pid
|
||||
*.pkg
|
||||
*.o
|
||||
*.o-*
|
||||
*.core
|
||||
*.deb
|
||||
*.rpm
|
||||
*.autosave
|
||||
*.tmp
|
||||
.depend
|
||||
node_modules
|
||||
debian/files
|
||||
debian/zerotier-one
|
||||
debian/zerotier-one*.debhelper
|
||||
debian/*.log
|
||||
debian/zerotier-one.substvars
|
||||
root/identity.*
|
||||
root/config.*
|
||||
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
|
||||
/go/zerotier
|
||||
|
||||
# Windows build droppings
|
||||
/windows/ZeroTierOne.sdf
|
||||
/windows/ZeroTierOne.v11.suo
|
||||
/windows/x64
|
||||
@@ -32,7 +69,7 @@ Thumbs.db
|
||||
/ext/installfiles/windows/ZeroTier One-SetupFiles
|
||||
/ext/installfiles/windows/Prerequisites
|
||||
/ext/installfiles/windows/*-cache
|
||||
/ZeroTier One.msi
|
||||
/*.msi
|
||||
/windows/.vs
|
||||
*.vcxproj.backup
|
||||
/windows/TapDriver6/Win7Debug
|
||||
@@ -43,47 +80,6 @@ enc_temp_folder
|
||||
/windows/copyutil/bin
|
||||
/windows/copyutil/obj
|
||||
|
||||
# *nix/Mac build droppings
|
||||
/build-*
|
||||
/ZeroTierOneInstaller-*
|
||||
/examples/docker/zerotier-one
|
||||
/examples/docker/test-*.env
|
||||
/world/mkworld
|
||||
/world/*.c25519
|
||||
zt1-src.tar.gz
|
||||
/MacEthernetTapAgent
|
||||
|
||||
# Miscellaneous temporaries, build files, etc.
|
||||
*.log
|
||||
*.opensdf
|
||||
*.user
|
||||
*.cache
|
||||
*.obj
|
||||
*.tlog
|
||||
*.pid
|
||||
*.pkg
|
||||
*.o
|
||||
/*.a
|
||||
*.dylib
|
||||
*.so
|
||||
*.so.*
|
||||
*.o-*
|
||||
*.core
|
||||
*.deb
|
||||
*.rpm
|
||||
*.autosave
|
||||
*.tmp
|
||||
.depend
|
||||
node_modules
|
||||
zt1_update_*
|
||||
debian/files
|
||||
debian/zerotier-one
|
||||
debian/zerotier-one*.debhelper
|
||||
debian/*.log
|
||||
debian/zerotier-one.substvars
|
||||
root-watcher/config.json
|
||||
|
||||
# Java/Android/JNI build droppings
|
||||
java/obj/
|
||||
java/libs/
|
||||
java/bin/
|
||||
@@ -95,28 +91,3 @@ java/build_win32/
|
||||
windows/WinUI/obj/
|
||||
windows/WinUI/bin/
|
||||
windows/ZeroTierOne/Debug/
|
||||
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
|
||||
|
||||
# Miscellaneous mac/Xcode droppings
|
||||
.DS_Store
|
||||
.Trashes
|
||||
*.swp
|
||||
*~.nib
|
||||
DerivedData/
|
||||
build/
|
||||
*.pbxuser
|
||||
*.mode1v3
|
||||
*.mode2v3
|
||||
*.perspectivev3
|
||||
!default.pbxuser
|
||||
!default.mode1v3
|
||||
!default.mode2v3
|
||||
!default.perspectivev3
|
||||
*.xccheckout
|
||||
xcuserdata/
|
||||
ext/librethinkdbxx/build
|
||||
.vscode
|
||||
__pycache__
|
||||
*~
|
||||
attic/world/*.c25519
|
||||
attic/world/mkworld
|
||||
Generated
+3
@@ -0,0 +1,3 @@
|
||||
|
||||
# Default ignored files
|
||||
/workspace.xml
|
||||
Generated
+9
@@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="WEB_MODULE" version="4">
|
||||
<component name="Go" enabled="true" />
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$" />
|
||||
<orderEntry type="inheritedJdk" />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
</component>
|
||||
</module>
|
||||
Generated
+5
@@ -0,0 +1,5 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
|
||||
</state>
|
||||
</component>
|
||||
Generated
+11
@@ -0,0 +1,11 @@
|
||||
<component name="ProjectDictionaryState">
|
||||
<dictionary name="api">
|
||||
<words>
|
||||
<w>apisocket</w>
|
||||
<w>nwid</w>
|
||||
<w>secrand</w>
|
||||
<w>sockaddr</w>
|
||||
<w>unmarshals</w>
|
||||
</words>
|
||||
</dictionary>
|
||||
</component>
|
||||
+10
@@ -0,0 +1,10 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
|
||||
<option name="processCode" value="true" />
|
||||
<option name="processLiterals" value="true" />
|
||||
<option name="processComments" value="true" />
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
Generated
+6
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JavaScriptSettings">
|
||||
<option name="languageLevel" value="ES6" />
|
||||
</component>
|
||||
</project>
|
||||
Generated
+8
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/ZeroTierOne.iml" filepath="$PROJECT_DIR$/.idea/ZeroTierOne.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
Generated
+6
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
Generated
+29
@@ -0,0 +1,29 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectTasksOptions">
|
||||
<TaskOptions isEnabled="true">
|
||||
<option name="arguments" value="fmt $FilePath$" />
|
||||
<option name="checkSyntaxErrors" value="true" />
|
||||
<option name="description" />
|
||||
<option name="exitCodeBehavior" value="ERROR" />
|
||||
<option name="fileExtension" value="go" />
|
||||
<option name="immediateSync" value="false" />
|
||||
<option name="name" value="go fmt" />
|
||||
<option name="output" value="$FilePath$" />
|
||||
<option name="outputFilters">
|
||||
<array />
|
||||
</option>
|
||||
<option name="outputFromStdout" value="false" />
|
||||
<option name="program" value="$GoExecPath$" />
|
||||
<option name="runOnExternalChanges" value="false" />
|
||||
<option name="scopeName" value="Project Files" />
|
||||
<option name="trackOnlyRoot" value="true" />
|
||||
<option name="workingDir" value="$ProjectFileDir$" />
|
||||
<envs>
|
||||
<env name="GOROOT" value="$GOROOT$" />
|
||||
<env name="GOPATH" value="$GOPATH$" />
|
||||
<env name="PATH" value="$GoBinDirs$" />
|
||||
</envs>
|
||||
</TaskOptions>
|
||||
</component>
|
||||
</project>
|
||||
-12
@@ -36,12 +36,6 @@ ZeroTier includes the following third party code, either in ext/ or incorporated
|
||||
* Home page: http://code.google.com/p/lz4/
|
||||
* License grant: BSD 2-clause
|
||||
|
||||
* http-parser by Joyent, Inc. (many authors)
|
||||
|
||||
* Files: ext/http-parser/*
|
||||
* Home page: https://github.com/joyent/http-parser/
|
||||
* License grant: MIT/Expat
|
||||
|
||||
* C++11 json (nlohmann/json) by Niels Lohmann
|
||||
|
||||
* Files: ext/json/*
|
||||
@@ -62,12 +56,6 @@ ZeroTier includes the following third party code, either in ext/ or incorporated
|
||||
* License grant: public domain
|
||||
* ZeroTier Modifications: slight cryptographically-irrelevant modifications for inclusion into ZeroTier core
|
||||
|
||||
* MiniUPNPC and libnatpmp by Thomas Bernard
|
||||
|
||||
* Files: ext/libnatpmp/* ext/miniupnpc/*
|
||||
* Home page: http://miniupnp.free.fr/
|
||||
* License grant: BSD attribution no-endorsement
|
||||
|
||||
* cpp-httplib by yhirose
|
||||
|
||||
* Files: ext/cpp-httplib/*
|
||||
|
||||
+195
-8
@@ -1,12 +1,199 @@
|
||||
# CMake build script for libzerotiercore.a
|
||||
cmake_minimum_required (VERSION 3.10)
|
||||
|
||||
cmake_minimum_required (VERSION 2.8)
|
||||
project (zerotiercore)
|
||||
if(${CMAKE_VERSION} VERSION_LESS 3.15)
|
||||
cmake_policy(VERSION ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION})
|
||||
else()
|
||||
cmake_policy(VERSION 3.15)
|
||||
endif()
|
||||
|
||||
set (PROJ_DIR ${PROJECT_SOURCE_DIR})
|
||||
set (ZT_DEFS -std=c++11)
|
||||
if(WIN32)
|
||||
# If building on Windows, set minimum target to Windows 7
|
||||
set(CMAKE_SYSTEM_VERSION "7" CACHE STRING INTERNAL FORCE)
|
||||
endif(WIN32)
|
||||
|
||||
file(GLOB core_src_glob ${PROJ_DIR}/node/*.cpp)
|
||||
add_library(zerotiercore STATIC ${core_src_glob})
|
||||
set(ZEROTIER_ONE_VERSION_MAJOR 2 CACHE INTERNAL "")
|
||||
set(ZEROTIER_ONE_VERSION_MINOR 0 CACHE INTERNAL "")
|
||||
set(ZEROTIER_ONE_VERSION_REVISION 0 CACHE INTERNAL "")
|
||||
set(ZEROTIER_ONE_VERSION_BUILD 0 CACHE INTERNAL "")
|
||||
|
||||
target_compile_options(zerotiercore PRIVATE ${ZT_DEFS})
|
||||
set(default_build_type "Release")
|
||||
if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
|
||||
set(default_build_type "Debug")
|
||||
endif()
|
||||
|
||||
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
|
||||
message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
|
||||
set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE
|
||||
STRING "Choose the type of build." FORCE)
|
||||
# Set the possible values of build type for cmake-gui
|
||||
set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
|
||||
"Debug" "Release" "MinSizeRel" "RelWithDebInfo")
|
||||
endif()
|
||||
|
||||
option(BUILD_CENTRAL_CONTROLLER "Build ZeroTier Central Controller" OFF)
|
||||
option(ZT_TRACE "Trace Messages" OFF)
|
||||
option(ZT_DEBUG_TRACE "Debug Trace Messages" OFF)
|
||||
|
||||
if (BUILD_CENTRAL_CONTROLLER)
|
||||
find_package(PostgreSQL REQUIRED)
|
||||
set(ENABLE_SSL_SUPPORT OFF)
|
||||
set(BUILD_SHARED_LIBS OFF)
|
||||
set(BUILD_EXAMPLES OFF)
|
||||
set(BUILD_TOOLS OFF)
|
||||
set(BUILD_TESTS OFF)
|
||||
set(BUILD_API_DOCS OFF)
|
||||
add_subdirectory("ext/librabbitmq")
|
||||
endif(BUILD_CENTRAL_CONTROLLER)
|
||||
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X Deployment Version")
|
||||
|
||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
add_definitions(-DZT_TRACE)
|
||||
endif(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||
|
||||
project(zerotier
|
||||
DESCRIPTION "ZeroTier Network Hypervisor"
|
||||
LANGUAGES CXX C)
|
||||
|
||||
if(WIN32)
|
||||
add_definitions(-DNOMINMAX)
|
||||
else(WIN32)
|
||||
if(APPLE)
|
||||
|
||||
message("Setting macOS Compiler Flags ${CMAKE_BUILD_TYPE}")
|
||||
add_compile_options(
|
||||
-Wall
|
||||
-Wno-deprecated
|
||||
-mmacosx-version-min=10.9
|
||||
$<$<CONFIG:Debug>:-g>
|
||||
$<$<CONFIG:DEBUG>:-O0>
|
||||
$<$<CONFIG:RELEASE>:-Ofast>
|
||||
$<$<CONFIG:RELEASE>:-fPIE>
|
||||
$<$<CONFIG:RELEASE>:-flto>
|
||||
$<$<CONFIG:RELWITHDEBINFO>:-Ofast>
|
||||
$<$<CONFIG:RELWITHDEBINFO>:-fPIE>
|
||||
$<$<CONFIG:RELWITHDEBINFO>:-g>
|
||||
)
|
||||
add_link_options(
|
||||
-mmacosx-version-min=10.9
|
||||
$<$<CONFIG:RELEASE>:-flto>
|
||||
)
|
||||
|
||||
elseif (
|
||||
CMAKE_SYSTEM_NAME MATCHES "Linux" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "OpenBSD" OR
|
||||
CMAKE_SYSTEM_NAME MATCHES "NetBSD"
|
||||
)
|
||||
|
||||
message("Setting Linux/BSD Compiler Flags (${CMAKE_BUILD_TYPE})")
|
||||
add_compile_options(
|
||||
-Wall
|
||||
-Wno-deprecated
|
||||
$<$<CONFIG:Debug>:-g>
|
||||
$<$<CONFIG:DEBUG>:-O0>
|
||||
$<$<CONFIG:RELEASE>:-O3>
|
||||
$<$<CONFIG:RELEASE>:-fPIE>
|
||||
$<$<CONFIG:RELWITHDEBINFO>:-O3>
|
||||
$<$<CONFIG:RELWITHDEBINFO>:-fPIE>
|
||||
$<$<CONFIG:RELWITHDEBINFO>:-g>
|
||||
)
|
||||
|
||||
endif(APPLE)
|
||||
endif(WIN32)
|
||||
|
||||
if (
|
||||
CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64" OR
|
||||
CMAKE_SYSTEM_PROCESSOR MATCHES "amd64" OR
|
||||
CMAKE_SYSTEM_PROCESSOR MATCHES "i386" OR
|
||||
CMAKE_SYSTEM_PROCESSOR MATCHES "i486" OR
|
||||
CMAKE_SYSTEM_PROCESSOR MATCHES "i586" OR
|
||||
CMAKE_SYSTEM_PROCESSOR MATCHES "i686"
|
||||
)
|
||||
message("Adding SSE and AES-NI flags for processor ${CMAKE_SYSTEM_PROCESSOR}")
|
||||
add_compile_options(
|
||||
-maes
|
||||
-mmmx
|
||||
-mrdrnd
|
||||
-mpclmul
|
||||
-msse
|
||||
-msse2
|
||||
-msse3
|
||||
-msse4.1
|
||||
)
|
||||
endif()
|
||||
|
||||
if(ZT_TRACE)
|
||||
add_definitions(-DZT_TRACE)
|
||||
endif()
|
||||
if(ZT_DEBUG_TRACE)
|
||||
add_definitions(-DZT_DEBUG_TRACE)
|
||||
endif()
|
||||
|
||||
add_subdirectory(node)
|
||||
add_subdirectory(controller)
|
||||
add_subdirectory(osdep)
|
||||
add_subdirectory(go/native)
|
||||
|
||||
#if(WIN32)
|
||||
# add_subdirectory("windows/WinUI")
|
||||
# add_subdirectory("windows/copyutil")
|
||||
# add_definitions(-DNOMINMAX)
|
||||
#endif(WIN32)
|
||||
|
||||
set(
|
||||
zt_osdep
|
||||
zt_core
|
||||
zt_controller
|
||||
zt_go_native
|
||||
)
|
||||
|
||||
configure_file(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/version.h.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/version.h
|
||||
)
|
||||
|
||||
#set(src
|
||||
# one.cpp
|
||||
# "ext/http-parser/http_parser.c"
|
||||
#)
|
||||
#set(headers
|
||||
# "ext/http-parser/http_parser.h"
|
||||
#)
|
||||
|
||||
if(WIN32)
|
||||
set(libs ${libs} wsock32 ws2_32 rpcrt4 iphlpapi)
|
||||
else(WIN32)
|
||||
set(libs ${libs} pthread)
|
||||
endif(WIN32)
|
||||
|
||||
#if(WIN32)
|
||||
# set(libs ${libs} wsock32 ws2_32 rpcrt4 iphlpapi)
|
||||
# set(src
|
||||
# ${src}
|
||||
# "windows/ZeroTierOne/ServiceBase.cpp"
|
||||
# "windows/ZeroTierOne/ServiceInstaller.cpp"
|
||||
# "windows/ZeroTierOne/ZeroTierOneService.cpp"
|
||||
# "windows/ZeroTierOne/ZeroTierOne.rc"
|
||||
# )
|
||||
# set(headers
|
||||
# ${headers}
|
||||
# "windows/ZeroTierOne/ServiceBase.h"
|
||||
# "windows/ZeroTierOne/ServiceInstaller.h"
|
||||
# "windows/ZeroTierOne/ZeroTierOneService.h"
|
||||
# )
|
||||
#else(WIN32)
|
||||
# set(libs ${libs} pthread resolv)
|
||||
#endif(WIN32)
|
||||
|
||||
#if(BUILD_CENTRAL_CONTROLLER)
|
||||
# set(libs ${libs} rabbitmq-static ${PostgreSQL_LIBRARIES})
|
||||
#endif(BUILD_CENTRAL_CONTROLLER)
|
||||
|
||||
#add_executable(${PROJECT_NAME} ${src} ${headers})
|
||||
#target_link_libraries(${PROJECT_NAME} ${libs})
|
||||
#target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_BINARY_DIR})
|
||||
|
||||
add_executable(zerotier-selftest selftest.cpp)
|
||||
target_link_libraries(zerotier-selftest ${libs} zt_core zt_osdep)
|
||||
target_compile_features(zerotier-selftest PUBLIC cxx_std_11)
|
||||
Vendored
+7
-1
@@ -14,7 +14,13 @@ parallel 'centos7': {
|
||||
checkout scm
|
||||
|
||||
stage('Build Centos 7') {
|
||||
sh 'make -f make-linux.mk'
|
||||
sh '''. /opt/rh/devtoolset-8/enable
|
||||
rm -rf build/
|
||||
mkdir build && cd build
|
||||
cmake ..
|
||||
make -j4
|
||||
./zerotier-selftest
|
||||
'''
|
||||
}
|
||||
}
|
||||
catch (err) {
|
||||
|
||||
@@ -1,28 +1,20 @@
|
||||
# Common makefile -- loads make rules for each platform
|
||||
|
||||
OSTYPE=$(shell uname -s)
|
||||
BUILDDIR := build
|
||||
|
||||
ifeq ($(OSTYPE),Darwin)
|
||||
include make-mac.mk
|
||||
endif
|
||||
.PHONY: all
|
||||
|
||||
ifeq ($(OSTYPE),Linux)
|
||||
include make-linux.mk
|
||||
endif
|
||||
all: setup
|
||||
cd ${BUILDDIR} && $(MAKE) -j$(shell getconf _NPROCESSORS_ONLN)
|
||||
|
||||
ifeq ($(OSTYPE),FreeBSD)
|
||||
CC=clang
|
||||
CXX=clang++
|
||||
ZT_BUILD_PLATFORM=7
|
||||
include make-bsd.mk
|
||||
endif
|
||||
ifeq ($(OSTYPE),OpenBSD)
|
||||
CC=egcc
|
||||
CXX=eg++
|
||||
ZT_BUILD_PLATFORM=9
|
||||
include make-bsd.mk
|
||||
endif
|
||||
setup:
|
||||
mkdir -p ${BUILDDIR} && cd ${BUILDDIR} && cmake .. -DCMAKE_BUILD_TYPE=Release
|
||||
|
||||
ifeq ($(OSTYPE),NetBSD)
|
||||
include make-netbsd.mk
|
||||
endif
|
||||
debug:
|
||||
mkdir -p ${BUILDDIR} && cd ${BUILDDIR} && cmake .. -DCMAKE_BUILD_TYPE=Debug && $(MAKE)
|
||||
|
||||
clean:
|
||||
rm -rf ${BUILDDIR}
|
||||
|
||||
distclean:
|
||||
rm -rf ${BUILDDIR}
|
||||
@@ -54,6 +54,12 @@
|
||||
#include "Phy.hpp"
|
||||
#include "OSUtils.hpp"
|
||||
|
||||
#if (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__))
|
||||
#define ZT_UDP_DESIRED_BUF_SIZE 1048576
|
||||
#else
|
||||
#define ZT_UDP_DESIRED_BUF_SIZE 131072
|
||||
#endif
|
||||
|
||||
// Period between refreshes of bindings
|
||||
#define ZT_BINDER_REFRESH_PERIOD 30000
|
||||
|
||||
File renamed without changes.
File renamed without changes.
@@ -48,6 +48,7 @@
|
||||
#include <sys/un.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <netinet/in.h>
|
||||
#include <netinet/ip6.h>
|
||||
#include <netinet/tcp.h>
|
||||
|
||||
#if defined(__linux__) || defined(linux) || defined(__LINUX__) || defined(__linux)
|
||||
Loaded 20 of 531 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user