mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2025-04-26 08:57:26 +02:00
Compare commits
No commits in common. "dev" and "v1.1.5-live-roots" have entirely different histories.
dev
...
v1.1.5-liv
2137 changed files with 120581 additions and 436040 deletions
|
@ -1,75 +0,0 @@
|
||||||
---
|
|
||||||
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: 'Always'
|
|
||||||
|
|
||||||
---
|
|
||||||
Language: Cpp
|
|
||||||
Standard: Cpp03
|
|
||||||
ColumnLimit: '240'
|
|
||||||
---
|
|
||||||
Language: ObjC
|
|
||||||
ColumnLimit: '240'
|
|
||||||
---
|
|
||||||
Language: Java
|
|
||||||
ColumnLimit: '240'
|
|
||||||
---
|
|
||||||
Language: CSharp
|
|
||||||
ColumnLimit: '240'
|
|
||||||
...
|
|
6
.clangd
6
.clangd
|
@ -1,6 +0,0 @@
|
||||||
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"
|
|
|
@ -1,2 +0,0 @@
|
||||||
.git/
|
|
||||||
workspace/
|
|
256
.drone.jsonnet
256
.drone.jsonnet
|
@ -1,256 +0,0 @@
|
||||||
//
|
|
||||||
// tweakables
|
|
||||||
//
|
|
||||||
|
|
||||||
local registry = "084037375216.dkr.ecr.us-east-2.amazonaws.com";
|
|
||||||
local build_channel = "zerotier-builds";
|
|
||||||
local release_channel = "zerotier-releases";
|
|
||||||
|
|
||||||
local targets = [
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el9", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el8", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el7", "isas": [ "386", "amd64", "ppc64le"], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "amazon", "name": "amzn2", "isas": [ "amd64", "arm64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "amazon", "name": "amzn2022", "isas": [ "amd64", "arm64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "fedora", "name": "fc38", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "fedora", "name": "fc37", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "fedora", "name": "fc36", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "jammy", "isas": [ "armv7", "amd64", "arm64", "ppc64le", "s390x", "riscv64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "focal", "isas": [ "armv7", "amd64", "arm64", "ppc64le", "s390x", "riscv64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "bionic", "isas": [ "386", "armv7", "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "xenial", "isas": [ "386", "armv7", "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "trusty", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "bookworm", "isas": [ "386", "armv7", "amd64", "arm64", "mips64le", "ppc64le", "s390x" ], "events": [ "tag"] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "bullseye", "isas": [ "386", "armv7", "amd64", "arm64", "mips64le", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "buster", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "stretch", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "tag" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "jessie", "isas": [ "386", "armv7", "amd64" ], "events": [ "tag" ] },
|
|
||||||
|
|
||||||
// { "os": "windows", distro: "windows", "name": "windows", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
// { "os": "darwin", distro: "darwin", "name": "darwin", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
|
|
||||||
];
|
|
||||||
|
|
||||||
local less_targets = [
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el9", "isas": [ "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el8", "isas": [ "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "jammy", "isas": [ "armv7", "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "focal", "isas": [ "armv7", "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
];
|
|
||||||
|
|
||||||
|
|
||||||
local native_targets = [
|
|
||||||
{ "os": "linux", distro: "debian", "name": "bullseye", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
];
|
|
||||||
|
|
||||||
local master_targets = [
|
|
||||||
//
|
|
||||||
// copypasta from here
|
|
||||||
//
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el9", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el8", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "redhat", "name": "el7", "isas": [ "386", "amd64", "ppc64le"], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "amazon", "name": "amzn2", "isas": [ "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "amazon", "name": "amzn2022", "isas": [ "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "fedora", "name": "fc38", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "fedora", "name": "fc37", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "fedora", "name": "fc36", "isas": [ "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "jammy", "isas": [ "armv7", "amd64", "arm64", "ppc64le", "s390x", "riscv64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "focal", "isas": [ "armv7", "amd64", "arm64", "ppc64le", "s390x", "riscv64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "bionic", "isas": [ "386", "armv7", "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "xenial", "isas": [ "386", "armv7", "amd64", "arm64", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "ubuntu", "name": "trusty", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "sid", "isas": [ "386", "armv7", "amd64", "arm64", "mips64le", "ppc64le", "s390x", "riscv64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "bookworm", "isas": [ "386", "armv7", "amd64", "arm64", "mips64le", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "bullseye", "isas": [ "386", "armv7", "amd64", "arm64", "mips64le", "ppc64le", "s390x" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "buster", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "stretch", "isas": [ "386", "armv7", "amd64", "arm64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "linux", distro: "debian", "name": "jessie", "isas": [ "386", "armv7", "amd64" ], "events": [ "push", "tag", "custom" ] },
|
|
||||||
{ "os": "windows", distro: "windows", "name": "win2k22", "isas": [ "amd64" ], "events": [ "push", "tag", "custom" ] }
|
|
||||||
];
|
|
||||||
|
|
||||||
//
|
|
||||||
// functions
|
|
||||||
//
|
|
||||||
|
|
||||||
local pipeline_type(os) = if os == "darwin" then "exec" else "docker";
|
|
||||||
local builder_image(os) = if os == "linux" then registry + "/honda-builder" else registry + "/windows-builder";
|
|
||||||
local tester_image(os) = if os == "linux" then registry + "/honda-builder" else registry + "/windows-tester";
|
|
||||||
local build_step_volumes(os) = if os == "linux" then [ { name: "zerotier-builds", path: "/zerotier-builds" } ] else [];
|
|
||||||
local release_step_volumes(os) = if os == "linux" then [ { name: "zerotier-releases", path: "/zerotier-releases" } ] else [];
|
|
||||||
local host_volumes(os) = if os == "linux" then [
|
|
||||||
{ name: "zerotier-builds", host: { path: "/zerotier-builds" } },
|
|
||||||
{ name: "zerotier-releases", host: { path: "/zerotier-releases" } },
|
|
||||||
] else [];
|
|
||||||
|
|
||||||
local index_image(distro) =
|
|
||||||
if distro == "debian" || distro == "ubuntu" then
|
|
||||||
registry + "/apt-builder"
|
|
||||||
else if distro == "redhat" || distro == "fedora" || distro == "amazon" then
|
|
||||||
registry + "/dnf-builder"
|
|
||||||
else if distro == "windows" then
|
|
||||||
registry + "/msi-builder"
|
|
||||||
;
|
|
||||||
|
|
||||||
local copy_commands(os, distro, name, isa, version) =
|
|
||||||
if os == "linux" then [
|
|
||||||
std.join(" ", [ "./ci/scripts/publish.sh", name, distro, isa, version, "${DRONE_BUILD_EVENT}" ])
|
|
||||||
]
|
|
||||||
else if os == "windows" then [
|
|
||||||
"C:\\scripts\\fix-ec2-metadata.ps1",
|
|
||||||
"Get-ChildItem windows",
|
|
||||||
// "aws s3 cp windows\\bytey-SetupFiles\\bytey.msi s3://zerotier-builds/windows/" + version + "/bytey.msi",
|
|
||||||
] else if os == "darwin" then [
|
|
||||||
"echo hello"
|
|
||||||
]
|
|
||||||
;
|
|
||||||
|
|
||||||
local index_commands(os, channel, distro, name, isas) =
|
|
||||||
if os == "linux" then
|
|
||||||
[ "/usr/local/bin/index " + channel + " " + distro + " " + name + " " + std.join(" ", isas) ]
|
|
||||||
else if os == "windows" then
|
|
||||||
[ "Get-ChildItem -Recurse windows" ]
|
|
||||||
;
|
|
||||||
|
|
||||||
local build_commands(os, distro, name, isa, version) =
|
|
||||||
if os == "linux" then
|
|
||||||
[ std.join(" ", [ "./ci/scripts/build.sh", name, distro, isa, version, "${DRONE_BUILD_EVENT}" ]) ]
|
|
||||||
else
|
|
||||||
if os == "windows" then
|
|
||||||
[ "windows/build.ps1", "windows/package.ps1" ]
|
|
||||||
else
|
|
||||||
if os == "darwin" then
|
|
||||||
[ "whoami" ]
|
|
||||||
;
|
|
||||||
|
|
||||||
local test_commands(os, distro, name, isa, version) =
|
|
||||||
if os == "linux" then
|
|
||||||
[ std.join(" ", [ "./ci/scripts/test.sh", name, distro, isa, version, "${DRONE_BUILD_EVENT}" ]) ]
|
|
||||||
else
|
|
||||||
if os == "windows" then
|
|
||||||
[ "windows/testpackage.ps1 " + version ]
|
|
||||||
;
|
|
||||||
|
|
||||||
//
|
|
||||||
// render
|
|
||||||
//
|
|
||||||
|
|
||||||
local Build(os, distro, name, isa, events) = {
|
|
||||||
"kind": "pipeline",
|
|
||||||
"type": pipeline_type(os),
|
|
||||||
"name": std.join(" ", [ name, isa, "build" ]),
|
|
||||||
"pull": "always",
|
|
||||||
"clone": { "depth": 1, [ if os == "darwin" then "disable" ]: true },
|
|
||||||
"steps": [
|
|
||||||
{
|
|
||||||
"name": "build",
|
|
||||||
"image": builder_image(os),
|
|
||||||
"commands": build_commands(os, distro, name, isa, "100.0.0+${DRONE_COMMIT_SHA:0:8}"),
|
|
||||||
"when": { "event": [ "push" ]},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "release",
|
|
||||||
"image": builder_image(os),
|
|
||||||
"commands": build_commands(os, distro, name, isa, "${DRONE_TAG}"),
|
|
||||||
"when": { "event": [ "tag" ]},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "copy build",
|
|
||||||
"image": builder_image(os),
|
|
||||||
"commands": copy_commands(os, distro, name, isa, "100.0.0+${DRONE_COMMIT_SHA:0:8}"),
|
|
||||||
"volumes": build_step_volumes(os),
|
|
||||||
"when": { "event": [ "push" ]},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "copy relase",
|
|
||||||
"image": builder_image(os),
|
|
||||||
"commands": copy_commands(os, distro, name, isa, "${DRONE_TAG}"),
|
|
||||||
"volumes": release_step_volumes(os),
|
|
||||||
"when": { "event": [ "tag" ]},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
"volumes": host_volumes(os),
|
|
||||||
"platform": { "os": os, [ if isa == "arm64" || isa == "armv7" then "arch" ]: "arm64" },
|
|
||||||
"trigger": { "event": events }
|
|
||||||
};
|
|
||||||
|
|
||||||
local Test(os, distro, name, isa, events) = {
|
|
||||||
"kind": "pipeline",
|
|
||||||
"type": pipeline_type(os),
|
|
||||||
"name": std.join(" ", [ name, isa, "test"]),
|
|
||||||
"pull": "always",
|
|
||||||
"clone": { "depth": 1 },
|
|
||||||
"steps": [
|
|
||||||
{
|
|
||||||
"name": "test build",
|
|
||||||
"image": tester_image(os),
|
|
||||||
"volumes": build_step_volumes(os),
|
|
||||||
"commands": test_commands(os, distro, name, isa, "100.0.0+${DRONE_COMMIT_SHA:0:8}"),
|
|
||||||
"when": { "event": [ "push" ]},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "test release",
|
|
||||||
"image": tester_image(os),
|
|
||||||
"volumes": release_step_volumes(os),
|
|
||||||
"commands": test_commands(os, distro, name, isa, "${DRONE_TAG}"),
|
|
||||||
"when": { "event": [ "tag" ]},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
"volumes": host_volumes(os),
|
|
||||||
"platform": { "os": os, [ if isa == "arm64" || isa == "armv7" then "arch" ]: "arm64" },
|
|
||||||
"depends_on": [ std.join(" ", [ name, "index" ]) ],
|
|
||||||
"trigger": { "event": events }
|
|
||||||
};
|
|
||||||
|
|
||||||
local Index(p) = {
|
|
||||||
"kind": "pipeline",
|
|
||||||
"type": pipeline_type(p.os),
|
|
||||||
"name": std.join(" ", [ p.name, "index" ]),
|
|
||||||
"pull": "always",
|
|
||||||
"clone": { "depth": 1 },
|
|
||||||
"steps": [
|
|
||||||
{
|
|
||||||
"name": "index build",
|
|
||||||
"image": index_image(p.distro),
|
|
||||||
"commands": index_commands(p.os, "zerotier-builds", p.distro, p.name, p.isas),
|
|
||||||
"volumes": build_step_volumes(p.os),
|
|
||||||
"environment":{ "GPG_PRIVATE_KEY": { from_secret: "gpg-private-key" }},
|
|
||||||
"when": { "event": [ "push" ]},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "index release",
|
|
||||||
"image": index_image(p.distro),
|
|
||||||
"commands": index_commands(p.os, "zerotier-releases", p.distro, p.name, p.isas),
|
|
||||||
"volumes": release_step_volumes(p.os),
|
|
||||||
"environment":{ "GPG_PRIVATE_KEY": { from_secret: "gpg-private-key" }},
|
|
||||||
"when": { "event": [ "tag" ]},
|
|
||||||
},
|
|
||||||
],
|
|
||||||
"volumes": host_volumes(p.os),
|
|
||||||
"platform": { "os": p.os },
|
|
||||||
depends_on: std.flattenArrays([ [ std.join(" ", [ p.name, isa, "build" ]) ] for isa in p.isas ]),
|
|
||||||
"trigger": { "event": p.events }
|
|
||||||
};
|
|
||||||
|
|
||||||
//
|
|
||||||
// print
|
|
||||||
//
|
|
||||||
|
|
||||||
std.flattenArrays([
|
|
||||||
[
|
|
||||||
Build(p.os, p.distro, p.name, isa, p.events)
|
|
||||||
for isa in p.isas
|
|
||||||
] +
|
|
||||||
[
|
|
||||||
Index(p)
|
|
||||||
]
|
|
||||||
for p in native_targets
|
|
||||||
]) +
|
|
||||||
std.flattenArrays([
|
|
||||||
[
|
|
||||||
Test(p.os, p.distro, p.name, isa, p.events)
|
|
||||||
for isa in p.isas
|
|
||||||
]
|
|
||||||
for p in native_targets
|
|
||||||
])
|
|
||||||
|
|
465
.drone.yml
465
.drone.yml
|
@ -1,465 +0,0 @@
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye 386 build
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: build
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian 386 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: release
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian 386 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy relase
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye armv7 build
|
|
||||||
platform:
|
|
||||||
arch: arm64
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: build
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian armv7 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: release
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian armv7 100.0.0+${DRONE_COMMIT_SHA:0:8}
|
|
||||||
${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian armv7 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy relase
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye amd64 build
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: build
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: release
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian amd64 100.0.0+${DRONE_COMMIT_SHA:0:8}
|
|
||||||
${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy relase
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye arm64 build
|
|
||||||
platform:
|
|
||||||
arch: arm64
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: build
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/build.sh bullseye debian arm64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: release
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian arm64 100.0.0+${DRONE_COMMIT_SHA:0:8}
|
|
||||||
${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/publish.sh bullseye debian arm64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: copy relase
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
depends_on:
|
|
||||||
- bullseye 386 build
|
|
||||||
- bullseye armv7 build
|
|
||||||
- bullseye amd64 build
|
|
||||||
- bullseye arm64 build
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye index
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- /usr/local/bin/index zerotier-builds debian bullseye 386 armv7 amd64 arm64
|
|
||||||
environment:
|
|
||||||
GPG_PRIVATE_KEY:
|
|
||||||
from_secret: gpg-private-key
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder
|
|
||||||
name: index build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- /usr/local/bin/index zerotier-releases debian bullseye 386 armv7 amd64 arm64
|
|
||||||
environment:
|
|
||||||
GPG_PRIVATE_KEY:
|
|
||||||
from_secret: gpg-private-key
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/apt-builder
|
|
||||||
name: index release
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
depends_on:
|
|
||||||
- bullseye index
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye 386 test
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian 386 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian 386 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test release
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
depends_on:
|
|
||||||
- bullseye index
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye armv7 test
|
|
||||||
platform:
|
|
||||||
arch: arm64
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian armv7 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian armv7 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test release
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
depends_on:
|
|
||||||
- bullseye index
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye amd64 test
|
|
||||||
platform:
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian amd64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian amd64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test release
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
clone:
|
|
||||||
depth: 1
|
|
||||||
depends_on:
|
|
||||||
- bullseye index
|
|
||||||
kind: pipeline
|
|
||||||
name: bullseye arm64 test
|
|
||||||
platform:
|
|
||||||
arch: arm64
|
|
||||||
os: linux
|
|
||||||
pull: always
|
|
||||||
steps:
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian arm64 100.0.0+${DRONE_COMMIT_SHA:0:8} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test build
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-builds
|
|
||||||
path: /zerotier-builds
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- commands:
|
|
||||||
- ./ci/scripts/test.sh bullseye debian arm64 ${DRONE_TAG} ${DRONE_BUILD_EVENT}
|
|
||||||
image: 084037375216.dkr.ecr.us-east-2.amazonaws.com/honda-builder
|
|
||||||
name: test release
|
|
||||||
volumes:
|
|
||||||
- name: zerotier-releases
|
|
||||||
path: /zerotier-releases
|
|
||||||
when:
|
|
||||||
event:
|
|
||||||
- tag
|
|
||||||
trigger:
|
|
||||||
event:
|
|
||||||
- push
|
|
||||||
- tag
|
|
||||||
- custom
|
|
||||||
type: docker
|
|
||||||
volumes:
|
|
||||||
- host:
|
|
||||||
path: /zerotier-builds
|
|
||||||
name: zerotier-builds
|
|
||||||
- host:
|
|
||||||
path: /zerotier-releases
|
|
||||||
name: zerotier-releases
|
|
||||||
---
|
|
||||||
kind: signature
|
|
||||||
hmac: 887a3ef78d3fe8f0149911e1e4876401dd7dd313b36eb893e791fa42f45d7768
|
|
||||||
|
|
||||||
...
|
|
4
.gitattributes
vendored
4
.gitattributes
vendored
|
@ -1,4 +0,0 @@
|
||||||
ext/bin/tap-windows-ndis6/x64/zttap300.inf eol=crlf
|
|
||||||
ext/bin/tap-windows-ndis6/x64.old/zttap300.inf eol=crlf
|
|
||||||
ext/bin/tap-windows-ndis6/x86/zttap300.inf eol=crlf
|
|
||||||
windows/TapDriver6/zttap300.inf eol=crlf
|
|
31
.github/ISSUE_TEMPLATE/bugs-and-issues.md
vendored
31
.github/ISSUE_TEMPLATE/bugs-and-issues.md
vendored
|
@ -1,31 +0,0 @@
|
||||||
---
|
|
||||||
name: Bugs and Issues
|
|
||||||
about: Create a report to help us improve
|
|
||||||
title: ''
|
|
||||||
labels: NEEDS TRIAGE
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# Before filing a Bug Report
|
|
||||||
|
|
||||||
_Using these will ensure you get quicker support, and make this space available for code-related issues. Thank you!_
|
|
||||||
|
|
||||||
- [Docs Site](https://docs.zerotier.com/zerotier/troubleshooting) => Troubleshooting, quickstarts, and more advanced topics.
|
|
||||||
- [Discuss Forum](https://discuss.zerotier.com/) => Our discussion forum for users and support to mutually resolve issues & suggest ideas.
|
|
||||||
- [Reddit](https://www.reddit.com/r/zerotier/) => Our subreddit, which we monitor regularly and is fairly active.
|
|
||||||
- [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview) => Older wiki.
|
|
||||||
|
|
||||||
If you are having a connection issue, it's much easier to diagnose through the discussion forum or the ticket system.
|
|
||||||
|
|
||||||
|
|
||||||
# If you still want to file a Bug Report
|
|
||||||
|
|
||||||
## Please let us know
|
|
||||||
|
|
||||||
- What you expect to be happening.
|
|
||||||
- What is actually happening?
|
|
||||||
- Any steps to reproduce the error.
|
|
||||||
- Any relevant console output or screenshots.
|
|
||||||
- What operating system and ZeroTier version. Please try the latest ZeroTier release.
|
|
||||||
|
|
13
.github/ISSUE_TEMPLATE/feature_request.md
vendored
13
.github/ISSUE_TEMPLATE/feature_request.md
vendored
|
@ -1,13 +0,0 @@
|
||||||
---
|
|
||||||
name: Feature request
|
|
||||||
about: Suggest an idea for this project
|
|
||||||
title: "[Feature Request] "
|
|
||||||
labels: suggestion
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
If there is something you'd like to have added to ZeroTier, to go to https://discuss.zerotier.com/c/feature-requests/ instead. Issues there can be voted on and discussed in-depth.
|
|
||||||
|
|
||||||
|
|
||||||
Thank you!
|
|
15
.github/ISSUE_TEMPLATE/game-connection-issue.md
vendored
15
.github/ISSUE_TEMPLATE/game-connection-issue.md
vendored
|
@ -1,15 +0,0 @@
|
||||||
---
|
|
||||||
name: Game Connection Issue
|
|
||||||
about: Game issues are better served by forum posts
|
|
||||||
title: Please go to our Discuss or Reddit for game-related issues. Thanks!
|
|
||||||
labels: wontfix
|
|
||||||
assignees: ''
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Are you having trouble connecting to a game on your virtual network after installing ZeroTier?
|
|
||||||
|
|
||||||
- [ ] Yes
|
|
||||||
- [ ] No
|
|
||||||
|
|
||||||
If you answered yes, then it is very likely that your question would be better answered on our [Community Forums](https://discuss.zerotier.com) or [Reddit](https://www.reddit.com/r/zerotier/) community; we monitor both regularly. We also have extensive documentation on our [Knowledge Base](https://zerotier.atlassian.net/wiki/spaces/SD/overview). Thank you!
|
|
126
.github/workflows/build.yml
vendored
126
.github/workflows/build.yml
vendored
|
@ -1,126 +0,0 @@
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build_ubuntu:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: gitconfig
|
|
||||||
run: |
|
|
||||||
git config --global core.autocrlf input
|
|
||||||
# git config --global core.eol lf
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Install Rust
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
targets: x86_64-unknown-linux-gnu
|
|
||||||
components: rustfmt, clippy
|
|
||||||
|
|
||||||
- name: Set up cargo cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
continue-on-error: false
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
|
|
||||||
shared-key: ${{ runner.os }}-cargo-
|
|
||||||
workspaces: |
|
|
||||||
rustybits/
|
|
||||||
|
|
||||||
- name: make
|
|
||||||
run: make
|
|
||||||
- name: selftest
|
|
||||||
run: |
|
|
||||||
make selftest
|
|
||||||
./zerotier-selftest
|
|
||||||
- name: 'Tar files' # keeps permissions (execute)
|
|
||||||
run: tar -cvf zerotier-one.tar zerotier-one
|
|
||||||
- name: Archive production artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: zerotier-one-ubuntu-x64
|
|
||||||
path: zerotier-one.tar
|
|
||||||
retention-days: 7
|
|
||||||
|
|
||||||
build_macos:
|
|
||||||
runs-on: macos-latest
|
|
||||||
steps:
|
|
||||||
- name: gitconfig
|
|
||||||
run: |
|
|
||||||
git config --global core.autocrlf input
|
|
||||||
# git config --global core.eol lf
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Install Rust aarch64
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
target: aarch64-apple-darwin
|
|
||||||
components: rustfmt, clippy
|
|
||||||
- name: Install Rust x86_64
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
target: x86_64-apple-darwin
|
|
||||||
components: rustfmt, clippy
|
|
||||||
- name: Set up cargo cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
continue-on-error: false
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
|
|
||||||
shared-key: ${{ runner.os }}-cargo-
|
|
||||||
workspaces: |
|
|
||||||
rustybits/
|
|
||||||
- name: make
|
|
||||||
run: make
|
|
||||||
- name: selftest
|
|
||||||
run: |
|
|
||||||
make selftest
|
|
||||||
./zerotier-selftest
|
|
||||||
- name: 'Tar files' # keeps permissions (execute)
|
|
||||||
run: tar -cvf zerotier-one.tar zerotier-one
|
|
||||||
- name: Archive production artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: zerotier-one-mac
|
|
||||||
path: zerotier-one.tar
|
|
||||||
retention-days: 7
|
|
||||||
|
|
||||||
|
|
||||||
build_windows:
|
|
||||||
runs-on: windows-latest
|
|
||||||
steps:
|
|
||||||
- name: gitconfig
|
|
||||||
run: |
|
|
||||||
git config --global core.autocrlf true
|
|
||||||
# git config --global core.eol lf
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
- name: Install Rust
|
|
||||||
uses: dtolnay/rust-toolchain@stable
|
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
target: aarch64-apple-darwin
|
|
||||||
components: rustfmt, clippy
|
|
||||||
- name: Set up cargo cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
continue-on-error: false
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}-cargo-${{ hashFiles('rustybits//Cargo.lock') }}
|
|
||||||
shared-key: ${{ runner.os }}-cargo-
|
|
||||||
workspaces: |
|
|
||||||
rustybits/
|
|
||||||
|
|
||||||
- name: setup msbuild
|
|
||||||
uses: microsoft/setup-msbuild@v2
|
|
||||||
- name: msbuild
|
|
||||||
run: |
|
|
||||||
msbuild windows\ZeroTierOne.sln /m /p:Configuration=Release /property:Platform=x64 /t:ZeroTierOne
|
|
||||||
- name: Archive production artifacts
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: zerotier-one-windows
|
|
||||||
path: windows/Build
|
|
||||||
retention-days: 7
|
|
497
.github/workflows/validate-linux.sh
vendored
497
.github/workflows/validate-linux.sh
vendored
|
@ -1,497 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# This test script joins Earth and pokes some stuff
|
|
||||||
|
|
||||||
TEST_NETWORK=8056c2e21c000001
|
|
||||||
RUN_LENGTH=30
|
|
||||||
TEST_FINISHED=false
|
|
||||||
ZTO_VER=$(git describe --tags $(git rev-list --tags --max-count=1))
|
|
||||||
ZTO_COMMIT=$(git rev-parse HEAD)
|
|
||||||
ZTO_COMMIT_SHORT=$(git rev-parse --short HEAD)
|
|
||||||
TEST_DIR_PREFIX="$ZTO_VER-$ZTO_COMMIT_SHORT-test-results"
|
|
||||||
|
|
||||||
TEST_OK=0
|
|
||||||
TEST_FAIL=1
|
|
||||||
|
|
||||||
echo "Performing test on: $ZTO_VER-$ZTO_COMMIT_SHORT"
|
|
||||||
TEST_FILEPATH_PREFIX="$TEST_DIR_PREFIX/$ZTO_COMMIT_SHORT"
|
|
||||||
mkdir $TEST_DIR_PREFIX
|
|
||||||
|
|
||||||
# How long we will wait for ZT to come online before considering it a failure
|
|
||||||
MAX_WAIT_SECS=30
|
|
||||||
|
|
||||||
ZT_PORT_NODE_1=9996
|
|
||||||
ZT_PORT_NODE_2=9997
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Multi-node connectivity and performance test #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
test() {
|
|
||||||
|
|
||||||
echo -e "\nPerforming pre-flight checks"
|
|
||||||
|
|
||||||
check_exit_on_invalid_identity
|
|
||||||
|
|
||||||
echo -e "\nRunning test for $RUN_LENGTH seconds"
|
|
||||||
|
|
||||||
export NS1="ip netns exec ns1"
|
|
||||||
export NS2="ip netns exec ns2"
|
|
||||||
|
|
||||||
export ZT1="$NS1 ./zerotier-cli -p9996 -D$(pwd)/node1"
|
|
||||||
# Specify custom port on one node to ensure that feature works
|
|
||||||
export ZT2="$NS2 ./zerotier-cli -p9997 -D$(pwd)/node2"
|
|
||||||
|
|
||||||
echo -e "\nSetting up network namespaces..."
|
|
||||||
echo "Setting up ns1"
|
|
||||||
|
|
||||||
ip netns add ns1
|
|
||||||
$NS1 ip link set dev lo up
|
|
||||||
ip link add veth0 type veth peer name veth1
|
|
||||||
ip link set veth1 netns ns1
|
|
||||||
ip addr add 192.168.0.1/24 dev veth0
|
|
||||||
ip link set dev veth0 up
|
|
||||||
|
|
||||||
$NS1 ip addr add 192.168.0.2/24 dev veth1
|
|
||||||
$NS1 ip link set dev veth1 up
|
|
||||||
|
|
||||||
# Add default route
|
|
||||||
$NS1 ip route add default via 192.168.0.1
|
|
||||||
|
|
||||||
iptables -t nat -A POSTROUTING -s 192.168.0.0/255.255.255.0 \
|
|
||||||
-o eth0 -j MASQUERADE
|
|
||||||
iptables -A FORWARD -i eth0 -o veth0 -j ACCEPT
|
|
||||||
iptables -A FORWARD -o eth0 -i veth0 -j ACCEPT
|
|
||||||
|
|
||||||
echo "Setting up ns2"
|
|
||||||
ip netns add ns2
|
|
||||||
$NS2 ip link set dev lo up
|
|
||||||
ip link add veth2 type veth peer name veth3
|
|
||||||
ip link set veth3 netns ns2
|
|
||||||
ip addr add 192.168.1.1/24 dev veth2
|
|
||||||
ip link set dev veth2 up
|
|
||||||
|
|
||||||
$NS2 ip addr add 192.168.1.2/24 dev veth3
|
|
||||||
$NS2 ip link set dev veth3 up
|
|
||||||
$NS2 ip route add default via 192.168.1.1
|
|
||||||
|
|
||||||
iptables -t nat -A POSTROUTING -s 192.168.1.0/255.255.255.0 \
|
|
||||||
-o eth0 -j MASQUERADE
|
|
||||||
iptables -A FORWARD -i eth0 -o veth2 -j ACCEPT
|
|
||||||
iptables -A FORWARD -o eth0 -i veth2 -j ACCEPT
|
|
||||||
|
|
||||||
# Allow forwarding
|
|
||||||
sysctl -w net.ipv4.ip_forward=1
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Memory Leak Check #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
export FILENAME_MEMORY_LOG="$TEST_FILEPATH_PREFIX-memory.log"
|
|
||||||
|
|
||||||
echo -e "\nStarting a ZeroTier instance in each namespace..."
|
|
||||||
|
|
||||||
export time_test_start=$(date +%s)
|
|
||||||
|
|
||||||
# Spam the CLI as ZeroTier is starting
|
|
||||||
spam_cli 100
|
|
||||||
|
|
||||||
echo "Starting memory leak check"
|
|
||||||
$NS1 sudo valgrind --demangle=yes --exit-on-first-error=yes \
|
|
||||||
--error-exitcode=1 \
|
|
||||||
--xml=yes \
|
|
||||||
--xml-file=$FILENAME_MEMORY_LOG \
|
|
||||||
--leak-check=full \
|
|
||||||
./zerotier-one node1 -p$ZT_PORT_NODE_1 -U >>node_1.log 2>&1 &
|
|
||||||
|
|
||||||
# Second instance, not run in memory profiler
|
|
||||||
# Don't set up internet access until _after_ zerotier is running
|
|
||||||
# This has been a source of stuckness in the past.
|
|
||||||
$NS2 ip addr del 192.168.1.2/24 dev veth3
|
|
||||||
$NS2 sudo ./zerotier-one node2 -U -p$ZT_PORT_NODE_2 >>node_2.log 2>&1 &
|
|
||||||
|
|
||||||
sleep 10; # New HTTP control plane is a bit sluggish, so we delay here
|
|
||||||
|
|
||||||
check_bind_to_correct_ports $ZT_PORT_NODE_1
|
|
||||||
check_bind_to_correct_ports $ZT_PORT_NODE_2
|
|
||||||
|
|
||||||
$NS2 ip addr add 192.168.1.2/24 dev veth3
|
|
||||||
$NS2 ip route add default via 192.168.1.1
|
|
||||||
|
|
||||||
echo -e "\nPing from host to namespaces"
|
|
||||||
|
|
||||||
ping -c 3 192.168.0.1
|
|
||||||
ping -c 3 192.168.1.1
|
|
||||||
|
|
||||||
echo -e "\nPing from namespace to host"
|
|
||||||
|
|
||||||
$NS1 ping -c 3 192.168.0.1
|
|
||||||
$NS1 ping -c 3 192.168.0.1
|
|
||||||
$NS2 ping -c 3 192.168.0.2
|
|
||||||
$NS2 ping -c 3 192.168.0.2
|
|
||||||
|
|
||||||
echo -e "\nPing from ns1 to ns2"
|
|
||||||
|
|
||||||
$NS1 ping -c 3 192.168.0.1
|
|
||||||
|
|
||||||
echo -e "\nPing from ns2 to ns1"
|
|
||||||
|
|
||||||
$NS2 ping -c 3 192.168.0.1
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Online Check #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
echo "Waiting for ZeroTier to come online before attempting test..."
|
|
||||||
node1_online=false
|
|
||||||
node2_online=false
|
|
||||||
both_instances_online=false
|
|
||||||
time_zt_node1_start=$(date +%s)
|
|
||||||
time_zt_node2_start=$(date +%s)
|
|
||||||
|
|
||||||
for ((s = 0; s <= $MAX_WAIT_SECS; s++)); do
|
|
||||||
node1_online="$($ZT1 -j info | jq '.online' 2>/dev/null)"
|
|
||||||
node2_online="$($ZT2 -j info | jq '.online' 2>/dev/null)"
|
|
||||||
echo "Checking for online status: try #$s, node1:$node1_online, node2:$node2_online"
|
|
||||||
if [[ "$node2_online" == "true" && "$node1_online" == "true" ]]; then
|
|
||||||
export both_instances_online=true
|
|
||||||
export time_to_both_nodes_online=$(date +%s)
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
sleep 1
|
|
||||||
done
|
|
||||||
|
|
||||||
echo -e "\n\nContents of ZeroTier home paths:"
|
|
||||||
|
|
||||||
ls -lga node1
|
|
||||||
tree node1
|
|
||||||
ls -lga node2
|
|
||||||
tree node2
|
|
||||||
|
|
||||||
echo -e "\n\nRunning ZeroTier processes:"
|
|
||||||
echo -e "\nNode 1:\n"
|
|
||||||
$NS1 ps aux | grep zerotier-one
|
|
||||||
echo -e "\nNode 2:\n"
|
|
||||||
$NS2 ps aux | grep zerotier-one
|
|
||||||
|
|
||||||
echo -e "\n\nStatus of each instance:"
|
|
||||||
|
|
||||||
echo -e "\n\nNode 1:\n"
|
|
||||||
$ZT1 status
|
|
||||||
echo -e "\n\nNode 2:\n"
|
|
||||||
$ZT2 status
|
|
||||||
|
|
||||||
if [[ "$both_instances_online" != "true" ]]; then
|
|
||||||
exit_test_and_generate_report $TEST_FAIL "one or more nodes failed to come online"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo -e "\nJoining networks"
|
|
||||||
|
|
||||||
$ZT1 join $TEST_NETWORK
|
|
||||||
$ZT2 join $TEST_NETWORK
|
|
||||||
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
node1_ip4=$($ZT1 get $TEST_NETWORK ip4)
|
|
||||||
node2_ip4=$($ZT2 get $TEST_NETWORK ip4)
|
|
||||||
|
|
||||||
echo "node1_ip4=$node1_ip4"
|
|
||||||
echo "node2_ip4=$node2_ip4"
|
|
||||||
|
|
||||||
echo -e "\nPinging each node"
|
|
||||||
|
|
||||||
PING12_FILENAME="$TEST_FILEPATH_PREFIX-ping-1-to-2.txt"
|
|
||||||
PING21_FILENAME="$TEST_FILEPATH_PREFIX-ping-2-to-1.txt"
|
|
||||||
|
|
||||||
$NS1 ping -c 16 $node2_ip4 >$PING12_FILENAME
|
|
||||||
$NS2 ping -c 16 $node1_ip4 >$PING21_FILENAME
|
|
||||||
|
|
||||||
ping_loss_percent_1_to_2=$(cat $PING12_FILENAME |
|
|
||||||
grep "packet loss" | awk '{print $6}' | sed 's/%//')
|
|
||||||
ping_loss_percent_2_to_1=$(cat $PING21_FILENAME |
|
|
||||||
grep "packet loss" | awk '{print $6}' | sed 's/%//')
|
|
||||||
|
|
||||||
# Normalize loss value
|
|
||||||
export ping_loss_percent_1_to_2=$(echo "scale=2; $ping_loss_percent_1_to_2/100.0" | bc)
|
|
||||||
export ping_loss_percent_2_to_1=$(echo "scale=2; $ping_loss_percent_2_to_1/100.0" | bc)
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# CLI Check #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
echo "Testing basic CLI functionality..."
|
|
||||||
|
|
||||||
spam_cli 10
|
|
||||||
|
|
||||||
$ZT1 join $TEST_NETWORK
|
|
||||||
|
|
||||||
$ZT1 -h
|
|
||||||
$ZT1 -v
|
|
||||||
$ZT1 status
|
|
||||||
$ZT1 info
|
|
||||||
$ZT1 listnetworks
|
|
||||||
$ZT1 peers
|
|
||||||
$ZT1 listpeers
|
|
||||||
|
|
||||||
$ZT1 -j status
|
|
||||||
$ZT1 -j info
|
|
||||||
$ZT1 -j listnetworks
|
|
||||||
$ZT1 -j peers
|
|
||||||
$ZT1 -j listpeers
|
|
||||||
|
|
||||||
$ZT1 dump
|
|
||||||
|
|
||||||
$ZT1 get $TEST_NETWORK allowDNS
|
|
||||||
$ZT1 get $TEST_NETWORK allowDefault
|
|
||||||
$ZT1 get $TEST_NETWORK allowGlobal
|
|
||||||
$ZT1 get $TEST_NETWORK allowManaged
|
|
||||||
$ZT1 get $TEST_NETWORK bridge
|
|
||||||
$ZT1 get $TEST_NETWORK broadcastEnabled
|
|
||||||
$ZT1 get $TEST_NETWORK dhcp
|
|
||||||
$ZT1 get $TEST_NETWORK id
|
|
||||||
$ZT1 get $TEST_NETWORK mac
|
|
||||||
$ZT1 get $TEST_NETWORK mtu
|
|
||||||
$ZT1 get $TEST_NETWORK name
|
|
||||||
$ZT1 get $TEST_NETWORK netconfRevision
|
|
||||||
$ZT1 get $TEST_NETWORK nwid
|
|
||||||
$ZT1 get $TEST_NETWORK portDeviceName
|
|
||||||
$ZT1 get $TEST_NETWORK portError
|
|
||||||
$ZT1 get $TEST_NETWORK status
|
|
||||||
$ZT1 get $TEST_NETWORK type
|
|
||||||
|
|
||||||
# Test an invalid command
|
|
||||||
$ZT1 get $TEST_NETWORK derpderp
|
|
||||||
|
|
||||||
# TODO: Validate JSON
|
|
||||||
|
|
||||||
# Performance Test
|
|
||||||
|
|
||||||
export FILENAME_PERF_JSON="$TEST_FILEPATH_PREFIX-iperf.json"
|
|
||||||
|
|
||||||
echo -e "\nBeginning performance test:"
|
|
||||||
|
|
||||||
echo -e "\nStarting server:"
|
|
||||||
|
|
||||||
echo "$NS1 iperf3 -s &"
|
|
||||||
sleep 1
|
|
||||||
|
|
||||||
echo -e "\nStarting client:"
|
|
||||||
sleep 1
|
|
||||||
|
|
||||||
echo "$NS2 iperf3 --json -c $node1_ip4 > $FILENAME_PERF_JSON"
|
|
||||||
|
|
||||||
cat $FILENAME_PERF_JSON
|
|
||||||
|
|
||||||
# Let ZeroTier idle long enough for various timers
|
|
||||||
|
|
||||||
echo -e "\nIdling ZeroTier for $RUN_LENGTH seconds..."
|
|
||||||
sleep $RUN_LENGTH
|
|
||||||
|
|
||||||
echo -e "\nLeaving networks"
|
|
||||||
|
|
||||||
$ZT1 leave $TEST_NETWORK
|
|
||||||
$ZT2 leave $TEST_NETWORK
|
|
||||||
|
|
||||||
sleep 5
|
|
||||||
|
|
||||||
exit_test_and_generate_report $TEST_OK "completed test"
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Generate report #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
exit_test_and_generate_report() {
|
|
||||||
|
|
||||||
echo -e "\nStopping memory check..."
|
|
||||||
sudo pkill -15 -f valgrind
|
|
||||||
sleep 10
|
|
||||||
|
|
||||||
time_test_end=$(date +%s)
|
|
||||||
|
|
||||||
echo "Exiting test with reason: $2 ($1)"
|
|
||||||
|
|
||||||
# Collect ZeroTier dump files
|
|
||||||
|
|
||||||
echo -e "\nCollecting ZeroTier dump files"
|
|
||||||
|
|
||||||
node1_id=$($ZT1 -j status | jq -r .address)
|
|
||||||
node2_id=$($ZT2 -j status | jq -r .address)
|
|
||||||
|
|
||||||
$ZT1 dump
|
|
||||||
mv zerotier_dump.txt "$TEST_FILEPATH_PREFIX-node-dump-$node1_id.txt"
|
|
||||||
|
|
||||||
$ZT2 dump
|
|
||||||
mv zerotier_dump.txt "$TEST_FILEPATH_PREFIX-node-dump-$node2_id.txt"
|
|
||||||
|
|
||||||
# Copy ZeroTier stdout/stderr logs
|
|
||||||
|
|
||||||
cp node_1.log "$TEST_FILEPATH_PREFIX-node-log-$node1_id.txt"
|
|
||||||
cp node_2.log "$TEST_FILEPATH_PREFIX-node-log-$node2_id.txt"
|
|
||||||
|
|
||||||
# Generate report
|
|
||||||
|
|
||||||
cat $FILENAME_MEMORY_LOG
|
|
||||||
|
|
||||||
DEFINITELY_LOST=$(xmlstarlet sel -t -v '/valgrindoutput/error/xwhat' \
|
|
||||||
$FILENAME_MEMORY_LOG | grep "definitely" | awk '{print $1;}')
|
|
||||||
POSSIBLY_LOST=$(xmlstarlet sel -t -v '/valgrindoutput/error/xwhat' \
|
|
||||||
$FILENAME_MEMORY_LOG | grep "possibly" | awk '{print $1;}')
|
|
||||||
|
|
||||||
# Generate coverage report artifact and summary
|
|
||||||
|
|
||||||
FILENAME_COVERAGE_JSON="$TEST_FILEPATH_PREFIX-coverage.json"
|
|
||||||
FILENAME_COVERAGE_HTML="$TEST_FILEPATH_PREFIX-coverage.html"
|
|
||||||
|
|
||||||
echo -e "\nGenerating coverage test report..."
|
|
||||||
|
|
||||||
gcovr -r . --exclude ext --json-summary $FILENAME_COVERAGE_JSON \
|
|
||||||
--html >$FILENAME_COVERAGE_HTML
|
|
||||||
|
|
||||||
cat $FILENAME_COVERAGE_JSON
|
|
||||||
|
|
||||||
COVERAGE_LINE_COVERED=$(cat $FILENAME_COVERAGE_JSON | jq .line_covered)
|
|
||||||
COVERAGE_LINE_TOTAL=$(cat $FILENAME_COVERAGE_JSON | jq .line_total)
|
|
||||||
COVERAGE_LINE_PERCENT=$(cat $FILENAME_COVERAGE_JSON | jq .line_percent)
|
|
||||||
|
|
||||||
COVERAGE_LINE_COVERED="${COVERAGE_LINE_COVERED:-0}"
|
|
||||||
COVERAGE_LINE_TOTAL="${COVERAGE_LINE_TOTAL:-0}"
|
|
||||||
COVERAGE_LINE_PERCENT="${COVERAGE_LINE_PERCENT:-0}"
|
|
||||||
|
|
||||||
# Default values
|
|
||||||
|
|
||||||
DEFINITELY_LOST="${DEFINITELY_LOST:-0}"
|
|
||||||
POSSIBLY_LOST="${POSSIBLY_LOST:-0}"
|
|
||||||
ping_loss_percent_1_to_2="${ping_loss_percent_1_to_2:-100.0}"
|
|
||||||
ping_loss_percent_2_to_1="${ping_loss_percent_2_to_1:-100.0}"
|
|
||||||
time_to_both_nodes_online="${time_to_both_nodes_online:--1}"
|
|
||||||
|
|
||||||
# Summarize and emit json for trend reporting
|
|
||||||
|
|
||||||
FILENAME_SUMMARY="$TEST_FILEPATH_PREFIX-summary.json"
|
|
||||||
|
|
||||||
time_length_test=$((time_test_end - time_test_start))
|
|
||||||
if [[ $time_to_both_nodes_online != -1 ]];
|
|
||||||
then
|
|
||||||
time_to_both_nodes_online=$((time_to_both_nodes_online - time_test_start))
|
|
||||||
fi
|
|
||||||
#time_length_zt_join=$((time_zt_join_end-time_zt_join_start))
|
|
||||||
#time_length_zt_leave=$((time_zt_leave_end-time_zt_leave_start))
|
|
||||||
#time_length_zt_can_still_ping=$((time_zt_can_still_ping-time_zt_leave_start))
|
|
||||||
|
|
||||||
summary=$(
|
|
||||||
cat <<EOF
|
|
||||||
{
|
|
||||||
"version":"$ZTO_VER",
|
|
||||||
"commit":"$ZTO_COMMIT",
|
|
||||||
"arch_m":"$(uname -m)",
|
|
||||||
"arch_a":"$(uname -a)",
|
|
||||||
"binary_size":"$(stat -c %s zerotier-one)",
|
|
||||||
"time_length_test":$time_length_test,
|
|
||||||
"time_to_both_nodes_online":$time_to_both_nodes_online,
|
|
||||||
"num_possible_bytes_lost": $POSSIBLY_LOST,
|
|
||||||
"num_definite_bytes_lost": $DEFINITELY_LOST,
|
|
||||||
"num_bad_formattings": $POSSIBLY_LOST,
|
|
||||||
"coverage_lines_covered": $COVERAGE_LINE_COVERED,
|
|
||||||
"coverage_lines_total": $COVERAGE_LINE_TOTAL,
|
|
||||||
"coverage_lines_percent": $COVERAGE_LINE_PERCENT,
|
|
||||||
"ping_loss_percent_1_to_2": $ping_loss_percent_1_to_2,
|
|
||||||
"ping_loss_percent_2_to_1": $ping_loss_percent_2_to_1,
|
|
||||||
"test_exit_code": $1,
|
|
||||||
"test_exit_reason":"$2"
|
|
||||||
}
|
|
||||||
EOF
|
|
||||||
)
|
|
||||||
|
|
||||||
echo $summary >$FILENAME_SUMMARY
|
|
||||||
cat $FILENAME_SUMMARY
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# CLI Check #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
spam_cli() {
|
|
||||||
echo "Spamming CLI..."
|
|
||||||
# Rapidly spam the CLI with joins/leaves
|
|
||||||
|
|
||||||
MAX_TRIES="${1:-10}"
|
|
||||||
|
|
||||||
for ((s = 0; s <= MAX_TRIES; s++)); do
|
|
||||||
$ZT1 status
|
|
||||||
$ZT2 status
|
|
||||||
sleep 0.1
|
|
||||||
done
|
|
||||||
|
|
||||||
SPAM_TRIES=128
|
|
||||||
|
|
||||||
for ((s = 0; s <= SPAM_TRIES; s++)); do
|
|
||||||
$ZT1 join $TEST_NETWORK
|
|
||||||
done
|
|
||||||
|
|
||||||
for ((s = 0; s <= SPAM_TRIES; s++)); do
|
|
||||||
$ZT1 leave $TEST_NETWORK
|
|
||||||
done
|
|
||||||
|
|
||||||
for ((s = 0; s <= SPAM_TRIES; s++)); do
|
|
||||||
$ZT1 leave $TEST_NETWORK
|
|
||||||
$ZT1 join $TEST_NETWORK
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Check for proper exit on load of invalid identity #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
check_exit_on_invalid_identity() {
|
|
||||||
echo "Checking ZeroTier exits on invalid identity..."
|
|
||||||
mkdir -p $(pwd)/exit_test
|
|
||||||
ZT1="sudo ./zerotier-one -p9999 $(pwd)/exit_test"
|
|
||||||
echo "asdfasdfasdfasdf" > $(pwd)/exit_test/identity.secret
|
|
||||||
echo "asdfasdfasdfasdf" > $(pwd)/exit_test/authtoken.secret
|
|
||||||
|
|
||||||
echo "Launch ZeroTier with an invalid identity"
|
|
||||||
$ZT1 &
|
|
||||||
my_pid=$!
|
|
||||||
|
|
||||||
echo "Waiting 5 seconds"
|
|
||||||
sleep 5
|
|
||||||
|
|
||||||
# check if process is running
|
|
||||||
kill -0 $my_pid
|
|
||||||
if [ $? -eq 0 ]; then
|
|
||||||
exit_test_and_generate_report $TEST_FAIL "Exit test FAILED: Process still running after being fed an invalid identity"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Check that we're binding to the primary port for TCP/TCP6/UDP #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
check_bind_to_correct_ports() {
|
|
||||||
PORT_NUMBER=$1
|
|
||||||
echo "Checking bound ports:"
|
|
||||||
sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier"
|
|
||||||
if [[ $(sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier" | grep "tcp") ]];
|
|
||||||
then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
exit_test_and_generate_report $TEST_FAIL "ZeroTier did not bind to tcp/$1"
|
|
||||||
fi
|
|
||||||
if [[ $(sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier" | grep "tcp6") ]];
|
|
||||||
then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
exit_test_and_generate_report $TEST_FAIL "ZeroTier did not bind to tcp6/$1"
|
|
||||||
fi
|
|
||||||
if [[ $(sudo netstat -anp | grep "$PORT_NUMBER" | grep "zerotier" | grep "udp") ]];
|
|
||||||
then
|
|
||||||
:
|
|
||||||
else
|
|
||||||
exit_test_and_generate_report $TEST_FAIL "ZeroTier did not bind to udp/$1"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
test "$@"
|
|
24
.github/workflows/validate-report.sh
vendored
24
.github/workflows/validate-report.sh
vendored
|
@ -1,24 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Set exit code depending on tool reports #
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
DEFINITELY_LOST=$(cat *test-results/*summary.json | jq .num_definite_bytes_lost)
|
|
||||||
EXIT_CODE=$(cat *test-results/*summary.json | jq .exit_code)
|
|
||||||
EXIT_REASON=$(cat *test-results/*summary.json | jq .exit_reason)
|
|
||||||
|
|
||||||
cat *test-results/*summary.json
|
|
||||||
|
|
||||||
echo -e "\nBytes of memory definitely lost: $DEFINITELY_LOST"
|
|
||||||
|
|
||||||
if [[ "$DEFINITELY_LOST" -gt 0 ]]; then
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Catch-all for other non-zero exit codes
|
|
||||||
|
|
||||||
if [[ "$EXIT_CODE" -gt 0 ]]; then
|
|
||||||
echo "Test failed: $EXIT_REASON"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
57
.github/workflows/validate.yml
vendored
57
.github/workflows/validate.yml
vendored
|
@ -1,57 +0,0 @@
|
||||||
on:
|
|
||||||
pull_request:
|
|
||||||
push:
|
|
||||||
workflow_dispatch:
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build_ubuntu:
|
|
||||||
runs-on: ubuntu-latest
|
|
||||||
steps:
|
|
||||||
- name: gitconfig
|
|
||||||
run: |
|
|
||||||
git config --global core.autocrlf input
|
|
||||||
|
|
||||||
- name: checkout
|
|
||||||
uses: actions/checkout@v3
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Install Rust
|
|
||||||
uses: actions-rs/toolchain@v1
|
|
||||||
with:
|
|
||||||
toolchain: stable
|
|
||||||
target: x86_64-unknown-linux-gnu
|
|
||||||
override: true
|
|
||||||
components: rustfmt, clippy
|
|
||||||
|
|
||||||
- name: Set up cargo cache
|
|
||||||
uses: Swatinem/rust-cache@v2
|
|
||||||
continue-on-error: false
|
|
||||||
with:
|
|
||||||
key: ${{ runner.os }}-cargo-${{ hashFiles('zeroidc//Cargo.lock') }}
|
|
||||||
shared-key: ${{ runner.os }}-cargo-
|
|
||||||
workspaces: |
|
|
||||||
zeroidc/
|
|
||||||
|
|
||||||
- name: validate-1m-linux
|
|
||||||
env:
|
|
||||||
CC: 'gcc'
|
|
||||||
CXX: 'g++'
|
|
||||||
BRANCH: ${{ github.ref_name }}
|
|
||||||
run: |
|
|
||||||
sudo apt install -y valgrind xmlstarlet gcovr iperf3 tree
|
|
||||||
make one ZT_COVERAGE=1 ZT_TRACE=1
|
|
||||||
sudo chmod +x ./.github/workflows/validate-linux.sh
|
|
||||||
sudo ./.github/workflows/validate-linux.sh
|
|
||||||
|
|
||||||
- name: Archive test results
|
|
||||||
uses: actions/upload-artifact@v4
|
|
||||||
with:
|
|
||||||
name: ${{github.sha}}-test-results
|
|
||||||
path: "*test-results*"
|
|
||||||
|
|
||||||
- name: final-report
|
|
||||||
run: |
|
|
||||||
sudo chmod +x ./.github/workflows/validate-report.sh
|
|
||||||
sudo ./.github/workflows/validate-report.sh
|
|
||||||
|
|
91
.gitignore
vendored
91
.gitignore
vendored
|
@ -1,22 +1,10 @@
|
||||||
# Main binaries created in *nix builds
|
# Main binaries created in *nix builds
|
||||||
/zerotier-one
|
/zerotier-*
|
||||||
/zerotier-idtool
|
|
||||||
/zerotier-cli
|
|
||||||
/zerotier-selftest
|
|
||||||
/zerotier
|
|
||||||
/nltest
|
|
||||||
|
|
||||||
# IDE stuff
|
|
||||||
/.idea
|
|
||||||
/.nova
|
|
||||||
/compile_commands.json
|
|
||||||
|
|
||||||
# OS-created garbage files from various platforms
|
# OS-created garbage files from various platforms
|
||||||
.DS_Store
|
.DS_Store
|
||||||
.Apple*
|
.Apple*
|
||||||
Thumbs.db
|
Thumbs.db
|
||||||
@eaDir
|
|
||||||
._*
|
|
||||||
|
|
||||||
# Windows build droppings
|
# Windows build droppings
|
||||||
/windows/ZeroTierOne.sdf
|
/windows/ZeroTierOne.sdf
|
||||||
|
@ -33,19 +21,10 @@ Thumbs.db
|
||||||
/windows/Release
|
/windows/Release
|
||||||
/windows/WebUIWrapper/bin
|
/windows/WebUIWrapper/bin
|
||||||
/windows/WebUIWrapper/obj
|
/windows/WebUIWrapper/obj
|
||||||
/windows/lib
|
|
||||||
/ext/installfiles/windows/ZeroTier One-SetupFiles
|
/ext/installfiles/windows/ZeroTier One-SetupFiles
|
||||||
|
/ext/installfiles/windows/Prerequisites
|
||||||
/ext/installfiles/windows/*-cache
|
/ext/installfiles/windows/*-cache
|
||||||
/ZeroTier One.msi
|
/ZeroTier One.msi
|
||||||
*.vcxproj.backup
|
|
||||||
/windows/TapDriver6/Win7Debug
|
|
||||||
/windows/TapDriver6/win7Release
|
|
||||||
/windows/*.db
|
|
||||||
/windows/*.opendb
|
|
||||||
enc_temp_folder
|
|
||||||
/windows/copyutil/bin
|
|
||||||
/windows/copyutil/obj
|
|
||||||
.vs/
|
|
||||||
|
|
||||||
# *nix/Mac build droppings
|
# *nix/Mac build droppings
|
||||||
/build-*
|
/build-*
|
||||||
|
@ -54,19 +33,18 @@ enc_temp_folder
|
||||||
/examples/docker/test-*.env
|
/examples/docker/test-*.env
|
||||||
/world/mkworld
|
/world/mkworld
|
||||||
/world/*.c25519
|
/world/*.c25519
|
||||||
zt1-src.tar.gz
|
|
||||||
/MacEthernetTapAgent
|
|
||||||
|
|
||||||
# Miscellaneous temporaries, build files, etc.
|
# Miscellaneous temporaries, build files, etc.
|
||||||
*.log
|
*.log
|
||||||
*.opensdf
|
*.opensdf
|
||||||
*.user
|
*.user
|
||||||
*.cache
|
*.cache
|
||||||
|
*.obj
|
||||||
*.tlog
|
*.tlog
|
||||||
*.pid
|
*.pid
|
||||||
*.pkg
|
*.pkg
|
||||||
*.o
|
*.o
|
||||||
/*.a
|
*.a
|
||||||
*.dylib
|
*.dylib
|
||||||
*.so
|
*.so
|
||||||
*.so.*
|
*.so.*
|
||||||
|
@ -78,13 +56,16 @@ zt1-src.tar.gz
|
||||||
*.tmp
|
*.tmp
|
||||||
.depend
|
.depend
|
||||||
node_modules
|
node_modules
|
||||||
zt1_update_*
|
cluster-geo/cluster-geo/config.js
|
||||||
debian/files
|
cluster-geo/cluster-geo/cache.*
|
||||||
debian/zerotier-one
|
tests/http/zerotier-one
|
||||||
debian/zerotier-one*.debhelper
|
tests/http/big-test-hosts
|
||||||
debian/*.log
|
netcon/httpstub
|
||||||
debian/zerotier-one.substvars
|
|
||||||
root-watcher/config.json
|
# MacGap wrapper build files
|
||||||
|
/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/project.xcworkspace/xcuserdata/*
|
||||||
|
/ext/mac-ui-macgap1-wrapper/src/MacGap.xcodeproj/xcuserdata/*
|
||||||
|
/ext/mac-ui-macgap1-wrapper/src/build
|
||||||
|
|
||||||
# Java/Android/JNI build droppings
|
# Java/Android/JNI build droppings
|
||||||
java/obj/
|
java/obj/
|
||||||
|
@ -98,45 +79,5 @@ java/build_win32/
|
||||||
windows/WinUI/obj/
|
windows/WinUI/obj/
|
||||||
windows/WinUI/bin/
|
windows/WinUI/bin/
|
||||||
windows/ZeroTierOne/Debug/
|
windows/ZeroTierOne/Debug/
|
||||||
/ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg
|
/doc/*.1
|
||||||
|
/doc/*.8
|
||||||
# Miscellaneous mac/Xcode droppings
|
|
||||||
.DS_Store
|
|
||||||
.Trashes
|
|
||||||
*.swp
|
|
||||||
*~.nib
|
|
||||||
DerivedData/
|
|
||||||
*.pbxuser
|
|
||||||
*.mode1v3
|
|
||||||
*.mode2v3
|
|
||||||
*.perspectivev3
|
|
||||||
!default.pbxuser
|
|
||||||
!default.mode1v3
|
|
||||||
!default.mode2v3
|
|
||||||
!default.perspectivev3
|
|
||||||
*.xccheckout
|
|
||||||
xcuserdata/
|
|
||||||
.vscode
|
|
||||||
__pycache__
|
|
||||||
*~
|
|
||||||
attic/world/*.c25519
|
|
||||||
attic/world/mkworld
|
|
||||||
workspace/
|
|
||||||
workspace2/
|
|
||||||
zeroidc/target/
|
|
||||||
tcp-proxy/target
|
|
||||||
|
|
||||||
#snapcraft specifics
|
|
||||||
/parts/
|
|
||||||
/stage/
|
|
||||||
/prime/
|
|
||||||
|
|
||||||
*.snap
|
|
||||||
|
|
||||||
.snapcraft
|
|
||||||
__pycache__
|
|
||||||
*.pyc
|
|
||||||
*_source.tar.bz2
|
|
||||||
snap/.snapcraft
|
|
||||||
tcp-proxy/tcp-proxy
|
|
||||||
rustybits/target
|
|
||||||
|
|
14
.kick
14
.kick
|
@ -1,14 +0,0 @@
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
||||||
kick
|
|
70
AUTHORS.md
70
AUTHORS.md
|
@ -1,15 +1,12 @@
|
||||||
# Authors and Third Party Code Licensing Information
|
|
||||||
|
|
||||||
## Primary Authors
|
## Primary Authors
|
||||||
|
|
||||||
* ZeroTier Core and ZeroTier One virtual networking service<br>
|
* ZeroTier protocol design and core network virtualization engine, ZeroTier One service, React web UI, packaging for most platforms, kitchen sink...<br>
|
||||||
Adam Ierymenko / adam.ierymenko@zerotier.com
|
Adam Ierymenko / adam.ierymenko@zerotier.com
|
||||||
Joseph Henry / joseph.henry@zerotier.com (QoS and multipath)
|
|
||||||
|
|
||||||
* Java JNI Interface to enable Android application development, and Android app itself (code for that is elsewhere)<br>
|
* Java JNI Interface to enable Android application development, and Android app itself (code for that is elsewhere)<br>
|
||||||
Grant Limberg / glimberg@gmail.com
|
Grant Limberg / glimberg@gmail.com
|
||||||
|
|
||||||
* ZeroTier SDK (formerly known as Network Containers)<br>
|
* Network Containers for Linux, iOS, Android<br>
|
||||||
Joseph Henry / joseph.henry@zerotier.com
|
Joseph Henry / joseph.henry@zerotier.com
|
||||||
|
|
||||||
## Third Party Contributors
|
## Third Party Contributors
|
||||||
|
@ -28,13 +25,11 @@
|
||||||
|
|
||||||
## Third-Party Code
|
## Third-Party Code
|
||||||
|
|
||||||
ZeroTier includes the following third party code, either in ext/ or incorporated into the ZeroTier core. This third party code remains licensed under its original license and is not subject to ZeroTier's BSL license.
|
|
||||||
|
|
||||||
* LZ4 compression algorithm by Yann Collet
|
* LZ4 compression algorithm by Yann Collet
|
||||||
|
|
||||||
* Files: node/Packet.cpp (bundled within anonymous namespace)
|
* Files: ext/lz4/*
|
||||||
* Home page: http://code.google.com/p/lz4/
|
* Home page: http://code.google.com/p/lz4/
|
||||||
* License grant: BSD 2-clause
|
* License grant: BSD attribution
|
||||||
|
|
||||||
* http-parser by Joyent, Inc. (many authors)
|
* http-parser by Joyent, Inc. (many authors)
|
||||||
|
|
||||||
|
@ -42,34 +37,41 @@ ZeroTier includes the following third party code, either in ext/ or incorporated
|
||||||
* Home page: https://github.com/joyent/http-parser/
|
* Home page: https://github.com/joyent/http-parser/
|
||||||
* License grant: MIT/Expat
|
* License grant: MIT/Expat
|
||||||
|
|
||||||
* C++11 json (nlohmann/json) by Niels Lohmann
|
* json-parser by James McLaughlin
|
||||||
|
|
||||||
* Files: ext/json/*
|
* Files: ext/json-parser/*
|
||||||
* Home page: https://github.com/nlohmann/json
|
* Home page: https://github.com/udp/json-parser/
|
||||||
* License grant: MIT
|
* License grant: BSD attribution
|
||||||
|
|
||||||
* tap-windows6 by the OpenVPN project
|
* TunTapOSX by Mattias Nissler
|
||||||
|
|
||||||
* Files: windows/TapDriver6/*
|
* Files: ext/tap-mac/tuntap/*
|
||||||
* Home page: https://github.com/OpenVPN/tap-windows6/
|
* Home page: http://tuntaposx.sourceforge.net/
|
||||||
* License grant: GNU GPL v2
|
|
||||||
* ZeroTier Modifications: change name of driver to ZeroTier, add ioctl() to get L2 multicast memberships (source is in ext/ and modifications inherit GPL)
|
|
||||||
|
|
||||||
* Salsa20 stream cipher, Curve25519 elliptic curve cipher, Ed25519 digital signature algorithm, and Poly1305 MAC algorithm, all by Daniel J. Bernstein
|
|
||||||
|
|
||||||
* Files: node/Salsa20.* node/C25519.* node/Poly1305.*
|
|
||||||
* Home page: http://cr.yp.to/
|
|
||||||
* 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
|
* License grant: BSD attribution no-endorsement
|
||||||
|
|
||||||
* cpp-httplib by yhirose
|
* tap-windows and tap-windows6 by the OpenVPN project
|
||||||
|
|
||||||
* Files: ext/cpp-httplib/*
|
* Files: windows/TapDriver6/*
|
||||||
* Home page: https://github.com/yhirose/cpp-httplib
|
* Home page:
|
||||||
* License grant: MIT
|
https://github.com/OpenVPN/tap-windows/
|
||||||
|
https://github.com/OpenVPN/tap-windows6/
|
||||||
|
* License grant: GNU GPL v2
|
||||||
|
|
||||||
|
* Salsa20 stream cipher, Curve25519 elliptic curve cipher, Ed25519
|
||||||
|
digital signature algorithm, and Poly1305 MAC algorithm, all by
|
||||||
|
Daniel J. Bernstein
|
||||||
|
|
||||||
|
* Files:
|
||||||
|
node/Salsa20.hpp
|
||||||
|
node/C25519.hpp
|
||||||
|
node/Poly1305.hpp
|
||||||
|
* Home page: http://cr.yp.to/
|
||||||
|
* License grant: public domain
|
||||||
|
|
||||||
|
* MiniUPNPC by Thomas Bernard
|
||||||
|
|
||||||
|
* Files:
|
||||||
|
ext/libnatpmp/*
|
||||||
|
ext/miniupnpc/*
|
||||||
|
* Home page: http://miniupnp.free.fr/
|
||||||
|
* License grant: BSD attribution no-endorsement
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
# CMake build script for libzerotiercore.a
|
|
||||||
|
|
||||||
cmake_minimum_required (VERSION 2.8)
|
|
||||||
project (zerotiercore)
|
|
||||||
|
|
||||||
set (PROJ_DIR ${PROJECT_SOURCE_DIR})
|
|
||||||
set (ZT_DEFS -std=c++11)
|
|
||||||
|
|
||||||
file(GLOB core_src_glob ${PROJ_DIR}/node/*.cpp)
|
|
||||||
add_library(zerotiercore STATIC ${core_src_glob})
|
|
||||||
|
|
||||||
target_compile_options(zerotiercore PRIVATE ${ZT_DEFS})
|
|
11
COPYING
11
COPYING
|
@ -1,8 +1,13 @@
|
||||||
ZeroTier One, an endpoint server for the ZeroTier virtual network layer.
|
ZeroTier One, an endpoint server for the ZeroTier virtual network layer.
|
||||||
Copyright © 2011–2019 ZeroTier, Inc.
|
Copyright © 2011–2016 ZeroTier, Inc.
|
||||||
|
|
||||||
ZeroTier is released under the terms of the BSL version 1.1. See the
|
ZeroTier One is free software: you can redistribute it and/or modify
|
||||||
file LICENSE.txt for details.
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 3 of the License, or (at
|
||||||
|
your option) any later version.
|
||||||
|
|
||||||
|
See the file ‘LICENSE.GPL-3’ for the text of the GNU GPL version 3.
|
||||||
|
If that file is not present, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
..
|
..
|
||||||
Local variables:
|
Local variables:
|
||||||
|
|
|
@ -1,28 +0,0 @@
|
||||||
# vim: ft=dockerfile
|
|
||||||
|
|
||||||
FROM ubuntu:21.04 as stage
|
|
||||||
|
|
||||||
RUN apt-get update -qq && apt-get -qq install make clang
|
|
||||||
COPY . .
|
|
||||||
RUN /usr/bin/make
|
|
||||||
RUN echo $PWD
|
|
||||||
RUN cp zerotier-one /usr/sbin
|
|
||||||
|
|
||||||
FROM ubuntu:21.04
|
|
||||||
|
|
||||||
COPY --from=stage /zerotier-one /usr/sbin
|
|
||||||
RUN ln -sf /usr/sbin/zerotier-one /usr/sbin/zerotier-idtool
|
|
||||||
RUN ln -sf /usr/sbin/zerotier-one /usr/sbin/zerotier-cli
|
|
||||||
|
|
||||||
RUN echo "${VERSION}" > /etc/zerotier-version
|
|
||||||
RUN rm -rf /var/lib/zerotier-one
|
|
||||||
|
|
||||||
|
|
||||||
RUN apt-get -qq update
|
|
||||||
RUN apt-get -qq install iproute2 net-tools fping 2ping iputils-ping iputils-arping
|
|
||||||
|
|
||||||
COPY entrypoint.sh.release /entrypoint.sh
|
|
||||||
RUN chmod 755 /entrypoint.sh
|
|
||||||
|
|
||||||
CMD []
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
|
|
@ -1,23 +0,0 @@
|
||||||
# vim: ft=dockerfile
|
|
||||||
|
|
||||||
FROM debian:bookworm
|
|
||||||
|
|
||||||
ARG VERSION
|
|
||||||
|
|
||||||
RUN apt-get update -qq && apt-get install curl gpg -y
|
|
||||||
RUN mkdir -p /usr/share/zerotier && \
|
|
||||||
curl -o /usr/share/zerotier/tmp.asc "https://download.zerotier.com/contact%40zerotier.com.gpg" && \
|
|
||||||
gpg --no-default-keyring --keyring /usr/share/zerotier/zerotier.gpg --import /usr/share/zerotier/tmp.asc && \
|
|
||||||
rm -f /usr/share/zerotier/tmp.asc && \
|
|
||||||
echo "deb [signed-by=/usr/share/zerotier/zerotier.gpg] http://download.zerotier.com/debian/bookworm bookworm main" > /etc/apt/sources.list.d/zerotier.list
|
|
||||||
|
|
||||||
RUN apt-get update -qq && apt-get install zerotier-one=${VERSION} curl iproute2 net-tools iputils-ping openssl libssl3 -y
|
|
||||||
RUN rm -rf /var/lib/zerotier-one
|
|
||||||
|
|
||||||
COPY entrypoint.sh.release /entrypoint.sh
|
|
||||||
RUN chmod 755 /entrypoint.sh
|
|
||||||
|
|
||||||
HEALTHCHECK --interval=1s CMD bash /healthcheck.sh
|
|
||||||
|
|
||||||
CMD []
|
|
||||||
ENTRYPOINT ["/entrypoint.sh"]
|
|
339
LICENSE.GPL-2
Normal file
339
LICENSE.GPL-2
Normal file
|
@ -0,0 +1,339 @@
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 2, June 1991
|
||||||
|
|
||||||
|
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The licenses for most software are designed to take away your
|
||||||
|
freedom to share and change it. By contrast, the GNU General Public
|
||||||
|
License is intended to guarantee your freedom to share and change free
|
||||||
|
software--to make sure the software is free for all its users. This
|
||||||
|
General Public License applies to most of the Free Software
|
||||||
|
Foundation's software and to any other program whose authors commit to
|
||||||
|
using it. (Some other Free Software Foundation software is covered by
|
||||||
|
the GNU Lesser General Public License instead.) You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
this service if you wish), that you receive source code or can get it
|
||||||
|
if you want it, that you can change the software or use pieces of it
|
||||||
|
in new free programs; and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to make restrictions that forbid
|
||||||
|
anyone to deny you these rights or to ask you to surrender the rights.
|
||||||
|
These restrictions translate to certain responsibilities for you if you
|
||||||
|
distribute copies of the software, or if you modify it.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must give the recipients all the rights that
|
||||||
|
you have. You must make sure that they, too, receive or can get the
|
||||||
|
source code. And you must show them these terms so they know their
|
||||||
|
rights.
|
||||||
|
|
||||||
|
We protect your rights with two steps: (1) copyright the software, and
|
||||||
|
(2) offer you this license which gives you legal permission to copy,
|
||||||
|
distribute and/or modify the software.
|
||||||
|
|
||||||
|
Also, for each author's protection and ours, we want to make certain
|
||||||
|
that everyone understands that there is no warranty for this free
|
||||||
|
software. If the software is modified by someone else and passed on, we
|
||||||
|
want its recipients to know that what they have is not the original, so
|
||||||
|
that any problems introduced by others will not reflect on the original
|
||||||
|
authors' reputations.
|
||||||
|
|
||||||
|
Finally, any free program is threatened constantly by software
|
||||||
|
patents. We wish to avoid the danger that redistributors of a free
|
||||||
|
program will individually obtain patent licenses, in effect making the
|
||||||
|
program proprietary. To prevent this, we have made it clear that any
|
||||||
|
patent must be licensed for everyone's free use or not licensed at all.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||||
|
|
||||||
|
0. This License applies to any program or other work which contains
|
||||||
|
a notice placed by the copyright holder saying it may be distributed
|
||||||
|
under the terms of this General Public License. The "Program", below,
|
||||||
|
refers to any such program or work, and a "work based on the Program"
|
||||||
|
means either the Program or any derivative work under copyright law:
|
||||||
|
that is to say, a work containing the Program or a portion of it,
|
||||||
|
either verbatim or with modifications and/or translated into another
|
||||||
|
language. (Hereinafter, translation is included without limitation in
|
||||||
|
the term "modification".) Each licensee is addressed as "you".
|
||||||
|
|
||||||
|
Activities other than copying, distribution and modification are not
|
||||||
|
covered by this License; they are outside its scope. The act of
|
||||||
|
running the Program is not restricted, and the output from the Program
|
||||||
|
is covered only if its contents constitute a work based on the
|
||||||
|
Program (independent of having been made by running the Program).
|
||||||
|
Whether that is true depends on what the Program does.
|
||||||
|
|
||||||
|
1. You may copy and distribute verbatim copies of the Program's
|
||||||
|
source code as you receive it, in any medium, provided that you
|
||||||
|
conspicuously and appropriately publish on each copy an appropriate
|
||||||
|
copyright notice and disclaimer of warranty; keep intact all the
|
||||||
|
notices that refer to this License and to the absence of any warranty;
|
||||||
|
and give any other recipients of the Program a copy of this License
|
||||||
|
along with the Program.
|
||||||
|
|
||||||
|
You may charge a fee for the physical act of transferring a copy, and
|
||||||
|
you may at your option offer warranty protection in exchange for a fee.
|
||||||
|
|
||||||
|
2. You may modify your copy or copies of the Program or any portion
|
||||||
|
of it, thus forming a work based on the Program, and copy and
|
||||||
|
distribute such modifications or work under the terms of Section 1
|
||||||
|
above, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) You must cause the modified files to carry prominent notices
|
||||||
|
stating that you changed the files and the date of any change.
|
||||||
|
|
||||||
|
b) You must cause any work that you distribute or publish, that in
|
||||||
|
whole or in part contains or is derived from the Program or any
|
||||||
|
part thereof, to be licensed as a whole at no charge to all third
|
||||||
|
parties under the terms of this License.
|
||||||
|
|
||||||
|
c) If the modified program normally reads commands interactively
|
||||||
|
when run, you must cause it, when started running for such
|
||||||
|
interactive use in the most ordinary way, to print or display an
|
||||||
|
announcement including an appropriate copyright notice and a
|
||||||
|
notice that there is no warranty (or else, saying that you provide
|
||||||
|
a warranty) and that users may redistribute the program under
|
||||||
|
these conditions, and telling the user how to view a copy of this
|
||||||
|
License. (Exception: if the Program itself is interactive but
|
||||||
|
does not normally print such an announcement, your work based on
|
||||||
|
the Program is not required to print an announcement.)
|
||||||
|
|
||||||
|
These requirements apply to the modified work as a whole. If
|
||||||
|
identifiable sections of that work are not derived from the Program,
|
||||||
|
and can be reasonably considered independent and separate works in
|
||||||
|
themselves, then this License, and its terms, do not apply to those
|
||||||
|
sections when you distribute them as separate works. But when you
|
||||||
|
distribute the same sections as part of a whole which is a work based
|
||||||
|
on the Program, the distribution of the whole must be on the terms of
|
||||||
|
this License, whose permissions for other licensees extend to the
|
||||||
|
entire whole, and thus to each and every part regardless of who wrote it.
|
||||||
|
|
||||||
|
Thus, it is not the intent of this section to claim rights or contest
|
||||||
|
your rights to work written entirely by you; rather, the intent is to
|
||||||
|
exercise the right to control the distribution of derivative or
|
||||||
|
collective works based on the Program.
|
||||||
|
|
||||||
|
In addition, mere aggregation of another work not based on the Program
|
||||||
|
with the Program (or with a work based on the Program) on a volume of
|
||||||
|
a storage or distribution medium does not bring the other work under
|
||||||
|
the scope of this License.
|
||||||
|
|
||||||
|
3. You may copy and distribute the Program (or a work based on it,
|
||||||
|
under Section 2) in object code or executable form under the terms of
|
||||||
|
Sections 1 and 2 above provided that you also do one of the following:
|
||||||
|
|
||||||
|
a) Accompany it with the complete corresponding machine-readable
|
||||||
|
source code, which must be distributed under the terms of Sections
|
||||||
|
1 and 2 above on a medium customarily used for software interchange; or,
|
||||||
|
|
||||||
|
b) Accompany it with a written offer, valid for at least three
|
||||||
|
years, to give any third party, for a charge no more than your
|
||||||
|
cost of physically performing source distribution, a complete
|
||||||
|
machine-readable copy of the corresponding source code, to be
|
||||||
|
distributed under the terms of Sections 1 and 2 above on a medium
|
||||||
|
customarily used for software interchange; or,
|
||||||
|
|
||||||
|
c) Accompany it with the information you received as to the offer
|
||||||
|
to distribute corresponding source code. (This alternative is
|
||||||
|
allowed only for noncommercial distribution and only if you
|
||||||
|
received the program in object code or executable form with such
|
||||||
|
an offer, in accord with Subsection b above.)
|
||||||
|
|
||||||
|
The source code for a work means the preferred form of the work for
|
||||||
|
making modifications to it. For an executable work, complete source
|
||||||
|
code means all the source code for all modules it contains, plus any
|
||||||
|
associated interface definition files, plus the scripts used to
|
||||||
|
control compilation and installation of the executable. However, as a
|
||||||
|
special exception, the source code distributed need not include
|
||||||
|
anything that is normally distributed (in either source or binary
|
||||||
|
form) with the major components (compiler, kernel, and so on) of the
|
||||||
|
operating system on which the executable runs, unless that component
|
||||||
|
itself accompanies the executable.
|
||||||
|
|
||||||
|
If distribution of executable or object code is made by offering
|
||||||
|
access to copy from a designated place, then offering equivalent
|
||||||
|
access to copy the source code from the same place counts as
|
||||||
|
distribution of the source code, even though third parties are not
|
||||||
|
compelled to copy the source along with the object code.
|
||||||
|
|
||||||
|
4. You may not copy, modify, sublicense, or distribute the Program
|
||||||
|
except as expressly provided under this License. Any attempt
|
||||||
|
otherwise to copy, modify, sublicense or distribute the Program is
|
||||||
|
void, and will automatically terminate your rights under this License.
|
||||||
|
However, parties who have received copies, or rights, from you under
|
||||||
|
this License will not have their licenses terminated so long as such
|
||||||
|
parties remain in full compliance.
|
||||||
|
|
||||||
|
5. You are not required to accept this License, since you have not
|
||||||
|
signed it. However, nothing else grants you permission to modify or
|
||||||
|
distribute the Program or its derivative works. These actions are
|
||||||
|
prohibited by law if you do not accept this License. Therefore, by
|
||||||
|
modifying or distributing the Program (or any work based on the
|
||||||
|
Program), you indicate your acceptance of this License to do so, and
|
||||||
|
all its terms and conditions for copying, distributing or modifying
|
||||||
|
the Program or works based on it.
|
||||||
|
|
||||||
|
6. Each time you redistribute the Program (or any work based on the
|
||||||
|
Program), the recipient automatically receives a license from the
|
||||||
|
original licensor to copy, distribute or modify the Program subject to
|
||||||
|
these terms and conditions. You may not impose any further
|
||||||
|
restrictions on the recipients' exercise of the rights granted herein.
|
||||||
|
You are not responsible for enforcing compliance by third parties to
|
||||||
|
this License.
|
||||||
|
|
||||||
|
7. If, as a consequence of a court judgment or allegation of patent
|
||||||
|
infringement or for any other reason (not limited to patent issues),
|
||||||
|
conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot
|
||||||
|
distribute so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you
|
||||||
|
may not distribute the Program at all. For example, if a patent
|
||||||
|
license would not permit royalty-free redistribution of the Program by
|
||||||
|
all those who receive copies directly or indirectly through you, then
|
||||||
|
the only way you could satisfy both it and this License would be to
|
||||||
|
refrain entirely from distribution of the Program.
|
||||||
|
|
||||||
|
If any portion of this section is held invalid or unenforceable under
|
||||||
|
any particular circumstance, the balance of the section is intended to
|
||||||
|
apply and the section as a whole is intended to apply in other
|
||||||
|
circumstances.
|
||||||
|
|
||||||
|
It is not the purpose of this section to induce you to infringe any
|
||||||
|
patents or other property right claims or to contest validity of any
|
||||||
|
such claims; this section has the sole purpose of protecting the
|
||||||
|
integrity of the free software distribution system, which is
|
||||||
|
implemented by public license practices. Many people have made
|
||||||
|
generous contributions to the wide range of software distributed
|
||||||
|
through that system in reliance on consistent application of that
|
||||||
|
system; it is up to the author/donor to decide if he or she is willing
|
||||||
|
to distribute software through any other system and a licensee cannot
|
||||||
|
impose that choice.
|
||||||
|
|
||||||
|
This section is intended to make thoroughly clear what is believed to
|
||||||
|
be a consequence of the rest of this License.
|
||||||
|
|
||||||
|
8. If the distribution and/or use of the Program is restricted in
|
||||||
|
certain countries either by patents or by copyrighted interfaces, the
|
||||||
|
original copyright holder who places the Program under this License
|
||||||
|
may add an explicit geographical distribution limitation excluding
|
||||||
|
those countries, so that distribution is permitted only in or among
|
||||||
|
countries not thus excluded. In such case, this License incorporates
|
||||||
|
the limitation as if written in the body of this License.
|
||||||
|
|
||||||
|
9. The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies a version number of this License which applies to it and "any
|
||||||
|
later version", you have the option of following the terms and conditions
|
||||||
|
either of that version or of any later version published by the Free
|
||||||
|
Software Foundation. If the Program does not specify a version number of
|
||||||
|
this License, you may choose any version ever published by the Free Software
|
||||||
|
Foundation.
|
||||||
|
|
||||||
|
10. If you wish to incorporate parts of the Program into other free
|
||||||
|
programs whose distribution conditions are different, write to the author
|
||||||
|
to ask for permission. For software which is copyrighted by the Free
|
||||||
|
Software Foundation, write to the Free Software Foundation; we sometimes
|
||||||
|
make exceptions for this. Our decision will be guided by the two goals
|
||||||
|
of preserving the free status of all derivatives of our free software and
|
||||||
|
of promoting the sharing and reuse of software generally.
|
||||||
|
|
||||||
|
NO WARRANTY
|
||||||
|
|
||||||
|
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||||
|
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||||
|
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
||||||
|
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
||||||
|
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||||
|
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
||||||
|
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
||||||
|
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
||||||
|
REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
||||||
|
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
||||||
|
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
||||||
|
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
||||||
|
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||||
|
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||||
|
POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
convey the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software; you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation; either version 2 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License along
|
||||||
|
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
|
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program is interactive, make it output a short notice like this
|
||||||
|
when it starts in an interactive mode:
|
||||||
|
|
||||||
|
Gnomovision version 69, Copyright (C) year name of author
|
||||||
|
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, the commands you use may
|
||||||
|
be called something other than `show w' and `show c'; they could even be
|
||||||
|
mouse-clicks or menu items--whatever suits your program.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or your
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. Here is a sample; alter the names:
|
||||||
|
|
||||||
|
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
||||||
|
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
||||||
|
|
||||||
|
<signature of Ty Coon>, 1 April 1989
|
||||||
|
Ty Coon, President of Vice
|
||||||
|
|
||||||
|
This General Public License does not permit incorporating your program into
|
||||||
|
proprietary programs. If your program is a subroutine library, you may
|
||||||
|
consider it more useful to permit linking proprietary applications with the
|
||||||
|
library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License.
|
149
LICENSE.txt
149
LICENSE.txt
|
@ -1,149 +0,0 @@
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
Business Source License 1.1
|
|
||||||
|
|
||||||
License text copyright (c) 2017 MariaDB Corporation Ab, All Rights Reserved.
|
|
||||||
"Business Source License" is a trademark of MariaDB Corporation Ab.
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
Parameters
|
|
||||||
|
|
||||||
Licensor: ZeroTier, Inc.
|
|
||||||
Licensed Work: ZeroTier Network Virtualization Engine 1.4.4
|
|
||||||
The Licensed Work is (c)2019 ZeroTier, Inc.
|
|
||||||
Additional Use Grant: You may make use of the Licensed Work, provided you
|
|
||||||
do not use it in any of the following ways:
|
|
||||||
|
|
||||||
* Sell hosted ZeroTier services as a "SaaS" Product
|
|
||||||
|
|
||||||
(1) Operate or sell access to ZeroTier root servers,
|
|
||||||
network controllers, or authorization key or certificate
|
|
||||||
generation components of the Licensed Work as a
|
|
||||||
for-profit service, regardless of whether the use of
|
|
||||||
these components is sold alone or is bundled with other
|
|
||||||
services. Note that this does not apply to the use of
|
|
||||||
ZeroTier behind the scenes to operate a service not
|
|
||||||
related to ZeroTier network administration.
|
|
||||||
|
|
||||||
* Create Non-Open-Source Commercial Derivative Works
|
|
||||||
|
|
||||||
(2) Link or directly include the Licensed Work in a
|
|
||||||
commercial or for-profit application or other product
|
|
||||||
not distributed under an Open Source Initiative (OSI)
|
|
||||||
compliant license. See: https://opensource.org/licenses
|
|
||||||
|
|
||||||
(3) Remove the name, logo, copyright, or other branding
|
|
||||||
material from the Licensed Work to create a "rebranded"
|
|
||||||
or "white labeled" version to distribute as part of
|
|
||||||
any commercial or for-profit product or service.
|
|
||||||
|
|
||||||
* Certain Government Uses
|
|
||||||
|
|
||||||
(4) Use or deploy the Licensed Work in a government
|
|
||||||
setting in support of any active government function
|
|
||||||
or operation with the exception of the following:
|
|
||||||
physical or mental health care, family and social
|
|
||||||
services, social welfare, senior care, child care, and
|
|
||||||
the care of persons with disabilities.
|
|
||||||
|
|
||||||
Change Date: 2026-01-01
|
|
||||||
|
|
||||||
Change License: Apache License version 2.0 as published by the Apache
|
|
||||||
Software Foundation
|
|
||||||
https://www.apache.org/licenses/
|
|
||||||
|
|
||||||
Alternative Licensing
|
|
||||||
|
|
||||||
If you would like to use the Licensed Work in any way that conflicts with
|
|
||||||
the stipulations of the Additional Use Grant, contact ZeroTier, Inc. to
|
|
||||||
obtain an alternative commercial license.
|
|
||||||
|
|
||||||
Visit us on the web at: https://www.zerotier.com/
|
|
||||||
|
|
||||||
Notice
|
|
||||||
|
|
||||||
The Business Source License (this document, or the "License") is not an Open
|
|
||||||
Source license. However, the Licensed Work will eventually be made available
|
|
||||||
under an Open Source License, as stated in this License.
|
|
||||||
|
|
||||||
For more information on the use of the Business Source License for ZeroTier
|
|
||||||
products, please visit our pricing page which contains license details and
|
|
||||||
and license FAQ: https://zerotier.com/pricing
|
|
||||||
|
|
||||||
For more information on the use of the Business Source License generally,
|
|
||||||
please visit the Adopting and Developing Business Source License FAQ at
|
|
||||||
https://mariadb.com/bsl-faq-adopting.
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
Business Source License 1.1
|
|
||||||
|
|
||||||
Terms
|
|
||||||
|
|
||||||
The Licensor hereby grants you the right to copy, modify, create derivative
|
|
||||||
works, redistribute, and make non-production use of the Licensed Work. The
|
|
||||||
Licensor may make an Additional Use Grant, above, permitting limited
|
|
||||||
production use.
|
|
||||||
|
|
||||||
Effective on the Change Date, or the fourth anniversary of the first publicly
|
|
||||||
available distribution of a specific version of the Licensed Work under this
|
|
||||||
License, whichever comes first, the Licensor hereby grants you rights under
|
|
||||||
the terms of the Change License, and the rights granted in the paragraph
|
|
||||||
above terminate.
|
|
||||||
|
|
||||||
If your use of the Licensed Work does not comply with the requirements
|
|
||||||
currently in effect as described in this License, you must purchase a
|
|
||||||
commercial license from the Licensor, its affiliated entities, or authorized
|
|
||||||
resellers, or you must refrain from using the Licensed Work.
|
|
||||||
|
|
||||||
All copies of the original and modified Licensed Work, and derivative works
|
|
||||||
of the Licensed Work, are subject to this License. This License applies
|
|
||||||
separately for each version of the Licensed Work and the Change Date may vary
|
|
||||||
for each version of the Licensed Work released by Licensor.
|
|
||||||
|
|
||||||
You must conspicuously display this License on each original or modified copy
|
|
||||||
of the Licensed Work. If you receive the Licensed Work in original or
|
|
||||||
modified form from a third party, the terms and conditions set forth in this
|
|
||||||
License apply to your use of that work.
|
|
||||||
|
|
||||||
Any use of the Licensed Work in violation of this License will automatically
|
|
||||||
terminate your rights under this License for the current and all other
|
|
||||||
versions of the Licensed Work.
|
|
||||||
|
|
||||||
This License does not grant you any right in any trademark or logo of
|
|
||||||
Licensor or its affiliates (provided that you may use a trademark or logo of
|
|
||||||
Licensor as expressly required by this License).
|
|
||||||
|
|
||||||
TO THE EXTENT PERMITTED BY APPLICABLE LAW, THE LICENSED WORK IS PROVIDED ON
|
|
||||||
AN "AS IS" BASIS. LICENSOR HEREBY DISCLAIMS ALL WARRANTIES AND CONDITIONS,
|
|
||||||
EXPRESS OR IMPLIED, INCLUDING (WITHOUT LIMITATION) WARRANTIES OF
|
|
||||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, NON-INFRINGEMENT, AND
|
|
||||||
TITLE.
|
|
||||||
|
|
||||||
-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
MariaDB hereby grants you permission to use this License’s text to license
|
|
||||||
your works, and to refer to it using the trademark "Business Source License",
|
|
||||||
as long as you comply with the Covenants of Licensor below.
|
|
||||||
|
|
||||||
Covenants of Licensor
|
|
||||||
|
|
||||||
In consideration of the right to use this License’s text and the "Business
|
|
||||||
Source License" name and trademark, Licensor covenants to MariaDB, and to all
|
|
||||||
other recipients of the licensed work to be provided by Licensor:
|
|
||||||
|
|
||||||
1. To specify as the Change License the GPL Version 2.0 or any later version,
|
|
||||||
or a license that is compatible with GPL Version 2.0 or a later version,
|
|
||||||
where "compatible" means that software provided under the Change License can
|
|
||||||
be included in a program with software provided under GPL Version 2.0 or a
|
|
||||||
later version. Licensor may specify additional Change Licenses without
|
|
||||||
limitation.
|
|
||||||
|
|
||||||
2. To either: (a) specify an additional grant of rights to use that does not
|
|
||||||
impose any additional restriction on the right granted in this License, as
|
|
||||||
the Additional Use Grant; or (b) insert the text "None".
|
|
||||||
|
|
||||||
3. To specify a Change Date.
|
|
||||||
|
|
||||||
4. Not to modify this License in any other way.
|
|
19
Makefile
19
Makefile
|
@ -11,23 +11,8 @@ ifeq ($(OSTYPE),Linux)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSTYPE),FreeBSD)
|
ifeq ($(OSTYPE),FreeBSD)
|
||||||
CC=clang
|
include make-freebsd.mk
|
||||||
CXX=clang++
|
|
||||||
ZT_BUILD_PLATFORM=7
|
|
||||||
include make-bsd.mk
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(OSTYPE),OpenBSD)
|
ifeq ($(OSTYPE),OpenBSD)
|
||||||
CC=clang
|
include make-freebsd.mk
|
||||||
CXX=clang++
|
|
||||||
ZT_BUILD_PLATFORM=9
|
|
||||||
include make-bsd.mk
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
ifeq ($(OSTYPE),NetBSD)
|
|
||||||
include make-netbsd.mk
|
|
||||||
endif
|
|
||||||
|
|
||||||
drone:
|
|
||||||
@echo "rendering .drone.yaml from .drone.jsonnet"
|
|
||||||
drone jsonnet --format --stream
|
|
||||||
drone sign zerotier/ZeroTierOne --save
|
|
||||||
|
|
|
@ -1,33 +0,0 @@
|
||||||
ZeroTier Official Release Steps
|
|
||||||
======
|
|
||||||
|
|
||||||
This is mostly for ZeroTier internal use, but others who want to do builds might find it helpful.
|
|
||||||
|
|
||||||
Note: Many of these steps will require GPG and other signing keys that are kept in cold storage and must be mounted.
|
|
||||||
|
|
||||||
# Bumping the Version and Preparing Installers
|
|
||||||
|
|
||||||
The version must be incremented in all of the following files:
|
|
||||||
|
|
||||||
/version.h
|
|
||||||
/zerotier-one.spec
|
|
||||||
/debian/changelog
|
|
||||||
/ext/installfiles/mac/ZeroTier One.pkgproj
|
|
||||||
/ext/installfiles/windows/ZeroTier One.aip
|
|
||||||
../DesktopUI/mac-app-template/ZeroTier.app/Contents/Info.plist
|
|
||||||
|
|
||||||
The final .AIP file can only be edited on Windows with [Advanced Installer Enterprise](http://www.advancedinstaller.com/). In addition to incrementing the version be sure that a new product code is generated. (The "upgrade code" GUID on the other hand must never change.)
|
|
||||||
|
|
||||||
# Building for Supported Platforms
|
|
||||||
|
|
||||||
## Macintosh
|
|
||||||
|
|
||||||
Mac's easy. Just type:
|
|
||||||
|
|
||||||
make official
|
|
||||||
|
|
||||||
You will need [Packages](http://s.sudre.free.fr/Software/Packages/about.html) and our release signing key in the keychain.
|
|
||||||
|
|
||||||
## Windows
|
|
||||||
|
|
||||||
First load the Visual Studio solution and rebuild the UI and ZeroTier One in both x64 and i386 `Release` mode. Then load [Advanced Installer Enterprise](http://www.advancedinstaller.com/), check that the version is correct, and build. The build will fail if any build artifacts are missing, and Windows must have our product singing key (from DigiCert) available to sign the resulting MSI file. The MSI must then be tested on at least a few different CLEAN Windows VMs to ensure that the installer is valid and properly signed.
|
|
|
@ -1,73 +0,0 @@
|
||||||
# ZeroTier One in a container!
|
|
||||||
|
|
||||||
**NOTE:** _Most of this information pertains to the docker image only. For more information about ZeroTier, check out the repository_: [here](https://github.com/zerotier/ZeroTierOne) or the [commercial website](https://www.zerotier.com).
|
|
||||||
|
|
||||||
[ZeroTier](https://www.zerotier.com) is a smart programmable Ethernet switch for planet Earth. It allows all networked devices, VMs, containers, and applications to communicate as if they all reside in the same physical data center or cloud region.
|
|
||||||
|
|
||||||
This is accomplished by combining a cryptographically addressed and secure peer to peer network (termed VL1) with an Ethernet emulation layer somewhat similar to VXLAN (termed VL2). Our VL2 Ethernet virtualization layer includes advanced enterprise SDN features like fine grained access control rules for network micro-segmentation and security monitoring.
|
|
||||||
|
|
||||||
All ZeroTier traffic is encrypted end-to-end using secret keys that only you control. Most traffic flows peer to peer, though we offer free (but slow) relaying for users who cannot establish peer to peer connections.
|
|
||||||
|
|
||||||
The goals and design principles of ZeroTier are inspired by among other things the original [Google BeyondCorp](https://static.googleusercontent.com/media/research.google.com/en//pubs/archive/43231.pdf) paper and the [Jericho Forum](https://en.wikipedia.org/wiki/Jericho_Forum) with its notion of "deperimeterization."
|
|
||||||
|
|
||||||
Visit [ZeroTier's site](https://www.zerotier.com/) for more information and [pre-built binary packages](https://www.zerotier.com/download/). Apps for Android and iOS are available for free in the Google Play and Apple app stores.
|
|
||||||
|
|
||||||
ZeroTier is licensed under the [BSL version 1.1](https://mariadb.com/bsl11/). See [LICENSE.txt](https://github.com/zerotier/ZeroTierOne/blob/master/LICENSE.txt) and the [ZeroTier pricing page](https://www.zerotier.com/pricing) for details. ZeroTier is free to use internally in businesses and academic institutions and for non-commercial purposes. Certain types of commercial use such as building closed-source apps and devices based on ZeroTier or offering ZeroTier network controllers and network management as a SaaS service require a commercial license.
|
|
||||||
|
|
||||||
A small amount of third party code is also included in ZeroTier and is not subject to our BSL license. See [AUTHORS.md](https://github.com/zerotier/ZeroTierOne/blob/master/AUTHORS.md) for a list of third party code, where it is included, and the licenses that apply to it. All of the third party code in ZeroTier is liberally licensed (MIT, BSD, Apache, public domain, etc.).
|
|
||||||
|
|
||||||
## Building the docker image
|
|
||||||
|
|
||||||
Due to the network being a substrate for most applications and not an application unto itself, it makes sense that many people would want to build their own image based on our formula.
|
|
||||||
|
|
||||||
The image is based on `debian:buster`.
|
|
||||||
|
|
||||||
The `Dockerfile.release` file contains build instructions for building the described image in the rest of the README. The build is multi-arch and multi-release capable.
|
|
||||||
|
|
||||||
These build arguments power the build:
|
|
||||||
|
|
||||||
- `PACKAGE_BASEURL`: The base URL of the package repository to fetch from. (default: `https://download.zerotier.com/debian/buster/pool/main/z/zerotier-one/`)
|
|
||||||
- `ARCH`: The architecture of the package, in debian format. Must match your image arch. (default: `amd64`)
|
|
||||||
- `VERSION`: **REQUIRED** the version of ZeroTier to fetch.
|
|
||||||
|
|
||||||
You can build this image like so:
|
|
||||||
|
|
||||||
```
|
|
||||||
docker build -f Dockerfile.release -t mybuild --build-arg VERSION=1.6.5 .
|
|
||||||
```
|
|
||||||
|
|
||||||
## Using the docker image
|
|
||||||
|
|
||||||
The `entrypoint.sh` in the docker image is a little different; zerotier will be spawned in the background and the "main process" is actually just a sleeping shell script. This allows `zerotier-one` to gracefully terminate in some situations largely unique to docker.
|
|
||||||
|
|
||||||
The `zerotier/zerotier` image requires the `CAP_NET_ADMIN` capability and the `/dev/net/tun` device must be forwarded to it.
|
|
||||||
|
|
||||||
To join a network, simply supply it on the command-line; you can supply multiple networks.
|
|
||||||
|
|
||||||
```
|
|
||||||
docker run --name myzerotier --rm --cap-add NET_ADMIN --device /dev/net/tun zerotier/zerotier:latest abcdefdeadbeef00
|
|
||||||
```
|
|
||||||
|
|
||||||
Once joining all the networks you have provided, it will sleep until terminated. Note that in ZeroTier, joining a network does not necessarily mean you have an IP or can do anything, really. You will want to probe the control socket:
|
|
||||||
|
|
||||||
```
|
|
||||||
docker exec myzerotier zerotier-cli listnetworks
|
|
||||||
```
|
|
||||||
|
|
||||||
To ensure you have a network available before trying to listen on it. Without pre-configuring the identity, this usually means going to the central admin panel and clicking the checkmark against your zerotier identity.
|
|
||||||
|
|
||||||
### Environment Variables
|
|
||||||
|
|
||||||
You can control a few settings including the identity used and the authtoken used to interact with the control socket (which you can forward and access through `localhost:9993`).
|
|
||||||
|
|
||||||
- `ZEROTIER_JOIN_NETWORKS`: additional way to set networks to join.
|
|
||||||
- `ZEROTIER_API_SECRET`: replaces the `authtoken.secret` before booting and allows you to manage the control socket's authentication key.
|
|
||||||
- `ZEROTIER_IDENTITY_PUBLIC`: the `identity.public` file for zerotier-one. Use `zerotier-idtool` to generate one of these for you.
|
|
||||||
- `ZEROTIER_IDENTITY_SECRET`: the `identity.secret` file for zerotier-one. Use `zerotier-idtool` to generate one of these for you.
|
|
||||||
- `ZEROTIER_LOCAL_CONF`: Sets the the `local.conf` file content for zerotier-one
|
|
||||||
|
|
||||||
### Tips
|
|
||||||
|
|
||||||
- Forwarding port `<dockerip>:9993` to somewhere outside is probably a good idea for highly trafficked services.
|
|
||||||
- Forwarding `localhost:9993` to a control network where you can drive it remotely might be a good idea, just be sure to set your authtoken properly through environment variables.
|
|
||||||
- Pre-generating your identities could be much simpler to do via our [terraform plugin](https://github.com/zerotier/terraform-provider-zerotier)
|
|
286
README.md
286
README.md
|
@ -1,197 +1,175 @@
|
||||||
ZeroTier - Global Area Networking
|
ZeroTier One
|
||||||
======
|
======
|
||||||
|
|
||||||
*This document is written for a software developer audience. For information on using ZeroTier, see the: [Website](https://www.zerotier.com), [Documentation Site](https://docs.zerotier.com), and [Discussion Forum](https://discuss.zerotier.com).*
|
ZeroTier is a software defined networking layer for Earth.
|
||||||
|
|
||||||
ZeroTier is a smart programmable Ethernet switch for planet Earth. It allows all networked devices, VMs, containers, and applications to communicate as if they all reside in the same physical data center or cloud region.
|
It can be used for on-premise network virtualization, as a peer to peer VPN for mobile teams, for hybrid or multi-data-center cloud deployments, or just about anywhere else secure software defined virtual networking is useful.
|
||||||
|
|
||||||
This is accomplished by combining a cryptographically addressed and secure peer to peer network (termed VL1) with an Ethernet emulation layer somewhat similar to VXLAN (termed VL2). Our VL2 Ethernet virtualization layer includes advanced enterprise SDN features like fine grained access control rules for network micro-segmentation and security monitoring.
|
ZeroTier One is our OS-level client service. It allows Mac, Linux, Windows, FreeBSD, and soon other types of clients to join ZeroTier virtual networks like conventional VPNs or VLANs. It can run on native systems, VMs, or containers (Docker, OpenVZ, etc.).
|
||||||
|
|
||||||
All ZeroTier traffic is encrypted end-to-end using secret keys that only you control. Most traffic flows peer to peer, though we offer free (but slow) relaying for users who cannot establish peer to peer connections.
|
Visit [ZeroTier's site](https://www.zerotier.com/) for more information. You can also download professionally packaged binary installers/packages for a variety of supported OSes there if you don't want to build ZeroTier One from source.
|
||||||
|
|
||||||
The goals and design principles of ZeroTier are inspired by among other things the original [Google BeyondCorp](https://static.googleusercontent.com/media/research.google.com/en//pubs/archive/43231.pdf) paper and the [Jericho Forum](https://en.wikipedia.org/wiki/Jericho_Forum) with its notion of "deperimeterization."
|
### Building from Source
|
||||||
|
|
||||||
Visit [ZeroTier's site](https://www.zerotier.com/) for more information and [pre-built binary packages](https://www.zerotier.com/download/). Apps for Android and iOS are available for free in the Google Play and Apple app stores.
|
For Mac, Linux, and BSD, just type "make" (or "gmake" on BSD). You won't need much installed; here are the requirements for various platforms:
|
||||||
|
|
||||||
ZeroTier is licensed under the [BSL version 1.1](https://mariadb.com/bsl11/). See [LICENSE.txt](LICENSE.txt) and the [ZeroTier pricing page](https://www.zerotier.com/pricing) for details. ZeroTier is free to use internally in businesses and academic institutions and for non-commercial purposes. Certain types of commercial use such as building closed-source apps and devices based on ZeroTier or offering ZeroTier network controllers and network management as a SaaS service require a commercial license.
|
* Mac: Xcode command line tools, and [Packages](http://s.sudre.free.fr/Software/Packages/about.html) if you want to build an OSX .pkg installer ("make mac-dist-pkg"). It should build on OSX 10.7 or newer.
|
||||||
|
* Linux: gcc/g++ or clang/clang++ (Makefile will use clang by default if available.)
|
||||||
|
* FreeBSD (and other BSD): C++ compiler (G++ usually) and GNU make (gmake).
|
||||||
|
|
||||||
A small amount of third party code is also included in ZeroTier and is not subject to our BSL license. See [AUTHORS.md](AUTHORS.md) for a list of third party code, where it is included, and the licenses that apply to it. All of the third party code in ZeroTier is liberally licensed (MIT, BSD, Apache, public domain, etc.).
|
Each supported platform has its own *make-XXX.mk* file that contains the actual make rules for the platform. The right .mk file is included by the main Makefile based on the GNU make *OSTYPE* variable. Take a look at the .mk file for your platform for other targets, debug build rules, etc.
|
||||||
|
|
||||||
### Getting Started
|
Windows, of course, is special. We build for Windows with Microsoft Visual Studio 2012 on Windows 7. A solution file is located in the *windows* subfolder. Newer versions of Visual Studio (and Windows) may work but haven't been tested. Older versions almost certainly will not, since they lack things like *stdint.h* and certain STL features. MinGW or other ports of gcc/clang to Windows should also work but haven't been tested. Build steps for Windows are a bit more complicated. For the moment you are on your own there.
|
||||||
|
|
||||||
Everything in the ZeroTier world is controlled by two types of identifier: 40-bit/10-digit *ZeroTier addresses* and 64-bit/16-digit *network IDs*. These identifiers are easily distinguished by their length. A ZeroTier address identifies a node or "device" (laptop, phone, server, VM, app, etc.) while a network ID identifies a virtual Ethernet network that can be joined by devices.
|
Mobile versions are in progress. They don't work yet, and in any case only the glue code will be included in this repository. The full mobile apps are in private repositories on our own git server.
|
||||||
|
|
||||||
ZeroTier addresses can be thought of as port numbers on an enormous planet-wide enterprise Ethernet smart switch supporting VLANs. Network IDs are VLAN IDs to which these ports may be assigned. A single port can be assigned to more than one VLAN.
|
### Supported Platforms
|
||||||
|
|
||||||
A ZeroTier address looks like `8056c2e21c` and a network ID looks like `8056c2e21c000001`. Network IDs are composed of the ZeroTier address of that network's primary controller and an arbitrary 24-bit ID that identifies the network on this controller. Network controllers are roughly analogous to SDN controllers in SDN protocols like [OpenFlow](https://en.wikipedia.org/wiki/OpenFlow), though as with the analogy between VXLAN and VL2 this should not be read to imply that the protocols or design are the same. You can use our convenient and inexpensive SaaS hosted controllers at [my.zerotier.com](https://my.zerotier.com/) or [run your own controller](controller/) if you don't mind messing around with JSON configuration files or writing scripts to do so.
|
CPU architecture shouldn't matter unless it's smaller than 32-bit or something really bizarre like a "middle-endian" processor. We have reports of ZeroTier One running on arm32, arm64, and MIPS. It builds and runs out of the box on Raspberry Pi, BeagleBone, BananaPi, and other ARM-based developer/hobbyist boards.
|
||||||
|
|
||||||
### Project Layout
|
ZeroTier is written in C and C++ (C++03 / ISO/IEC 14882:2003) and uses data structures and algorithms from the C++03 STL. We do not use any C++11 features (yet), since we want to support a few old and embedded platforms that don't have C++11 compilers. You *will* require a compiler and headers new enough to support 64-bit integers (long long) and the *stdint.h* header. The latter could also be faked by adding defines for things like *uint32\_t*, *int64\_t*, etc.
|
||||||
|
|
||||||
The base path contains the ZeroTier One service main entry point (`one.cpp`), self test code, makefiles, etc.
|
Typing "make selftest" will build a *zerotier-selftest* binary which unit tests various internals and reports on a few aspects of the build environment. It's a good idea to try this on novel platforms or architectures.
|
||||||
|
|
||||||
- `artwork/`: icons, logos, etc.
|
|
||||||
- `attic/`: old stuff and experimental code that we want to keep around for reference.
|
|
||||||
- `controller/`: the reference network controller implementation, which is built and included by default on desktop and server build targets.
|
|
||||||
- `debian/`: files for building Debian packages on Linux.
|
|
||||||
- `doc/`: manual pages and other documentation.
|
|
||||||
- `ext/`: third party libraries, binaries that we ship for convenience on some platforms (Mac and Windows), and installation support files.
|
|
||||||
- `include/`: include files for the ZeroTier core.
|
|
||||||
- `java/`: a JNI wrapper used with our Android mobile app. (The whole Android app is not open source but may be made so in the future.)
|
|
||||||
- `node/`: the ZeroTier virtual Ethernet switch core, which is designed to be entirely separate from the rest of the code and able to be built as a stand-alone OS-independent library. Note to developers: do not use C++11 features in here, since we want this to build on old embedded platforms that lack C++11 support. C++11 can be used elsewhere.
|
|
||||||
- `osdep/`: code to support and integrate with OSes, including platform-specific stuff only built for certain targets.
|
|
||||||
- `rule-compiler/`: JavaScript rules language compiler for defining network-level rules.
|
|
||||||
- `service/`: the ZeroTier One service, which wraps the ZeroTier core and provides VPN-like connectivity to virtual networks for desktops, laptops, servers, VMs, and containers.
|
|
||||||
- `windows/`: Visual Studio solution files, Windows service code, and the Windows task bar app UI.
|
|
||||||
- `zeroidc/`: OIDC implementation used by ZeroTier service to log into SSO-enabled networks. (This part is written in Rust, and more Rust will be appearing in this repository in the future.)
|
|
||||||
|
|
||||||
### Contributing
|
|
||||||
|
|
||||||
Please do pull requests off of the `dev` branch.
|
|
||||||
|
|
||||||
Releases are done by merging `dev` into `main` and then tagging and doing builds.
|
|
||||||
|
|
||||||
### Build and Platform Notes
|
|
||||||
|
|
||||||
To build on Mac and Linux just type `make`. On FreeBSD and OpenBSD `gmake` (GNU make) is required and can be installed from packages or ports. For Windows there is a Visual Studio solution in `windows/`.
|
|
||||||
|
|
||||||
- **Mac**
|
|
||||||
- Xcode command line tools for macOS 10.13 or newer are required.
|
|
||||||
- Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
|
|
||||||
- **Linux**
|
|
||||||
- The minimum compiler versions required are GCC/G++ 8.x or CLANG/CLANG++ 5.x.
|
|
||||||
- Linux makefiles automatically detect and prefer clang/clang++ if present as it produces smaller and slightly faster binaries in most cases. You can override by supplying CC and CXX variables on the make command line.
|
|
||||||
- Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
|
|
||||||
- **Windows**
|
|
||||||
- Visual Studio 2022 on Windows 10 or newer.
|
|
||||||
- Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
|
|
||||||
- **FreeBSD**
|
|
||||||
- GNU make is required. Type `gmake` to build.
|
|
||||||
- `binutils` is required. Type `pkg install binutils` to install.
|
|
||||||
- Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
|
|
||||||
- **OpenBSD**
|
|
||||||
- There is a limit of four network memberships on OpenBSD as there are only four tap devices (`/dev/tap0` through `/dev/tap3`).
|
|
||||||
- GNU make is required. Type `gmake` to build.
|
|
||||||
- Rust for x86_64 and ARM64 targets *if SSO is enabled in the build*.
|
|
||||||
|
|
||||||
Typing `make selftest` will build a *zerotier-selftest* binary which unit tests various internals and reports on a few aspects of the build environment. It's a good idea to try this on novel platforms or architectures.
|
|
||||||
|
|
||||||
### Running
|
### Running
|
||||||
|
|
||||||
Running *zerotier-one* with `-h` option will show help.
|
Running *zerotier-one* with -h will show help.
|
||||||
|
|
||||||
On Linux and BSD, if you built from source, you can start the service with:
|
On Linux and BSD you can start the service with:
|
||||||
|
|
||||||
sudo ./zerotier-one -d
|
sudo ./zerotier-one -d
|
||||||
|
|
||||||
On most distributions, macOS, and Windows, the installer will start the service and set it up to start on boot.
|
|
||||||
|
|
||||||
A home folder for your system will automatically be created.
|
A home folder for your system will automatically be created.
|
||||||
|
|
||||||
The service is controlled via the JSON API, which by default is available at `127.0.0.1:9993`. It also listens on `0.0.0.0:9993` which is only usable if `allowManagementFrom` is properly configured in `local.conf`. We include a *zerotier-cli* command line utility to make API calls for standard things like joining and leaving networks. The *authtoken.secret* file in the home folder contains the secret token for accessing this API. See [service/README.md](service/README.md) for API documentation.
|
The service is controlled via the JSON API, which by default is available at 127.0.0.1 port 9993. We include a *zerotier-cli* command line utility to make API calls for standard things like joining and leaving networks. The *authtoken.secret* file in the home folder contains the secret token for accessing this API. See README.md in [service/](service/) for API documentation.
|
||||||
|
|
||||||
Here's where home folders live (by default) on each OS:
|
Here's where home folders live (by default) on each OS:
|
||||||
|
|
||||||
* **Linux**: `/var/lib/zerotier-one`
|
* Linux: /var/lib/zerotier-one
|
||||||
* **FreeBSD** / **OpenBSD**: `/var/db/zerotier-one`
|
* BSD: /var/db/zerotier-one
|
||||||
* **Mac**: `/Library/Application Support/ZeroTier/One`
|
* Mac: /Library/Application Support/ZeroTier/One
|
||||||
* **Windows**: `\ProgramData\ZeroTier\One` (That's the default. The base 'shared app data' folder might be different if Windows is installed with a non-standard drive letter assignment or layout.)
|
* Windows: \\ProgramData\\ZeroTier\\One (That's for Windows 7. The base 'shared app data' folder might be different on different Windows versions.)
|
||||||
|
|
||||||
### Basic Troubleshooting
|
Running ZeroTier One on a Mac is the same, but OSX requires a kernel extension. We ship a signed binary build of the ZeroTier tap device driver, which can be installed on Mac with:
|
||||||
|
|
||||||
|
sudo make install-mac-tap
|
||||||
|
|
||||||
|
This will create the home folder for Mac, place *tap.kext* there, and set its modes correctly to enable ZeroTier One to manage it with *kextload* and *kextunload*.
|
||||||
|
|
||||||
|
We recommend using our binary packages on Windows, since there are several prerequisites such as a tap driver that must be installed on the system *and* in the home folder.
|
||||||
|
|
||||||
|
### Joining A Network
|
||||||
|
|
||||||
|
ZeroTier virtual networks are identified by 16-digit hexadecimal network IDs, while devices are identified by 10-digit addresses. To get your address run:
|
||||||
|
|
||||||
|
sudo zerotier-cli status
|
||||||
|
|
||||||
|
(Use ./zerotier-cli if you're running it right from your build folder.)
|
||||||
|
|
||||||
|
You should see something like:
|
||||||
|
|
||||||
|
200 info ########## ONLINE #.#.#
|
||||||
|
|
||||||
|
That 10-digit hex code is you. It's derived via a one-way proof of work function from your cryptographic public key. Your public key can be found in *identity.public* in ZeroTier's home folder, while *identity.secret* contains your full identity including the secret portion of the key pair.
|
||||||
|
|
||||||
|
(The identity files define your device's *identity*. Moving them to another system will move that identity. Be careful when cloning virtual machines that have identities stored on them. If two devices have the same identity, they'll "fight" over it and you won't know which device will receive network packets.)
|
||||||
|
|
||||||
|
If you want to do a quick test, you can join [Earth](https://www.zerotier.com/earth.html). It's a global public network that anyone can join. Type:
|
||||||
|
|
||||||
|
sudo zerotier-cli join 8056c2e21c000001
|
||||||
|
|
||||||
|
Then:
|
||||||
|
|
||||||
|
sudo zerotier-cli listnetworks
|
||||||
|
|
||||||
|
At first it'll be in *REQUESTING\_CONFIGURATION* state. In a few seconds to a minute you should see something like:
|
||||||
|
|
||||||
|
200 listnetworks 8056c2e21c000001 earth.zerotier.net ##:##:##:##:##:## OK PUBLIC zt0 ##.##.##.##/##
|
||||||
|
|
||||||
|
Earth will assign you an IP address in the "unofficially available" globally unrouted 28.0.0.0/7 IP block so as to avoid conflicts with local networks. (Your networks can use any IP scheme, or can even leave IP addresses unmanaged.) Once you get an IP, you should be able to ping something:
|
||||||
|
|
||||||
|
ping earth.zerotier.net
|
||||||
|
|
||||||
|
Go to [http://earth.zerotier.net/](http://earth.zerotier.net/) to see a short little welcome page that will tell you your IP and Ethernet MAC address.
|
||||||
|
|
||||||
|
Earth is a public place. If you don't want to stick around run:
|
||||||
|
|
||||||
|
sudo zerotier-cli leave 8056c2e21c000001
|
||||||
|
|
||||||
|
The network (and associated interface) should be gone.
|
||||||
|
|
||||||
|
Networks are created and administrated by network controllers. Most users will want to use our hosted controllers. Visit [our web site](https://www.zerotier.com/) for more information. Later in this README there are brief instructions about building ZeroTier One with network controller support for those who want to try running their own.
|
||||||
|
|
||||||
|
Macintosh and Windows installers also install a GUI application.
|
||||||
|
|
||||||
|
### Installing
|
||||||
|
|
||||||
|
We don't have a "make install" rule quite yet. On Linux you can type:
|
||||||
|
|
||||||
|
make installer
|
||||||
|
|
||||||
|
This will build a binary that, when run, will install ZeroTier One on most current Linux distributions. We also have RPM and DEB build files in *ext/installfiles/linux* that wrap this installer in packages for RedHat/CentOS and Debian/Ubuntu derived distributions. If *rpmbuild* is present on the system, the RPM will be built. If *dpkg-deb* is present, the DEB package will be built.
|
||||||
|
|
||||||
|
On Mac the best way is to install [Packages](http://s.sudre.free.fr/Software/Packages/about.html) and use:
|
||||||
|
|
||||||
|
make mac-dist-pkg
|
||||||
|
|
||||||
|
This builds a .pkg file that can be installed.
|
||||||
|
|
||||||
|
In FreeBSD there is now an official .pkg in the FreeBSD repository. Type "pkg install zerotier". It can also be built and installed from source.
|
||||||
|
|
||||||
|
Linux/BSD and Mac installations have an *uninstall.sh* file in their ZeroTier home folder that cleanly removes ZeroTier One from the system. Run this with:
|
||||||
|
|
||||||
|
sudo /path/to/ZeroTier/home/folder/uninstall.sh
|
||||||
|
|
||||||
|
Windows installers are insane. We build our .MSI installers with [Advanced Installer Enterprise](http://www.advancedinstaller.com). The Advanced Installer project file is in *ext/installfiles/windows*. To avoid lasting psychological trauma we recommend leaving Windows installers alone and using the pre-built Windows binaries on our web site.
|
||||||
|
|
||||||
|
### Using ZeroTier One in Docker Containers
|
||||||
|
|
||||||
|
To run the ZeroTier One service in a Docker container, run it with "--device=/dev/net/tun --cap-add=NET_ADMIN". This will allow ZeroTier One to open a "tap" virtual network port inside the container.
|
||||||
|
|
||||||
|
Alternately, you can use Ethernet bridging to bridge the *docker0* device on your system to a ZeroTier virtual network. This allows you to run ZeroTier One on the host and bridge the entire Docker network backplane to a virtual network or other hosts.
|
||||||
|
|
||||||
|
We're working on better "official" Docker support. In the meantime there is a [user-contributed project here](https://github.com/davide/docker-zerotier).
|
||||||
|
|
||||||
|
### Building with Network Controller Support
|
||||||
|
|
||||||
|
**Warning: as of beta version 1.0.3 the new network controller is not heavily tested. We recommend waiting for 1.0.4 to deploy this in production.**
|
||||||
|
|
||||||
|
Network controllers are nodes responsible for issuing configurations and certificates to members of ZeroTier virtual networks. Most users won't need to run their own, so this code is by default not included in the ZeroTier One binary.
|
||||||
|
|
||||||
|
You can build a network controller on Linux or Mac with:
|
||||||
|
|
||||||
|
make ZT_ENABLE_NETWORK_CONTROLLER=1
|
||||||
|
|
||||||
|
This will build a version that contains the Sqlite-backed network controller and associated extensions to the JSON local service control API. You will need the development headers for sqlite3 installed. On Mac these ship as part of Xcode, while on Linux they'll be found in packages for the various distributions.
|
||||||
|
|
||||||
|
See the JSON API documentation in [service/](service/) for more information about how to control controllers.
|
||||||
|
|
||||||
|
### Troubleshooting
|
||||||
|
|
||||||
For most users, it just works.
|
For most users, it just works.
|
||||||
|
|
||||||
If you are running a local system firewall, we recommend adding a rules permitting zerotier. If you installed binaries for Windows this should be done automatically. Other platforms might require manual editing of local firewall rules depending on your configuration.
|
If you are running a local system firewall, we recommend adding a rule permitting UDP port 9993 inbound and outbound. If you installed binaries for Windows this should be done automatically. Other platforms might require manual editing of local firewall rules depending on your configuration.
|
||||||
|
|
||||||
See the [documentation site](https://docs.zerotier.com/zerotier/troubleshooting) for more information.
|
The Mac firewall can be found under "Security" in System Preferences. Linux has a variety of firewall configuration systems and tools. If you're using Ubuntu's *ufw*, you can do this:
|
||||||
|
|
||||||
The Mac firewall can be found under "Security" in System Preferences. Linux has a variety of firewall configuration systems and tools.
|
sudo ufw allow 9993/udp
|
||||||
|
|
||||||
On CentOS check `/etc/sysconfig/iptables` for IPTables rules. For other distributions consult your distribution's documentation. You'll also have to check the UIs or documentation for commercial third party firewall applications like Little Snitch (Mac), McAfee Firewall Enterprise (Windows), etc. if you are running any of those. Some corporate environments might have centrally managed firewall software, so you might also have to contact IT.
|
On CentOS check */etc/sysconfig/iptables* for IPTables rules. For other distributions consult your distribution's documentation. You'll also have to check the UIs or documentation for commercial third party firewall applications like Little Snitch (Mac), McAfee Firewall Enterprise (Windows), etc. if you are running any of those. Some corporate environments might have centrally managed firewall software, so you might also have to contact IT.
|
||||||
|
|
||||||
ZeroTier One peers will automatically locate each other and communicate directly over a local wired LAN *if UDP port 9993 inbound is open*. If that port is filtered, they won't be able to see each others' LAN announcement packets. If you're experiencing poor performance between devices on the same physical network, check their firewall settings. Without LAN auto-location peers must attempt "loopback" NAT traversal, which sometimes fails and in any case requires that every packet traverse your external router twice.
|
ZeroTier One peers will automatically locate each other and communicate directly over a local wired LAN *if UDP port 9993 inbound is open*. If that port is filtered, they won't be able to see each others' LAN announcement packets. If you're experiencing poor performance between devices on the same physical network, check their firewall settings. Without LAN auto-location peers must attempt "loopback" NAT traversal, which sometimes fails and in any case requires that every packet traverse your external router twice.
|
||||||
|
|
||||||
Users behind certain types of firewalls and "symmetric" NAT devices may not be able to connect to external peers directly at all. ZeroTier has limited support for port prediction and will *attempt* to traverse symmetric NATs, but this doesn't always work. If P2P connectivity fails you'll be bouncing UDP packets off our relay servers resulting in slower performance. Some NAT router(s) have a configurable NAT mode, and setting this to "full cone" will eliminate this problem. If you do this you may also see a magical improvement for things like VoIP phones, Skype, BitTorrent, WebRTC, certain games, etc., since all of these use NAT traversal techniques similar to ours.
|
Users behind certain types of firewalls and "symmetric" NAT devices may not able able to connect to external peers directly at all. ZeroTier has limited support for port prediction and will *attempt* to traverse symmetric NATs, but this doesn't always work. If P2P connectivity fails you'll be bouncing UDP packets off our relay servers resulting in slower performance. Some NAT router(s) have a configurable NAT mode, and setting this to "full cone" will eliminate this problem. If you do this you may also see a magical improvement for things like VoIP phones, Skype, BitTorrent, WebRTC, certain games, etc., since all of these use NAT traversal techniques similar to ours.
|
||||||
|
|
||||||
|
If you're interested, there's a [technical deep dive about NAT traversal on our blog](https://www.zerotier.com/blog/?p=226). A troubleshooting tool to help you diagnose NAT issues is planned for the future as are uPnP/IGD/NAT-PMP and IPv6 transport.
|
||||||
|
|
||||||
If a firewall between you and the Internet blocks ZeroTier's UDP traffic, you will fall back to last-resort TCP tunneling to rootservers over port 443 (https impersonation). This will work almost anywhere but is *very slow* compared to UDP or direct peer to peer connectivity.
|
If a firewall between you and the Internet blocks ZeroTier's UDP traffic, you will fall back to last-resort TCP tunneling to rootservers over port 443 (https impersonation). This will work almost anywhere but is *very slow* compared to UDP or direct peer to peer connectivity.
|
||||||
|
|
||||||
Additional help can be found in our [knowledge base](https://zerotier.atlassian.net/wiki/spaces/SD/overview).
|
### Contributing
|
||||||
|
|
||||||
### Prometheus Metrics
|
There are three main branches: **edge**, **test**, and **master**. Other branches may be for specific features, tests, or use cases. In general **edge** is "bleeding" and may or may not work, while **test** should be relatively stable and **master** is the latest tagged release. Pull requests should generally be done against **test** or **edge**, since pull requests against **master** may be working against a branch that is somewhat out of date.
|
||||||
|
|
||||||
Prometheus Metrics are available at the `/metrics` API endpoint. This endpoint is protected by an API key stored in `metricstoken.secret` to prevent unwanted information leakage. Information that could be gleaned from the metrics include joined networks and peers your instance is talking to.
|
### License
|
||||||
|
|
||||||
Access control is via the ZeroTier control interface itself and `metricstoken.secret`. This can be sent as a bearer auth token, via the `X-ZT1-Auth` HTTP header field, or appended to the URL as `?auth=<token>`. You can see the current metrics via `cURL` with the following command:
|
The ZeroTier source code is open source and is licensed under the GNU GPL v3 (not LGPL). If you'd like to embed it in a closed-source commercial product or appliance, please e-mail [contact@zerotier.com](mailto:contact@zerotier.com) to discuss commercial licensing. Otherwise it can be used for free.
|
||||||
|
|
||||||
// Linux
|
|
||||||
curl -H "X-ZT1-Auth: $(sudo cat /var/lib/zerotier-one/metricstoken.secret)" http://localhost:9993/metrics
|
|
||||||
|
|
||||||
// macOS
|
|
||||||
curl -H "X-ZT1-Auth: $(sudo cat /Library/Application\ Support/ZeroTier/One/metricstoken.secret)" http://localhost:9993/metrics
|
|
||||||
|
|
||||||
// Windows PowerShell (Admin)
|
|
||||||
Invoke-RestMethod -Headers @{'X-ZT1-Auth' = "$(Get-Content C:\ProgramData\ZeroTier\One\metricstoken.secret)"; } -Uri http://localhost:9993/metrics
|
|
||||||
|
|
||||||
To configure a scrape job in Prometheus on the machine ZeroTier is running on, add this to your Prometheus `scrape_config`:
|
|
||||||
|
|
||||||
- job_name: zerotier-one
|
|
||||||
honor_labels: true
|
|
||||||
scrape_interval: 15s
|
|
||||||
metrics_path: /metrics
|
|
||||||
static_configs:
|
|
||||||
- targets:
|
|
||||||
- 127.0.0.1:9993
|
|
||||||
labels:
|
|
||||||
group: zerotier-one
|
|
||||||
node_id: $YOUR_10_CHARACTER_NODE_ID
|
|
||||||
authorization:
|
|
||||||
credentials: $YOUR_METRICS_TOKEN_SECRET
|
|
||||||
|
|
||||||
If neither of these methods are desirable, it is probably possible to distribute metrics via [Prometheus Proxy](https://github.com/pambrose/prometheus-proxy) or some other tool. Note: We have not tested this internally, but will probably work with the correct configuration.
|
|
||||||
|
|
||||||
Metrics are also available on disk in ZeroTier's working directory:
|
|
||||||
|
|
||||||
// Linux
|
|
||||||
/var/lib/zerotier-one/metrics.prom
|
|
||||||
|
|
||||||
// macOS
|
|
||||||
/Library/Application\ Support/ZeroTier/One/metrics.prom
|
|
||||||
|
|
||||||
//Windows
|
|
||||||
C:\ProgramData\ZeroTier\One\metrics.prom
|
|
||||||
|
|
||||||
#### Available Metrics
|
|
||||||
|
|
||||||
| Metric Name | Labels | Metric Type | Description |
|
|
||||||
| --- | --- | --- | --- |
|
|
||||||
| zt_packet | packet_type, direction | Counter | ZeroTier packet type counts |
|
|
||||||
| zt_packet_error | error_type, direction | Counter | ZeroTier packet errors|
|
|
||||||
| zt_data | protocol, direction | Counter | number of bytes ZeroTier has transmitted or received |
|
|
||||||
| zt_num_networks | | Gauge | number of networks this instance is joined to |
|
|
||||||
| zt_network_multicast_groups_subscribed | network_id | Gauge | number of multicast groups networks are subscribed to |
|
|
||||||
| zt_network_packets | network_id, direction | Counter | number of incoming/outgoing packets per network |
|
|
||||||
| zt_peer_latency | node_id | Histogram | peer latency (ms) |
|
|
||||||
| zt_peer_path_count | node_id, status | Gauge | number of paths to peer |
|
|
||||||
| zt_peer_packets | node_id, direction | Counter | number of packets to/from a peer |
|
|
||||||
| zt_peer_packet_errors | node_id | Counter | number of incoming packet errors from a peer |
|
|
||||||
|
|
||||||
If there are other metrics you'd like to see tracked, ask us in an Issue or send us a Pull Request!
|
|
||||||
|
|
||||||
### HTTP / App server
|
|
||||||
|
|
||||||
There is a static http file server suitable for hosting Single Page Apps at http://localhost:9993/app/<app-path>
|
|
||||||
|
|
||||||
Use `zerotier-cli info -j` to find your zerotier-one service's homeDir
|
|
||||||
|
|
||||||
``` sh
|
|
||||||
cd $ZT_HOME
|
|
||||||
sudo mkdir -p app/app1
|
|
||||||
sudo mkdir -p app/appB
|
|
||||||
echo '<html><meta charset=utf-8><title>appA</title><body><h1>hello world A' | sudo tee app/appA/index.html
|
|
||||||
echo '<html><meta charset=utf-8><title>app2</title><body><h1>hello world 2' | sudo tee app/app2/index.html
|
|
||||||
curl -sL http://localhost:9993/app/appA http://localhost:9993/app/app2
|
|
||||||
```
|
|
||||||
|
|
||||||
Then visit [http://localhost:9993/app/app1/](http://localhost:9993/app/app1/) and [http://localhost:9993/app/appB/](http://localhost:9993/app/appB/)
|
|
||||||
|
|
||||||
Requests to paths don't exist return the app root index.html, as is customary for SPAs.
|
|
||||||
If you want, you can write some javascript that talks to the service or controller [api](https://docs.zerotier.com/service/v1).
|
|
||||||
|
|
506
RELEASE-NOTES.md
506
RELEASE-NOTES.md
|
@ -1,506 +0,0 @@
|
||||||
ZeroTier Release Notes
|
|
||||||
======
|
|
||||||
|
|
||||||
# 2024-10-23 -- Version 1.14.2
|
|
||||||
|
|
||||||
* Fix for missing entitlement on macOS Sequoia.
|
|
||||||
* Fix for a problem correctly parsing local.conf to enable low bandwidth mode.
|
|
||||||
* Increment versions of some dependent libraries.
|
|
||||||
* Other fixes.
|
|
||||||
|
|
||||||
# 2024-09-12 -- Version 1.14.1
|
|
||||||
|
|
||||||
* Multithreaded packet I/O support! Currently this is just for Linux and must
|
|
||||||
be enabled in local.conf. It will likely make the largest difference on small
|
|
||||||
multi-core devices where CPU is a bottleneck and high throughput is desired.
|
|
||||||
It may be enabled by default in the future but we want it to be thoroughly
|
|
||||||
tested. It's a little harder than it seems at first glance due to the need
|
|
||||||
to keep packets in sequence and balance load.
|
|
||||||
* Several multipath bug fixes.
|
|
||||||
* Updated the versions on a number of libraries related to OIDC support and HTTP.
|
|
||||||
* MacOS .app now shows the correct version in its Info.plist manifest.
|
|
||||||
* Sanitize MAC addresses in JSON format rules parser.
|
|
||||||
* Some basic information about the platform (OS, CPU architecture) is now reported
|
|
||||||
to network controllers when networks are joined so it can be displayed to
|
|
||||||
network admins and in the future used in policy checking and inventory operations.
|
|
||||||
|
|
||||||
# 2024-05-02 -- Version 1.14.0
|
|
||||||
|
|
||||||
* Linux I/O performance improvements under heavy load
|
|
||||||
* Improvements to multipath
|
|
||||||
* Fix for port rebinding "coma" bug after periods offline (some laptop users)
|
|
||||||
* Fixed a rules engine quirk/ambiguity (GitHub Issue #2200)
|
|
||||||
* Controller API enhancements: node names and other node meta-data
|
|
||||||
* Other bug fixes
|
|
||||||
|
|
||||||
# 2023-09-12 -- Version 1.12.2
|
|
||||||
|
|
||||||
* More improvements to macOS full tunnel mode.
|
|
||||||
* Faster recovery after changes to physical network settings.
|
|
||||||
|
|
||||||
# 2023-08-25 -- Version 1.12.1
|
|
||||||
|
|
||||||
* Minor release to fix a port binding issue in Linux.
|
|
||||||
* Update Debian dependencies.
|
|
||||||
* No changes for other platforms.
|
|
||||||
|
|
||||||
# 2023-08-23 -- Version 1.12.0
|
|
||||||
|
|
||||||
* Experimental Windows ARM64 support
|
|
||||||
* Fix numerous sleep/wake issues on macOS and other platforms
|
|
||||||
* Faster recovery after changes to physical network settings
|
|
||||||
* Prometheus compatible metrics support!
|
|
||||||
* Fix full tunnel mode on recent macOS versions
|
|
||||||
* Numerous macOS DNS fixes
|
|
||||||
* 10-30% speed improvement on Linux
|
|
||||||
|
|
||||||
# 2023-03-23 -- Version 1.10.6
|
|
||||||
|
|
||||||
* Prevent binding temporary ipv6 addresses on macos (#1910)
|
|
||||||
* Prevent path-learning loops (#1914)
|
|
||||||
* Prevent infinite loop of UAC prompts in tray app
|
|
||||||
|
|
||||||
# 2023-03-10 -- Version 1.10.5
|
|
||||||
|
|
||||||
* Fix for high CPU usage bug on Windows
|
|
||||||
|
|
||||||
# 2023-03-07 -- Version 1.10.4
|
|
||||||
|
|
||||||
* SECURITY FIX (Windows): this version fixes a file permission problem on
|
|
||||||
Windows that could allow non-privileged users on a Windows system to read
|
|
||||||
privileged files in the ZeroTier service's working directory. This could
|
|
||||||
allow an unprivileged local Windows user to administrate the local ZeroTier
|
|
||||||
instance without appropriate local permissions. This issue is not remotely
|
|
||||||
exploitable unless a remote user can read arbitrary local files, and does
|
|
||||||
not impact other operating systems.
|
|
||||||
|
|
||||||
* Fix a bug in the handling of multiple IP address assignments to virtual
|
|
||||||
interfaces on macOS.
|
|
||||||
|
|
||||||
# 2023-02-15 -- Version 1.10.3
|
|
||||||
|
|
||||||
* Fix for duplicate paths in client. Could cause connectivity issues. Affects all platforms.
|
|
||||||
* Fix for Ethernet Tap MTU setting, would not properly apply on Linux.
|
|
||||||
* Fix default route bugs (macOS.)
|
|
||||||
* Enable Ping automatically for ZeroTier Adapters (Windows.)
|
|
||||||
* SSO updates and minor bugfixes.
|
|
||||||
* Add low-bandwidth mode.
|
|
||||||
* Add forceTcpRelay mode (optionally enabled.)
|
|
||||||
* Fix bug that prevented setting of custom TCP relay address.
|
|
||||||
* Build script improvements and bug fixes.
|
|
||||||
|
|
||||||
# 2022-11-01 -- Version 1.10.2
|
|
||||||
|
|
||||||
* Fix another SSO "stuck client" issue in zeroidc.
|
|
||||||
* Expose root-reported external IP/port information via the local JSON API for better diagnostics.
|
|
||||||
* Multipath: CLI output improvement for inspecting bonds
|
|
||||||
* Multipath: balance-aware mode
|
|
||||||
* Multipath: Custom policies
|
|
||||||
* Multipath: Link quality measurement improvements
|
|
||||||
|
|
||||||
Note that releases are coming few and far between because most of our dev effort is going into version 2.
|
|
||||||
|
|
||||||
# 2022-06-27 -- Version 1.10.1
|
|
||||||
|
|
||||||
* Fix an issue that could cause SSO clients to get "stuck" on stale auth URLs.
|
|
||||||
* A few other SSO related bug fixes.
|
|
||||||
|
|
||||||
# 2022-06-07 -- Version 1.10.0
|
|
||||||
|
|
||||||
* Fix formatting problem in `zerotier-cli` when using SSO networks.
|
|
||||||
* Fix a few other minor bugs in SSO signin to prepare for general availability.
|
|
||||||
* Remove requirement for webview in desktop UI and instead just make everything available via the tray pulldown/menu. Use [libui-ng](https://github.com/libui-ng/libui-ng) for minor prompt dialogs. Saves space and eliminates installation headaches on Windows.
|
|
||||||
* Fix SSO "spam" bug in desktop UI.
|
|
||||||
* Use system default browser for SSO login so all your plugins, MFA devices, password managers, etc. will work as you have them configured.
|
|
||||||
* Minor fix for bonding/multipath.
|
|
||||||
|
|
||||||
# 2022-05-10 -- Version 1.8.10
|
|
||||||
|
|
||||||
* Fixed a bug preventing SSO sign-on on Windows.
|
|
||||||
|
|
||||||
# 2022-04-25 -- Version 1.8.9
|
|
||||||
|
|
||||||
* Fixed a long-standing and strange bug that was causing sporadic "phantom" packet authentication failures. Not a security problem but could be behind sporadic reports of link failures under some conditions.
|
|
||||||
* Fixed a memory leak in SSO/OIDC support.
|
|
||||||
* Fixed SSO/OIDC display error on CLI.
|
|
||||||
* Fixed a bug causing nodes to sometimes fail to push certs to each other (primarily affects SSO/OIDC use cases).
|
|
||||||
* Fixed a deadlock bug on leaving SSO/OIDC managed networks.
|
|
||||||
* Added some new Linux distributions to the build subsystem.
|
|
||||||
|
|
||||||
# 2022-04-11 -- Version 1.8.8
|
|
||||||
|
|
||||||
* Fix a local privilege escalation bug in the Windows installer.
|
|
||||||
* Dependency fix for some Ubuntu versions.
|
|
||||||
* No changes for other platforms. Windows upgrade recommended, everyone else optional.
|
|
||||||
|
|
||||||
# 2022-03-30 -- Version 1.8.7
|
|
||||||
|
|
||||||
* Fix for dependency installations in Windows MSI package.
|
|
||||||
* Fix for desktop UI setup when run by a non-super-user.
|
|
||||||
* Bug fix in local OIDC / SSO support for auth0 and other providers.
|
|
||||||
* Other minor fixes for e.g. old Linux distributions.
|
|
||||||
|
|
||||||
# 2022-03-04 -- Version 1.8.6
|
|
||||||
|
|
||||||
* Fixed an issue that could cause the UI to be non-responsive if not joined to any networks.
|
|
||||||
* Fix dependency issues in Debian and RedHat packages for some distributions (Fedora, Mint).
|
|
||||||
* Bumped the peer cache serialization version to prevent "coma" issues on upgrade due to changes in path logic behaving badly with old values.
|
|
||||||
|
|
||||||
# 2022-02-22 -- Version 1.8.5
|
|
||||||
|
|
||||||
* Plumbing under the hood for endpoint device SSO support.
|
|
||||||
* Fix in LinuxEthernetTap to tap device support on very old (2.6) Linux kernels.
|
|
||||||
* Fix an issue that could cause self-hosted roots ("moons") to fail to assist peers in making direct links. (GitHub issue #1512)
|
|
||||||
* Merge a series of changes by Joseph Henry (of ZeroTier) that should fix some edge cases where ZeroTier would "forget" valid paths.
|
|
||||||
* Minor multipath improvements for automatic path negotiation.
|
|
||||||
|
|
||||||
# 2021-11-30 -- Version 1.8.4
|
|
||||||
|
|
||||||
* Fixed an ugly font problem on some older macOS versions.
|
|
||||||
* Fixed a bug that could cause the desktop tray app control panel to stop opening after a while on Windows.
|
|
||||||
* Fixed a possible double "release" in macOS tray app code that crashed on older macOS versions.
|
|
||||||
* Fixed installation on 32-bit Windows 10.
|
|
||||||
* Fixed a build flags issue that could cause ZeroTier to crash on older ARM32 CPUs.
|
|
||||||
|
|
||||||
# 2021-11-15 -- Version 1.8.3
|
|
||||||
|
|
||||||
* Remove problematic spinlock, which was only used on x86_64 anyway. Just use pthread always.
|
|
||||||
* Fix fd leak on MacOS that caused non-responsiveness after some time.
|
|
||||||
* Fix Debian install scripts to set /usr/sbin/nologin as shell on service user.
|
|
||||||
* Fix regression that could prevent managed routes from being deleted.
|
|
||||||
* DesktopUI: Remove NSDate:now() call, now works on MacOS 10.13 or newer!
|
|
||||||
|
|
||||||
# 2021-11-08 -- Version 1.8.2
|
|
||||||
|
|
||||||
* Fix multicast on linux.
|
|
||||||
* Fix a bug that could cause the tap adapter to have the wrong MAC on Linux.
|
|
||||||
* Update build flags to possibly support MacOS older than 10.14, but more work needs to be done. It may not work yet.
|
|
||||||
* Fix path variable setting on Windows.
|
|
||||||
|
|
||||||
# 2021-10-28 -- Version 1.8.1
|
|
||||||
|
|
||||||
* Fix numerous UI issues from 1.8.0 (never fully released).
|
|
||||||
* Remove support for REALLY ancient 1.1.6 or earlier network controllers.
|
|
||||||
* MacOS IPv6 no longer binds to temporary addresses as these can cause interruptions if they expire.
|
|
||||||
* Added additional hardening against address impersonation on networks (also in 1.6.6).
|
|
||||||
* Fix an issue that could cause clobbering of MacOS IP route settings on restart.
|
|
||||||
|
|
||||||
* NOTE: Windows 7 is no longer supported! Windows 7 users will have to use version 1.6.5 or earlier.
|
|
||||||
|
|
||||||
# 2021-09-15 -- Version 1.8.0 (preview release only)
|
|
||||||
|
|
||||||
* A *completely* rewritten desktop UI for Mac and Windows!
|
|
||||||
* Implement a workaround for one potential source of a "coma" bug, which can occur if buggy NATs/routers stop allowing the service to communicate on a given port. ZeroTier now reassigns a new secondary port if it's offline for a while unless a secondary port is manually specified in local.conf. Working around crummy buggy routers is an ongoing effort.
|
|
||||||
* Fix for MacOS MTU capping issue on feth devices
|
|
||||||
* Fix for mistakenly using v6 source addresses for v4 routes on some platforms
|
|
||||||
* Stop binding to temporary IPv6 addresses
|
|
||||||
* Set MAC address before bringing up Linux TAP link
|
|
||||||
* Check if DNS servers need to be applied on macOS
|
|
||||||
* Upgrade json.hpp dependency to version 3.10.2
|
|
||||||
|
|
||||||
# 2021-09-21 -- Version 1.6.6
|
|
||||||
|
|
||||||
* Backport COM hash check mitigation against network member impersonation.
|
|
||||||
|
|
||||||
# 2021-04-13 -- Version 1.6.5
|
|
||||||
|
|
||||||
* Fix a bug in potential network path filtering that could in some circumstances lead to "software laser" effects.
|
|
||||||
* Fix a printf overflow in zerotier-cli (not exploitable or a security risk)
|
|
||||||
* Windows now looks up the name of ZeroTier devices instead of relying on them having "ZeroTier" in them.
|
|
||||||
|
|
||||||
# 2021-02-15 -- Version 1.6.4
|
|
||||||
|
|
||||||
* The groundhog saw his shadow, which meant that the "connection coma" bug still wasn't gone. We think we found it this time.
|
|
||||||
|
|
||||||
# 2021-02-02 -- Version 1.6.3
|
|
||||||
|
|
||||||
* Likely fix for GitHub issue #1334, an issue that could cause ZeroTier to
|
|
||||||
go into a "coma" on some networks.
|
|
||||||
* Also groundhog day
|
|
||||||
|
|
||||||
# 2020-11-30 -- Version 1.6.2
|
|
||||||
|
|
||||||
* Fix an ARM hardware AES crypto issue (not an exploitable vulnerability).
|
|
||||||
* Fix a Linux network leave hang due to a mutex deadlock.
|
|
||||||
|
|
||||||
# 2020-11-24 -- Version 1.6.1
|
|
||||||
|
|
||||||
This release fixes some minor bugs and other issues in 1.6.0.
|
|
||||||
|
|
||||||
* Fixed a bug that caused IP addresses in the 203.0.0.0/8 block to be miscategorized as not being in global scope.
|
|
||||||
* Changed Linux builds to (hopefully) fix LXC and SELinux issues.
|
|
||||||
* Fixed unaligned memory access that caused crash on FreeBSD systems on the ARM architecture.
|
|
||||||
* Merged CLI options for controlling bonded devices into the beta multipath code.
|
|
||||||
* Updated Windows driver with Microsoft cross-signing to fix issues on some Windows systems.
|
|
||||||
|
|
||||||
# 2020-11-19 -- Version 1.6.0
|
|
||||||
|
|
||||||
Version 1.6.0 is a major release that incorporates back-ported features from the 2.0 branch, which is still under development. It also fixes a number of issues.
|
|
||||||
|
|
||||||
New features and improvements (including those listed under 1.5.0):
|
|
||||||
|
|
||||||
* **Apple Silicon** (MacOS ARM64) native support via universal binary. ZeroTier now requires the very latest Xcode to build.
|
|
||||||
* **Linux performance improvements** for up to 25% faster tun/tap I/O performance on multi-core systems.
|
|
||||||
* **Multipath support** with modes modeled after the Linux kernel's bonding driver. This includes active-passive and active-active modes with fast failover and load balancing. See section 2.1.5 of the manual.
|
|
||||||
* **DNS configuration** push from network controllers to end nodes, with locally configurable permissions for whether or not push is allowed.
|
|
||||||
* **AES-GMAC-SIV** encryption mode, which is both somewhat more secure and significantly faster than the old Salsa20/12-Poly1305 mode on hardware that supports AES acceleration. This includes virtually all X86-64 chips and most ARM64. This mode is based on AES-SIV and has been audited by Trail of Bits to ensure that it is equivalent security-wise.
|
|
||||||
|
|
||||||
Bug fixes:
|
|
||||||
|
|
||||||
* **Managed route assignment fixes** to eliminate missing routes on Linux and what we believe to be the source of sporadic high CPU usage on MacOS.
|
|
||||||
* **Hang on shutdown** issues should be fixed.
|
|
||||||
* **Sporadic multicast outages** should be fixed.
|
|
||||||
|
|
||||||
Known remaining issues:
|
|
||||||
|
|
||||||
* AES hardware acceleration is not yet supported on 32-bit ARM, PowerPC (32 or 64), or MIPS (32 or 64) systems. Currently supported are X86-64 and ARM64/AARCH64 with crypto extensions.
|
|
||||||
|
|
||||||
# 2020-10-05 -- Version 1.5.0 (actually 1.6.0-beta1)
|
|
||||||
|
|
||||||
Version 1.6.0 (1.5.0 is a beta!) is a significant release that incorporates a number of back-ported fixes and features from the ZeroTier 2.0 tree.
|
|
||||||
|
|
||||||
Major new features are:
|
|
||||||
|
|
||||||
* **Multipath support** with modes modeled after the Linux kernel's bonding driver. This includes active-passive and active-active modes with fast failover and load balancing. See section 2.1.5 of the manual.
|
|
||||||
* **DNS configuration** push from network controllers to end nodes, with locally configurable permissions for whether or not push is allowed.
|
|
||||||
* **AES-GMAC-SIV** encryption mode, which is both somewhat more secure and significantly faster than the old Salsa20/12-Poly1305 mode on hardware that supports AES acceleration. This includes virtually all X86-64 chips and most ARM64. This mode is based on AES-SIV and has been audited by Trail of Bits to ensure that it is equivalent security-wise.
|
|
||||||
|
|
||||||
Known issues that are not yet fixed in this beta:
|
|
||||||
|
|
||||||
* Some Mac users have reported periods of 100% CPU in kernel_task and connection instability after leaving networks that have been joined for a period of time, or needing to kill ZeroTier and restart it to finish leaving a network. This doesn't appear to affect all users and we haven't diagnosed the root cause yet.
|
|
||||||
* The service sometimes hangs on shutdown requiring a kill -9. This also does not affect all systems or users.
|
|
||||||
* AES hardware acceleration is not yet supported on 32-bit ARM, PowerPC (32 or 64), or MIPS (32 or 64) systems. Currently supported are X86-64 and ARM64/AARCH64 with crypto extensions.
|
|
||||||
* Some users have reported multicast/broadcast outages on networks lasting up to 30 seconds. Still investigating.
|
|
||||||
|
|
||||||
We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
|
|
||||||
|
|
||||||
# 2019-08-30 -- Version 1.4.6
|
|
||||||
|
|
||||||
* Update default root list to latest
|
|
||||||
* ARM32 platform build and flag fixes
|
|
||||||
* Add a clarification line to LICENSE.txt
|
|
||||||
* Fix license message in CLI
|
|
||||||
* Windows service now looks for service command line arguments
|
|
||||||
* Fixed a bug that could cause excessive queued multicasts
|
|
||||||
|
|
||||||
# 2019-08-23 -- Version 1.4.4
|
|
||||||
|
|
||||||
* Change license from GPL3 to BSL 1.1, see LICENSE.txt
|
|
||||||
* Fix an issue with the "ipauth" rule and auto-generated unforgeable IPv6 addresses
|
|
||||||
* Fix socket/bind errors setting IPs and routes on Linux
|
|
||||||
|
|
||||||
# 2019-08-12 -- Version 1.4.2
|
|
||||||
|
|
||||||
* Fix high CPU use bug on some platforms
|
|
||||||
* Fix issues with PostgreSQL controller DB (only affects Central)
|
|
||||||
* Restore backward compatibility with MacOS versions prior to 10.13
|
|
||||||
|
|
||||||
# 2019-07-29 -- Version 1.4.0
|
|
||||||
|
|
||||||
### Major Changes
|
|
||||||
|
|
||||||
* Mac version no longer requires a kernel extension, instead making use of the [feth interfaces](https://apple.stackexchange.com/questions/337715/fake-ethernet-interfaces-feth-if-fake-anyone-ever-seen-this).
|
|
||||||
* Added support for concurrent multipath (multiple paths at once) with traffic weighting by link quality and faster recovery from lost links.
|
|
||||||
* Added under-the-hood support for QoS (not yet exposed) that will eventually be configurable via our rules engine.
|
|
||||||
|
|
||||||
### Minor Changes and Bug Fixes
|
|
||||||
|
|
||||||
* Experimental controller DB driver for [LF](https://github.com/zerotier/lf) to store network controller data (LFDB.cpp / LFDB.hpp).
|
|
||||||
* Modified credential push and direct path push timings and algorithms to somewhat reduce "chattiness" of the protocol when idle. More radical background overhead reductions will have to wait for the 2.x line.
|
|
||||||
* Removed our beta/half-baked integration of Central with the Windows UI. We're going to do a whole new UI of some kind in the future at least for Windows and Mac.
|
|
||||||
* Fixed stack overflow issues on Linux versions using musl libc.
|
|
||||||
* Fixed some alignment problems reported on ARM and ARM64, but some reports we could not reproduce so please report any issues with exact chip, OS/distro, and ZeroTier version in use.
|
|
||||||
* Fixed numerous other small issues and bugs such as ARM alignment issues causing crashes on some devices.
|
|
||||||
* Windows now sets the adapter name such that it is consistent in both the Windows UI and command line utilities.
|
|
||||||
|
|
||||||
# 2018-07-27 -- Version 1.2.12
|
|
||||||
|
|
||||||
* Fixed a bug that caused exits to take a long time on Mac due to huge numbers of redundant attempts to delete managed routes.
|
|
||||||
* Fixed a socket limit problem on Windows that caused the ZeroTier service to run out of sockets, causing the UI and CLI to be unable to access the API.
|
|
||||||
* Fixed a threading bug in the ZeroTier Core, albeit one that never manifested on the regular ZeroTier One service/client.
|
|
||||||
* Fixed a bug that could cause the service to crash if an authorized local client accessed an invalid URL via the control API. (Not exploitable since you needed admin access anyway.)
|
|
||||||
|
|
||||||
# 2018-05-08 -- Version 1.2.10
|
|
||||||
|
|
||||||
* Fix bug loading `moons.d/` files for federated root operation.
|
|
||||||
* Fix compile problem with ZT_DEBUG on some versions of `clang`
|
|
||||||
* Fix slow network startup bug related to loading of `networks.d/` cache files
|
|
||||||
|
|
||||||
# 2018-04-27 -- Version 1.2.8
|
|
||||||
|
|
||||||
* Linux version once again builds with PIE (position independent executable) flags
|
|
||||||
* Fixed bug in zerotier-idtool file sign and verify
|
|
||||||
* Fixed minor OSX app typo
|
|
||||||
* Merged alpha NetBSD support (mostly untested, so YMMV)
|
|
||||||
* Merged several minor typo and one-liner bug fixes
|
|
||||||
|
|
||||||
# 2018-04-17 -- Version 1.2.6
|
|
||||||
|
|
||||||
* Features and Core Improvements
|
|
||||||
* Path selection has been overhauled to improve path stability, simplify code, and prepare for multi-path and trunking in the next major release.
|
|
||||||
* This version introduces remote tracing for remote diagnostics. Network controllers can set a node (usually the controller itself) to receive remote tracing events from all members of the network or from select members. Events are only sent if they pertain to a given network for security reasons.
|
|
||||||
* Multicast replication can now be done by designated multicast replicators on a network (flagged as such at the controller) rather than by the sender. Most users won't want this, but it's useful for specialized use cases on hub-and-spoke networks and for low-power devices.
|
|
||||||
* Cryptographic performance improvements on several platforms.
|
|
||||||
* Multithreaded performance improvements throughout the code base, including the use of an inline lightweight spinlock for low-contention resources.
|
|
||||||
* Bugs fixed
|
|
||||||
* Disappearing routes on Mac (GitHub issue #600)
|
|
||||||
* Route flapping and path instability in some dual-stack V4/V6 networks
|
|
||||||
* Blacklist (in local.conf) doesn't work reliably (GitHub issue #656)
|
|
||||||
* Connection instabilities due to unsigned integer overflows in timing comparisons (use int64_t instead of uint64_t)
|
|
||||||
* Binaries don't run on some older or lower-end 32-bit ARM chips (build problem)
|
|
||||||
* ARM NEON crypto code crashes (build problem)
|
|
||||||
* Fixed some lock ordering issues revealed by "valgrind" tool
|
|
||||||
* The "zerotier-idtool" command could not be accessed from "zerotier-one" via command line switch
|
|
||||||
* Leaking sockets on some platforms when uPnP/NAT-PMP is enabled
|
|
||||||
* Fixed two very rare multithreading issues that were only observed on certain systems
|
|
||||||
* Platform-Specific Changes
|
|
||||||
* MacOS
|
|
||||||
* Installer now loads the kernel extension right away so that High Sierra users will see the prompt to authorize it. This is done in the "Security & Privacy" preference pane and must be done directly on the console (not via remote desktop). On High Sierra and newer kexts must be authorized at the console via security settings system preferences pane.
|
|
||||||
* Windows
|
|
||||||
* The Windows installer should now install the driver without requiring a special prompt in most cases. This should make it easier for our packages to be accepted into and updated in the Chocolatey repository and should make it easier to perform remote installs across groups of machines using IT management and provisioning tools.
|
|
||||||
* The Windows official packages are now signed with an EV certificate (with hardware key).
|
|
||||||
* The Windows UI can now log into ZeroTier Central and join networks via the Central API.
|
|
||||||
* The `zerotier-idtool` command should now work on Windows without ugly hacks.
|
|
||||||
* Upgraded the installer version.
|
|
||||||
* Made a few changes to hopefully fix sporadic "will not uninstall" problems, though we cannot duplicate these issues ourselves.
|
|
||||||
* Linux
|
|
||||||
* Device names are now generated deterministically based on network IDs for all newly joined networks.
|
|
||||||
* Android
|
|
||||||
* Multicast now works on Android in most cases! Android apps can send and receive multicast and subscribe to multicast group IPs. Note that in some cases the app must bind to the specific correct interface for this to work.
|
|
||||||
* IPv6 can be disabled in UI for cases where it causes problems.
|
|
||||||
|
|
||||||
# 2017-04-20 -- Version 1.2.4
|
|
||||||
|
|
||||||
* Managed routes are now only bifurcated for the default route. This is a change in behavior, though few people will probably notice. Bifurcating all managed routes was causing more trouble than it was worth for most users.
|
|
||||||
* Up to 2X crypto speedup on x86-64 (except Windows, which will take some porting) and 32-bit ARM platforms due to integration of fast assembly language implementations of Salsa20/12 from the [supercop](http://bench.cr.yp.to/supercop.html) code base. These were written by Daniel J. Bernstein and are in the public domain. My MacBook Pro (Core i5 2.8ghz) now does almost 1.5GiB/sec Salsa20/12 per core and a Raspberry Pi got a 2X boost. 64-bit ARM support and Windows support will take some work but should not be too hard.
|
|
||||||
* Refactored code that manages credentials to greatly reduce memory use in most cases. This may also result in a small performance improvement.
|
|
||||||
* Reworked and simplified path selection and priority logic to fix path instability and dead path persistence edge cases. There have been some sporadic reports of persistent path instabilities and dead paths hanging around that take minutes to resolve. These have proven difficult to reproduce in house, but hopefully this will fix them. In any case it seems to speed up path establishment in our tests and it makes the code simpler and more readable.
|
|
||||||
* Eliminated some unused cruft from the code around path management and in the peer class.
|
|
||||||
* Fixed an issue causing build problems on some MIPS architecture systems.
|
|
||||||
* Fixed Windows forgetting routes on sleep/wake or in some other circumstances. (GitHub issue #465)
|
|
||||||
|
|
||||||
# 2017-03-17 -- Version 1.2.2
|
|
||||||
|
|
||||||
* A bug causing unreliable multicast propagation (GitHub issue #461).
|
|
||||||
* A crash in ARM binaries due to a build chain and flags problem.
|
|
||||||
* A bug in the network controller preventing members from being listed (GitHub issue #460).
|
|
||||||
|
|
||||||
# 2017-03-14 -- Version 1.2.0
|
|
||||||
|
|
||||||
Version 1.2.0 is a major milestone release representing almost nine months of work. It includes our rules engine for distributed network packet filtering and security monitoring, federated roots, and many other architectural and UI improvements and bug fixes.
|
|
||||||
|
|
||||||
## New Features in 1.2.0
|
|
||||||
|
|
||||||
### The ZeroTier Rules Engine
|
|
||||||
|
|
||||||
The largest new feature in 1.2.0, and the product of many months of work, is our advanced network rules engine. With this release we achieve traffic control, security monitoring, and micro-segmentation capability on par with many enterprise SDN solutions designed for use in advanced data centers and corporate networks.
|
|
||||||
|
|
||||||
Rules allow you to filter packets on your network and vector traffic to security observers. Security observation can be performed in-band using REDIRECT or out of band using TEE.
|
|
||||||
|
|
||||||
Tags and capabilities provide advanced methods for implementing fine grained permission structures and micro-segmentation schemes without bloating the size and complexity of your rules table.
|
|
||||||
|
|
||||||
See the [rules engine announcement blog post](https://www.zerotier.com/blog/?p=927) for an in-depth discussion of theory and implementation. The [manual](https://www.zerotier.com/manual.shtml) contains detailed information on rule, tag, and capability use, and the `rule-compiler/` subfolder of the ZeroTier source tree contains a JavaScript function to compile rules in our human-readable rule definition language into rules suitable for import into a network controller. (ZeroTier Central uses this same script to compile rules on [my.zerotier.com](https://my.zerotier.com/).)
|
|
||||||
|
|
||||||
### Root Server Federation
|
|
||||||
|
|
||||||
It's now possible to create your own root servers and add them to the root server pool on your nodes. This is done by creating what's called a "moon," which is a signed enumeration of root servers and their stable points on the network. Refer to the [manual](https://www.zerotier.com/manual.shtml) for instructions.
|
|
||||||
|
|
||||||
Federated roots achieve a number of things:
|
|
||||||
|
|
||||||
* You can deploy your own infrastructure to reduce dependency on ours.
|
|
||||||
* You can deploy roots *inside your LAN* to ensure that network connectivity inside your facility still works if the Internet goes down. This is the first step toward making ZeroTier viable as an in-house SDN solution.
|
|
||||||
* Roots can be deployed inside national boundaries for countries with data residency laws or "great firewalls." (As of 1.2.0 there is still no way to force all traffic to use these roots, but that will be easy to do in a later version.)
|
|
||||||
* Last but not least this makes ZeroTier somewhat less centralized by eliminating any hard dependency on ZeroTier, Inc.'s infrastructure.
|
|
||||||
|
|
||||||
Our roots will of course remain and continue to provide zero-configuration instant-on deployment, a secure global authority for identities, and free traffic relaying for those who can't establish peer to peer connections.
|
|
||||||
|
|
||||||
### Local Configuration
|
|
||||||
|
|
||||||
An element of our design philosophy is "features are bugs." This isn't an absolute dogma but more of a guiding principle. We try as hard as we can to avoid adding features, especially "knobs" that must be tweaked by a user.
|
|
||||||
|
|
||||||
As of 1.2.0 we've decided that certain knobs are unavoidable, and so there is now a `local.conf` file that can be used to configure them. See the ZeroTier One documentation for these. They include:
|
|
||||||
|
|
||||||
* Blacklisting interfaces you want to make sure ZeroTier doesn't use for network traffic, such as VPNs, slow links, or backplanes designated for only certain kinds of traffic.
|
|
||||||
* Turning uPnP/NAT-PMP on or off.
|
|
||||||
* Configuring software updates on Windows and Mac platforms.
|
|
||||||
* Defining trusted paths (the old trusted paths file is now deprecated)
|
|
||||||
* Setting the ZeroTier main port so it doesn't have to be changed on the command line, which is very inconvenient in many cases.
|
|
||||||
|
|
||||||
### Improved In-Band Software Updates
|
|
||||||
|
|
||||||
A good software update system for Windows and Mac clients has been a missing feature in previous versions. It does exist but we've been shy about using it so far due to its fragility in some environments.
|
|
||||||
|
|
||||||
We've greatly improved this mechanism in 1.2.0. Not only does it now do a better job of actually invoking the update, but it also transfers updates in-band using the ZeroTier protocol. This means it can work in environments that do not allows http/https traffic or that force it through proxies. There's also now an update channel setting: `beta` or `release` (the default).
|
|
||||||
|
|
||||||
Software updates are authenticated three ways:
|
|
||||||
|
|
||||||
1. ZeroTier's own signing key is used to sign all updates and this signature is checked prior to installation. ZeroTier, Inc.'s signatures are performed on an air-gapped machine.
|
|
||||||
|
|
||||||
2. Updates for Mac and Windows are signed using Apple and Microsoft (DigiCert EV) keys and will not install unless these signatures are also valid.
|
|
||||||
|
|
||||||
3. The new in-band update mechanism also authenticates the source of the update via ZeroTier's built-in security features. This provides transport security, while 1 and 2 provide security of the update at rest.
|
|
||||||
|
|
||||||
Updates are now configurable via `local.conf`. There are three options: `disable`, `download`, and `apply`. The third (apply) is the default for official builds on Windows and Mac, making updates happen silently and automatically as they do for popular browsers like Chrome and Firefox. Updates are disabled by default on Linux and other Unix-type systems as these are typically updated through package managers.
|
|
||||||
|
|
||||||
### Path Link Quality Awareness
|
|
||||||
|
|
||||||
Version 1.2.0 is now aware of the link quality of direct paths with other 1.2.0 nodes. This information isn't used yet but is visible through the JSON API. (Quality always shows as 100% with pre-1.2.0 nodes.) Quality is measured passively with no additional overhead using a counter based packet loss detection algorithm.
|
|
||||||
|
|
||||||
This information is visible from the command line via `listpeers`:
|
|
||||||
|
|
||||||
200 listpeers XXXXXXXXXX 199.XXX.XXX.XXX/9993;10574;15250;1.00 48 1.2.0 LEAF
|
|
||||||
200 listpeers XXXXXXXXXX 195.XXX.XXX.XXX/45584;467;7608;0.44 290 1.2.0 LEAF
|
|
||||||
|
|
||||||
The first peer's path is at 100% (1.00), while the second peer's path is suffering quite a bit of packet loss (0.44).
|
|
||||||
|
|
||||||
Link quality awareness is a precursor to intelligent multi-path and QoS support, which will in future versions bring us to feature parity with SD-WAN products like Cisco iWAN.
|
|
||||||
|
|
||||||
### Security Improvements
|
|
||||||
|
|
||||||
Version 1.2.0 adds anti-DOS (denial of service) rate limits and other hardening for improved resiliency against a number of denial of service attack scenarios.
|
|
||||||
|
|
||||||
It also adds a mechanism for instantaneous credential revocation. This can be used to revoke certificates of membership instantly to kick a node off a network (for private networks) and also to revoke capabilities and tags. The new controller sends revocations by default when a peer is de-authorized.
|
|
||||||
|
|
||||||
Revocations propagate using a "rumor mill" peer to peer algorithm. This means that a controller need only successfully send a revocation to at least one member of a network with connections to other active members. At this point the revocation will flood through the network peer to peer very quickly. This helps make revocations more robust in the face of poor connectivity with the controller or attempts to incapacitate the controller with denial of service attacks, as well as making revocations faster on huge networks.
|
|
||||||
|
|
||||||
### Windows and Macintosh UI Improvements (ZeroTier One)
|
|
||||||
|
|
||||||
The Mac has a whole new UI built natively in Objective-C. It provides a pulldown similar in appearance and operation to the Mac WiFi task bar menu.
|
|
||||||
|
|
||||||
The Windows UI has also been improved and now provides a task bar icon that can be right-clicked to manage networks. Both now expose managed route and IP permissions, allowing nodes to easily opt in to full tunnel operation if you have a router configured on your network.
|
|
||||||
|
|
||||||
### Ad-Hoc Networks
|
|
||||||
|
|
||||||
A special kind of public network called an ad-hoc network may be accessed by joining a network ID with the format:
|
|
||||||
|
|
||||||
ffSSSSEEEE000000
|
|
||||||
| | | |
|
|
||||||
| | | Reserved for future use, must be 0
|
|
||||||
| | End of port range (hex)
|
|
||||||
| Start of port range (hex)
|
|
||||||
Reserved ZeroTier address prefix indicating a controller-less network
|
|
||||||
|
|
||||||
Ad-hoc networks are public (no access control) networks that have no network controller. Instead their configuration and other credentials are generated locally. Ad-hoc networks permit only IPv6 UDP and TCP unicast traffic (no multicast or broadcast) using 6plane format NDP-emulated IPv6 addresses. In addition an ad-hoc network ID encodes an IP port range. UDP packets and TCP SYN (connection open) packets are only allowed to destination ports within the encoded range.
|
|
||||||
|
|
||||||
For example `ff00160016000000` is an ad-hoc network allowing only SSH, while `ff0000ffff000000` is an ad-hoc network allowing any UDP or TCP port.
|
|
||||||
|
|
||||||
Keep in mind that these networks are public and anyone in the entire world can join them. Care must be taken to avoid exposing vulnerable services or sharing unwanted files or other resources.
|
|
||||||
|
|
||||||
### Network Controller (Partial) Rewrite
|
|
||||||
|
|
||||||
The network controller has been largely rewritten to use a simple in-filesystem JSON data store in place of SQLite, and it is now included by default in all Windows, Mac, Linux, and BSD builds. This means any desktop or server node running ZeroTier One can now be a controller with no recompilation needed.
|
|
||||||
|
|
||||||
If you have data in an old SQLite3 controller we've included a NodeJS script in `controller/migrate-sqlite` to migrate data to the new format. If you don't migrate, members will start getting `NOT_FOUND` when they attempt to query for updates.
|
|
||||||
|
|
||||||
## Major Bug Fixes in 1.2.0
|
|
||||||
|
|
||||||
* **The Windows HyperV 100% CPU bug is FINALLY DEAD**: This long-running problem turns out to have been an issue with Windows itself, but one we were triggering by placing invalid data into the Windows registry. Microsoft is aware of the issue but we've also fixed the triggering problem on our side. ZeroTier should now co-exist quite well with HyperV and should now be able to be bridged with a HyperV virtual switch.
|
|
||||||
* **Segmentation faults on musl-libc based Linux systems**: Alpine Linux and some embedded Linux systems that use musl libc (a minimal libc) experienced segmentation faults. These were due to a smaller default stack size. A work-around that sets the stack size for new threads has been added.
|
|
||||||
* **Windows firewall blocks local JSON API**: On some Windows systems the firewall likes to block 127.0.0.1:9993 for mysterious reasons. This is now fixed in the installer via the addition of another firewall exemption rule.
|
|
||||||
* **UI crash on embedded Windows due to missing fonts**: The MSI installer now ships fonts and will install them if they are not present, so this should be fixed.
|
|
||||||
|
|
||||||
## Other Improvements in 1.2.0
|
|
||||||
|
|
||||||
* **Improved dead path detection**: ZeroTier is now more aggressive about expiring paths that do not seem to be active. If a path seems marginal it is re-confirmed before re-use.
|
|
||||||
* **Minor performance improvements**: We've reduced unnecessary memcpy's and made a few other performance improvements in the core.
|
|
||||||
* **Linux static binaries**: For our official packages (the ones in the download.zerotier.com apt and yum repositories) we now build Linux binaries with static linking. Hopefully this will stop all the bug reports relating to library inconsistencies, as well as allowing our deb packages to run on a wider variety of Debian-based distributions. (There are far too many of these to support officially!) The overhead for this is very small, especially since we built our static versions against musl-libc. Distribution maintainers are of course free to build dynamically linked versions for inclusion into distributions; this only affects our official binaries.
|
|
93
SECURITY.md
93
SECURITY.md
|
@ -1,93 +0,0 @@
|
||||||
# Security
|
|
||||||
|
|
||||||
ZeroTier takes the security of our software products and services seriously, which
|
|
||||||
includes all source code repositories managed through our GitHub organization.
|
|
||||||
|
|
||||||
## Supported Versions
|
|
||||||
|
|
||||||
The following versions of ZeroTier One receive security updates
|
|
||||||
|
|
||||||
| Version | Supported |
|
|
||||||
| -------- | ------------------ |
|
|
||||||
| 1.14.x | :white_check_mark: |
|
|
||||||
| 1.12.x | :white_check_mark: |
|
|
||||||
| < 1.12.0 | :x: |
|
|
||||||
|
|
||||||
## Reporting a Vulnerability
|
|
||||||
|
|
||||||
**Please do not report security issues through public GitHub issues**
|
|
||||||
|
|
||||||
Instead, please report vulnerabilities via email to security@zerotier.com. If possible,
|
|
||||||
please encrypt with our PGP key (see below).
|
|
||||||
|
|
||||||
Please include the following information, or as much as you can provide to help us
|
|
||||||
understand the nature and scope of the issue:
|
|
||||||
|
|
||||||
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
|
|
||||||
* Full paths of source file(s) related to the manifestation of the issue
|
|
||||||
* The location of the affected source code (tag/branch/commit or direct URL)
|
|
||||||
* Any special configuration required to reproduce the issue
|
|
||||||
* Step-by-step instructions to reproduce the issue
|
|
||||||
* Proof-of-concept or exploit code (if possible)
|
|
||||||
* Impact of the issue, including how an attacker might exploit the issue
|
|
||||||
|
|
||||||
## Preferred Languages
|
|
||||||
|
|
||||||
We prefer all communications to be in English.
|
|
||||||
|
|
||||||
## security@zerotier.com PGP key
|
|
||||||
|
|
||||||
```
|
|
||||||
-----BEGIN PGP PUBLIC KEY BLOCK-----
|
|
||||||
|
|
||||||
mQINBGQGOVIBEACalXTnNqaiSOVLFEiqHpDMg8N/OI5D5850Xy1ZEvx3B3rz7cbn
|
|
||||||
k30ozHtJKbh+vqpyItE7DjyQAuF19gP5Q64Yh0Y+MmLHq60q/GwOwAYz7cI+UzA3
|
|
||||||
5x8YqcmTp32LAM1xJn+iMlMLBuAmJl4kULKmOXPlpqPiyTFs5saizvm7fgRmfgJJ
|
|
||||||
HpsnIrTkaDFJhAR+jvMJohVYwmhuydeI0DsHu7KGpG1ddcHDrUjOPNqXnnAPSPwx
|
|
||||||
llw4yfKlQb8GYErsv/G5QVyzd5+SxEuiI4MARRnrk8LlMQ33CR6pzIQ/Bk5AAmye
|
|
||||||
mHqfEAknkiOf++urYhRs9BL3Kz3MdV0cg92zr9EFOg0u56jxf5OnAiTOhGUUA0hn
|
|
||||||
dS7peVGl46R9Oy2JYIazNDGi+4NIsYDFXsnsss9xOQVygPyeQd71zFHfix0jct9w
|
|
||||||
j3o/kj7Egsnm9nc13354bYT6bbalqXiRWwGH1eAFpjueNWiVFwZS6NZUP3WeNDiY
|
|
||||||
BlPo1LodvolbXiJcTILTCyEkERJPCK2zoE2nTdVfvTLWsuehw1M6Yd2/q74TVYy/
|
|
||||||
RY+KjHkrChEBQ9PqXsXRHj6opKbT8JLfZkvU5k+3IiqqxOpB+QXFI/whj493CxWW
|
|
||||||
so7QAmzOCyJq8GDVPxzkwUac22YIkXdiOmb8i/HWq+kLY/HjQE259Gx6KwARAQAB
|
|
||||||
tClaZXJvVGllciBTZWN1cml0eSA8c2VjdXJpdHlAemVyb3RpZXIuY29tPokCTAQT
|
|
||||||
AQoANhYhBH1HQGb+4jzl6mnFqf09m6uqADkABQJkBjlSAhsDBAsJCAcEFQoJCAUW
|
|
||||||
AgMBAAIeAQIXgAAKCRD9PZurqgA5ACqPD/sFt6SG6Tu0HwTY2ofJtYsa2GBLL0pf
|
|
||||||
dYlX4cWSs1PVB5+m5Oj18y+GB2umA9GnsVtmvaSfp3XEngt2zNWX27uUsVfL35b2
|
|
||||||
/5TVVe8RjzOedqMN+lQWMvO+f/C1zmWYXjjpC+iGjgMMaRRrofkkn+7uL4N9y6gY
|
|
||||||
rcXtpACT1rYFC+i1AKnZfUO8Vr5ji7odq0f7bDkN/N38rB0kRRwEmO8wqdpQK6gK
|
|
||||||
nxf9vgJl5ggimDk5Xtz1sfd3y28bf5N4hdOCkXUbd10nUFY3wDNTM4VxozxTGJeG
|
|
||||||
imdcc19Wuw/1fGUZ5SIjgPanCdPLGYwSTr+M6Fuern9uTtlC1GOby3BUtmVGP6EU
|
|
||||||
1pSAJSRpmoBPHKKOYtSMwV8PCboXru9P1ab8y8STKM3SKyghUJrl17gdc0LaksZa
|
|
||||||
E54pJudGPIQMFRqZjMdV6jgMuaLTozjZ4mW8EThf4mkX4xDkO8l7cOn0225ZYJZC
|
|
||||||
lZKpdnwzk9owkJA80u4KBNJxTtB4ZAPzjBsD5hFzCZQTLNQp/psU3EjZsau28eXT
|
|
||||||
E/C1QjEQHgy4ohkgQlCm1H1+clKssCWcdmsVGXuS1u8gh4K6X9b0Z6LeCGRaQvH2
|
|
||||||
+DB8oTAdqp9nUZv9rP4pbo+sR4fF67CFLriVuxjedAiFkbM4uHMFcL4tc/X9+DRo
|
|
||||||
YN5X7oEkZvO507kCDQRkBjlSARAAz58UMF7K1qKyQjzKTcutaYZ5SaIGky9lCLZn
|
|
||||||
/2vjpFCoBogkxS/6IKQcwZk8b4S9QstaaQZDFEkxqNeKC0GiFTAMAb6SmYcK495h
|
|
||||||
EZnHl0NA5Nc2dBlZk5E/ENzTCz2bXaxCcVESc2z+xCzu07brbhGrqvliKiwOUzt9
|
|
||||||
JzqEsar6I95OutBcZvkFCs44/Uf9bS1qf1w4klE8w3vdMtGH23umrET4tFZ+sh6o
|
|
||||||
ZFtQx0u2eKjsRdn/RMtsxLNaJlcE1DdIAqBpQrcmuwMC8v5wUGfCGZjhClzmyQlq
|
|
||||||
akUkayir7UtbHbFT/mgO+YI77YGXWk5QrwPscqqT2l8KB/YMujNDmaWa/0KV1lIY
|
|
||||||
zr5s4dzVeiwqFLR9ANFIhzFwzf3JLi6XSx123Qix0TxZoYPZCHl7yoi9qi6qybz5
|
|
||||||
0Od2LSz3jbApeKYymZ+zjE+YV5y9DI6Wzy1j2M1FogNvTO9fMk+6dLt4HhTdSNvH
|
|
||||||
cKya462YCcy+tnZTkhmh+FTebbJlV6D4wG7skE5KCdBhjm53xLwp6XW9L6n2CrkL
|
|
||||||
W1IDBcCz0oPd1sMkXbO3wnxdXprV2XurCfsg/R2nszSNzvdJ8/xj3cr9hpoJ714R
|
|
||||||
qqyoEDRZ1Ss9kGL166o5MpN5qb/EewdkqGgWP7YFXbhsdHQiW7Z7dAqzjoaybD4O
|
|
||||||
nakkwyUAEQEAAYkCNgQYAQoAIBYhBH1HQGb+4jzl6mnFqf09m6uqADkABQJkBjlS
|
|
||||||
AhsMAAoJEP09m6uqADkAax0P/Rh8EZYRqW6dPYTl1YQusAK10rAcRNq3ekjofXGk
|
|
||||||
oXK1S7HWGoFgl5++5nfSfNgFJ5VLcgIM56wtIf49zFjWe5oC6fw8k+ghh4d2chMP
|
|
||||||
hdDILx6e0c30Iq1+EvovGR9hWa0wJ4cKTdzlwhY9ZC09q0ia+bl2mwpie1JQDR0c
|
|
||||||
zXCjt+PldLeeK9z1/XT0Q7KowYC+U18oR+KFm+EaRV4QT85JVequnIeGkmaHJrHB
|
|
||||||
lH4T5A5ib7y8edon1c0Zx3GsaxJUojkEJ0SX7ffVDu6ztUZfkHfCVpMW4VzUeGA/
|
|
||||||
m+CtFO9ciLRGZEkRa+zhIGoBvwEXU0GiwiF4nZ0F2C8UioeW0YIEV9zl3nXJctYE
|
|
||||||
ZKc2whSENQRTGgaYHVoVZhznt71LKWgFLshwBo81UCXVkzwAjMW1ActDnmPw5M7q
|
|
||||||
xR5Qp5G49Z1GmfSozazha0HVFPKNV5i3RlTzs4yLUnZyH0yC9IvtOefMHcLjG96L
|
|
||||||
N5miEV97gvJJjrn8rhRvpUwAWgmT/9IuYjBNQTtNN40arto5HxezR76WCjdKYxdL
|
|
||||||
p3dM1iiBDShHNm7LdyZlLFhTOMU0tNBxJJ7B09ar5gakeZjD+2aB1ODX9VuFtozL
|
|
||||||
onBjI2gIkry0UIkuznHfFw05lZAZAiqHEVgVi/WTk4C/bklDZNgE0lx+IWzEz2iS
|
|
||||||
L455
|
|
||||||
=lheL
|
|
||||||
-----END PGP PUBLIC KEY BLOCK-----
|
|
||||||
```
|
|
Binary file not shown.
Before Width: | Height: | Size: 47 KiB |
Binary file not shown.
Before Width: | Height: | Size: 621 B |
Binary file not shown.
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
Before Width: | Height: | Size: 4.6 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7 KiB |
408
attic/Filter.cpp
Normal file
408
attic/Filter.cpp
Normal file
|
@ -0,0 +1,408 @@
|
||||||
|
/*
|
||||||
|
* ZeroTier One - Network Virtualization Everywhere
|
||||||
|
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* --
|
||||||
|
*
|
||||||
|
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||||
|
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
*
|
||||||
|
* If you would like to embed ZeroTier into a commercial application or
|
||||||
|
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||||
|
* LLC. Start here: http://www.zerotier.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include "RuntimeEnvironment.hpp"
|
||||||
|
#include "Logger.hpp"
|
||||||
|
#include "Filter.hpp"
|
||||||
|
#include "Utils.hpp"
|
||||||
|
|
||||||
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
const char *const Filter::UNKNOWN_NAME = "(unknown)";
|
||||||
|
const Range<unsigned int> Filter::ANY;
|
||||||
|
|
||||||
|
static inline Range<unsigned int> __parseRange(char *r)
|
||||||
|
throw(std::invalid_argument)
|
||||||
|
{
|
||||||
|
char *saveptr = (char *)0;
|
||||||
|
unsigned int a = 0;
|
||||||
|
unsigned int b = 0;
|
||||||
|
unsigned int fn = 0;
|
||||||
|
for(char *f=Utils::stok(r,"-",&saveptr);(f);f=Utils::stok((char *)0,"-",&saveptr)) {
|
||||||
|
if (*f) {
|
||||||
|
switch(fn++) {
|
||||||
|
case 0:
|
||||||
|
if (*f != '*')
|
||||||
|
a = b = (unsigned int)strtoul(f,(char **)0,10);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
if (*f != '*')
|
||||||
|
b = (unsigned int)strtoul(f,(char **)0,10);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw std::invalid_argument("rule range must be <int>, <int>-<int>, or *");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Range<unsigned int>(a,b);
|
||||||
|
}
|
||||||
|
|
||||||
|
Filter::Rule::Rule(const char *s)
|
||||||
|
throw(std::invalid_argument)
|
||||||
|
{
|
||||||
|
char *saveptr = (char *)0;
|
||||||
|
char tmp[256];
|
||||||
|
if (!Utils::scopy(tmp,sizeof(tmp),s))
|
||||||
|
throw std::invalid_argument("rule string too long");
|
||||||
|
unsigned int fn = 0;
|
||||||
|
for(char *f=Utils::stok(tmp,";",&saveptr);(f);f=Utils::stok((char *)0,";",&saveptr)) {
|
||||||
|
if (*f) {
|
||||||
|
switch(fn++) {
|
||||||
|
case 0:
|
||||||
|
_etherType = __parseRange(f);
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
_protocol = __parseRange(f);
|
||||||
|
break;
|
||||||
|
case 2:
|
||||||
|
_port = __parseRange(f);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw std::invalid_argument("rule string has unknown extra fields");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (fn != 3)
|
||||||
|
throw std::invalid_argument("rule string must contain 3 fields");
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Filter::Rule::operator()(unsigned int etype,const void *data,unsigned int len) const
|
||||||
|
throw(std::invalid_argument)
|
||||||
|
{
|
||||||
|
if ((!_etherType)||(_etherType(etype))) { // ethertype is ANY, or matches
|
||||||
|
// Ethertype determines meaning of protocol and port
|
||||||
|
switch(etype) {
|
||||||
|
case ZT_ETHERTYPE_IPV4:
|
||||||
|
if (len > 20) {
|
||||||
|
if ((!_protocol)||(_protocol(((const uint8_t *)data)[9]))) { // protocol is ANY or match
|
||||||
|
if (!_port) // port is ANY
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// Don't match on fragments beyond fragment 0. If we've blocked
|
||||||
|
// fragment 0, further fragments will fall on deaf ears anyway.
|
||||||
|
if ((Utils::ntoh(((const uint16_t *)data)[3]) & 0x1fff))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
// Internet header length determines where data begins, in multiples of 32 bits
|
||||||
|
unsigned int ihl = 4 * (((const uint8_t *)data)[0] & 0x0f);
|
||||||
|
|
||||||
|
switch(((const uint8_t *)data)[9]) { // port's meaning depends on IP protocol
|
||||||
|
case ZT_IPPROTO_ICMP:
|
||||||
|
// For ICMP, port is ICMP type
|
||||||
|
return _port(((const uint8_t *)data)[ihl]);
|
||||||
|
case ZT_IPPROTO_TCP:
|
||||||
|
case ZT_IPPROTO_UDP:
|
||||||
|
case ZT_IPPROTO_SCTP:
|
||||||
|
case ZT_IPPROTO_UDPLITE:
|
||||||
|
// For these, port is destination port. Protocol designers were
|
||||||
|
// nice enough to put the field in the same place.
|
||||||
|
return _port(((const uint16_t *)data)[(ihl / 2) + 1]);
|
||||||
|
default:
|
||||||
|
// port has no meaning for other IP types, so ignore it
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false; // no match on port
|
||||||
|
}
|
||||||
|
} else throw std::invalid_argument("undersized IPv4 packet");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ZT_ETHERTYPE_IPV6:
|
||||||
|
if (len > 40) {
|
||||||
|
int nextHeader = ((const uint8_t *)data)[6];
|
||||||
|
unsigned int pos = 40;
|
||||||
|
while ((pos < len)&&(nextHeader >= 0)&&(nextHeader != 59)) { // 59 == no next header
|
||||||
|
fprintf(stderr,"[rule] V6: start header parse, header %.2x pos %d\n",nextHeader,pos);
|
||||||
|
|
||||||
|
switch(nextHeader) {
|
||||||
|
case 0: // hop-by-hop options
|
||||||
|
case 60: // destination options
|
||||||
|
case 43: // routing
|
||||||
|
case 135: // mobility (mobile IPv6 options)
|
||||||
|
if (_protocol((unsigned int)nextHeader))
|
||||||
|
return true; // match if our goal was to match any of these
|
||||||
|
nextHeader = ((const uint8_t *)data)[pos];
|
||||||
|
pos += 8 + (8 * ((const uint8_t *)data)[pos + 1]);
|
||||||
|
break;
|
||||||
|
case 44: // fragment
|
||||||
|
if (_protocol(44))
|
||||||
|
return true; // match if our goal was to match fragments
|
||||||
|
nextHeader = ((const uint8_t *)data)[pos];
|
||||||
|
pos += 8;
|
||||||
|
break;
|
||||||
|
case ZT_IPPROTO_AH: // AH
|
||||||
|
return _protocol(ZT_IPPROTO_AH); // true if AH is matched protocol, otherwise false since packet will be IPsec
|
||||||
|
case ZT_IPPROTO_ESP: // ESP
|
||||||
|
return _protocol(ZT_IPPROTO_ESP); // true if ESP is matched protocol, otherwise false since packet will be IPsec
|
||||||
|
case ZT_IPPROTO_ICMPV6:
|
||||||
|
// Only match ICMPv6 if we've selected it specifically
|
||||||
|
if (_protocol(ZT_IPPROTO_ICMPV6)) {
|
||||||
|
// Port is interpreted as ICMPv6 type
|
||||||
|
if ((!_port)||(_port(((const uint8_t *)data)[pos])))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case ZT_IPPROTO_TCP:
|
||||||
|
case ZT_IPPROTO_UDP:
|
||||||
|
case ZT_IPPROTO_SCTP:
|
||||||
|
case ZT_IPPROTO_UDPLITE:
|
||||||
|
// If we encounter any of these, match if protocol matches or is wildcard as
|
||||||
|
// we'll consider these the "real payload" if present.
|
||||||
|
if ((!_protocol)||(_protocol(nextHeader))) {
|
||||||
|
if ((!_port)||(_port(((const uint16_t *)data)[(pos / 2) + 1])))
|
||||||
|
return true; // protocol matches or is ANY, port is ANY or matches
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default: {
|
||||||
|
char foo[128];
|
||||||
|
Utils::snprintf(foo,sizeof(foo),"unrecognized IPv6 header type %d",(int)nextHeader);
|
||||||
|
throw std::invalid_argument(foo);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fprintf(stderr,"[rule] V6: end header parse, next header %.2x, new pos %d\n",nextHeader,pos);
|
||||||
|
}
|
||||||
|
} else throw std::invalid_argument("undersized IPv6 packet");
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
// For other ethertypes, protocol and port are ignored. What would they mean?
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string Filter::Rule::toString() const
|
||||||
|
{
|
||||||
|
char buf[128];
|
||||||
|
std::string s;
|
||||||
|
|
||||||
|
switch(_etherType.magnitude()) {
|
||||||
|
case 0:
|
||||||
|
s.push_back('*');
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
Utils::snprintf(buf,sizeof(buf),"%u",_etherType.start);
|
||||||
|
s.append(buf);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Utils::snprintf(buf,sizeof(buf),"%u-%u",_etherType.start,_etherType.end);
|
||||||
|
s.append(buf);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
s.push_back(';');
|
||||||
|
switch(_protocol.magnitude()) {
|
||||||
|
case 0:
|
||||||
|
s.push_back('*');
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
Utils::snprintf(buf,sizeof(buf),"%u",_protocol.start);
|
||||||
|
s.append(buf);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Utils::snprintf(buf,sizeof(buf),"%u-%u",_protocol.start,_protocol.end);
|
||||||
|
s.append(buf);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
s.push_back(';');
|
||||||
|
switch(_port.magnitude()) {
|
||||||
|
case 0:
|
||||||
|
s.push_back('*');
|
||||||
|
break;
|
||||||
|
case 1:
|
||||||
|
Utils::snprintf(buf,sizeof(buf),"%u",_port.start);
|
||||||
|
s.append(buf);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
Utils::snprintf(buf,sizeof(buf),"%u-%u",_port.start,_port.end);
|
||||||
|
s.append(buf);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
|
Filter::Filter(const char *s)
|
||||||
|
throw(std::invalid_argument)
|
||||||
|
{
|
||||||
|
char tmp[16384];
|
||||||
|
if (!Utils::scopy(tmp,sizeof(tmp),s))
|
||||||
|
throw std::invalid_argument("filter string too long");
|
||||||
|
char *saveptr = (char *)0;
|
||||||
|
unsigned int fn = 0;
|
||||||
|
for(char *f=Utils::stok(tmp,",",&saveptr);(f);f=Utils::stok((char *)0,",",&saveptr)) {
|
||||||
|
try {
|
||||||
|
_rules.push_back(Rule(f));
|
||||||
|
++fn;
|
||||||
|
} catch (std::invalid_argument &exc) {
|
||||||
|
char tmp[256];
|
||||||
|
Utils::snprintf(tmp,sizeof(tmp),"invalid rule at index %u: %s",fn,exc.what());
|
||||||
|
throw std::invalid_argument(tmp);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
std::sort(_rules.begin(),_rules.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string Filter::toString() const
|
||||||
|
{
|
||||||
|
std::string s;
|
||||||
|
|
||||||
|
for(std::vector<Rule>::const_iterator r(_rules.begin());r!=_rules.end();++r) {
|
||||||
|
if (s.length() > 0)
|
||||||
|
s.push_back(',');
|
||||||
|
s.append(r->toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
|
||||||
|
void Filter::add(const Rule &r)
|
||||||
|
{
|
||||||
|
for(std::vector<Rule>::iterator rr(_rules.begin());rr!=_rules.end();++rr) {
|
||||||
|
if (r == *rr)
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_rules.push_back(r);
|
||||||
|
std::sort(_rules.begin(),_rules.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *Filter::etherTypeName(const unsigned int etherType)
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
switch(etherType) {
|
||||||
|
case ZT_ETHERTYPE_IPV4: return "ETHERTYPE_IPV4";
|
||||||
|
case ZT_ETHERTYPE_ARP: return "ETHERTYPE_ARP";
|
||||||
|
case ZT_ETHERTYPE_RARP: return "ETHERTYPE_RARP";
|
||||||
|
case ZT_ETHERTYPE_ATALK: return "ETHERTYPE_ATALK";
|
||||||
|
case ZT_ETHERTYPE_AARP: return "ETHERTYPE_AARP";
|
||||||
|
case ZT_ETHERTYPE_IPX_A: return "ETHERTYPE_IPX_A";
|
||||||
|
case ZT_ETHERTYPE_IPX_B: return "ETHERTYPE_IPX_B";
|
||||||
|
case ZT_ETHERTYPE_IPV6: return "ETHERTYPE_IPV6";
|
||||||
|
}
|
||||||
|
return UNKNOWN_NAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *Filter::ipProtocolName(const unsigned int ipp)
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
switch(ipp) {
|
||||||
|
case ZT_IPPROTO_ICMP: return "IPPROTO_ICMP";
|
||||||
|
case ZT_IPPROTO_IGMP: return "IPPROTO_IGMP";
|
||||||
|
case ZT_IPPROTO_TCP: return "IPPROTO_TCP";
|
||||||
|
case ZT_IPPROTO_UDP: return "IPPROTO_UDP";
|
||||||
|
case ZT_IPPROTO_GRE: return "IPPROTO_GRE";
|
||||||
|
case ZT_IPPROTO_ESP: return "IPPROTO_ESP";
|
||||||
|
case ZT_IPPROTO_AH: return "IPPROTO_AH";
|
||||||
|
case ZT_IPPROTO_ICMPV6: return "IPPROTO_ICMPV6";
|
||||||
|
case ZT_IPPROTO_OSPF: return "IPPROTO_OSPF";
|
||||||
|
case ZT_IPPROTO_IPIP: return "IPPROTO_IPIP";
|
||||||
|
case ZT_IPPROTO_IPCOMP: return "IPPROTO_IPCOMP";
|
||||||
|
case ZT_IPPROTO_L2TP: return "IPPROTO_L2TP";
|
||||||
|
case ZT_IPPROTO_SCTP: return "IPPROTO_SCTP";
|
||||||
|
case ZT_IPPROTO_FC: return "IPPROTO_FC";
|
||||||
|
case ZT_IPPROTO_UDPLITE: return "IPPROTO_UDPLITE";
|
||||||
|
case ZT_IPPROTO_HIP: return "IPPROTO_HIP";
|
||||||
|
}
|
||||||
|
return UNKNOWN_NAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *Filter::icmpTypeName(const unsigned int icmpType)
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
switch(icmpType) {
|
||||||
|
case ZT_ICMP_ECHO_REPLY: return "ICMP_ECHO_REPLY";
|
||||||
|
case ZT_ICMP_DESTINATION_UNREACHABLE: return "ICMP_DESTINATION_UNREACHABLE";
|
||||||
|
case ZT_ICMP_SOURCE_QUENCH: return "ICMP_SOURCE_QUENCH";
|
||||||
|
case ZT_ICMP_REDIRECT: return "ICMP_REDIRECT";
|
||||||
|
case ZT_ICMP_ALTERNATE_HOST_ADDRESS: return "ICMP_ALTERNATE_HOST_ADDRESS";
|
||||||
|
case ZT_ICMP_ECHO_REQUEST: return "ICMP_ECHO_REQUEST";
|
||||||
|
case ZT_ICMP_ROUTER_ADVERTISEMENT: return "ICMP_ROUTER_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP_ROUTER_SOLICITATION: return "ICMP_ROUTER_SOLICITATION";
|
||||||
|
case ZT_ICMP_TIME_EXCEEDED: return "ICMP_TIME_EXCEEDED";
|
||||||
|
case ZT_ICMP_BAD_IP_HEADER: return "ICMP_BAD_IP_HEADER";
|
||||||
|
case ZT_ICMP_TIMESTAMP: return "ICMP_TIMESTAMP";
|
||||||
|
case ZT_ICMP_TIMESTAMP_REPLY: return "ICMP_TIMESTAMP_REPLY";
|
||||||
|
case ZT_ICMP_INFORMATION_REQUEST: return "ICMP_INFORMATION_REQUEST";
|
||||||
|
case ZT_ICMP_INFORMATION_REPLY: return "ICMP_INFORMATION_REPLY";
|
||||||
|
case ZT_ICMP_ADDRESS_MASK_REQUEST: return "ICMP_ADDRESS_MASK_REQUEST";
|
||||||
|
case ZT_ICMP_ADDRESS_MASK_REPLY: return "ICMP_ADDRESS_MASK_REPLY";
|
||||||
|
case ZT_ICMP_TRACEROUTE: return "ICMP_TRACEROUTE";
|
||||||
|
case ZT_ICMP_MOBILE_HOST_REDIRECT: return "ICMP_MOBILE_HOST_REDIRECT";
|
||||||
|
case ZT_ICMP_MOBILE_REGISTRATION_REQUEST: return "ICMP_MOBILE_REGISTRATION_REQUEST";
|
||||||
|
case ZT_ICMP_MOBILE_REGISTRATION_REPLY: return "ICMP_MOBILE_REGISTRATION_REPLY";
|
||||||
|
}
|
||||||
|
return UNKNOWN_NAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char *Filter::icmp6TypeName(const unsigned int icmp6Type)
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
switch(icmp6Type) {
|
||||||
|
case ZT_ICMP6_DESTINATION_UNREACHABLE: return "ICMP6_DESTINATION_UNREACHABLE";
|
||||||
|
case ZT_ICMP6_PACKET_TOO_BIG: return "ICMP6_PACKET_TOO_BIG";
|
||||||
|
case ZT_ICMP6_TIME_EXCEEDED: return "ICMP6_TIME_EXCEEDED";
|
||||||
|
case ZT_ICMP6_PARAMETER_PROBLEM: return "ICMP6_PARAMETER_PROBLEM";
|
||||||
|
case ZT_ICMP6_ECHO_REQUEST: return "ICMP6_ECHO_REQUEST";
|
||||||
|
case ZT_ICMP6_ECHO_REPLY: return "ICMP6_ECHO_REPLY";
|
||||||
|
case ZT_ICMP6_MULTICAST_LISTENER_QUERY: return "ICMP6_MULTICAST_LISTENER_QUERY";
|
||||||
|
case ZT_ICMP6_MULTICAST_LISTENER_REPORT: return "ICMP6_MULTICAST_LISTENER_REPORT";
|
||||||
|
case ZT_ICMP6_MULTICAST_LISTENER_DONE: return "ICMP6_MULTICAST_LISTENER_DONE";
|
||||||
|
case ZT_ICMP6_ROUTER_SOLICITATION: return "ICMP6_ROUTER_SOLICITATION";
|
||||||
|
case ZT_ICMP6_ROUTER_ADVERTISEMENT: return "ICMP6_ROUTER_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP6_NEIGHBOR_SOLICITATION: return "ICMP6_NEIGHBOR_SOLICITATION";
|
||||||
|
case ZT_ICMP6_NEIGHBOR_ADVERTISEMENT: return "ICMP6_NEIGHBOR_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP6_REDIRECT_MESSAGE: return "ICMP6_REDIRECT_MESSAGE";
|
||||||
|
case ZT_ICMP6_ROUTER_RENUMBERING: return "ICMP6_ROUTER_RENUMBERING";
|
||||||
|
case ZT_ICMP6_NODE_INFORMATION_QUERY: return "ICMP6_NODE_INFORMATION_QUERY";
|
||||||
|
case ZT_ICMP6_NODE_INFORMATION_RESPONSE: return "ICMP6_NODE_INFORMATION_RESPONSE";
|
||||||
|
case ZT_ICMP6_INV_NEIGHBOR_SOLICITATION: return "ICMP6_INV_NEIGHBOR_SOLICITATION";
|
||||||
|
case ZT_ICMP6_INV_NEIGHBOR_ADVERTISEMENT: return "ICMP6_INV_NEIGHBOR_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP6_MLDV2: return "ICMP6_MLDV2";
|
||||||
|
case ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REQUEST: return "ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REQUEST";
|
||||||
|
case ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REPLY: return "ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REPLY";
|
||||||
|
case ZT_ICMP6_MOBILE_PREFIX_SOLICITATION: return "ICMP6_MOBILE_PREFIX_SOLICITATION";
|
||||||
|
case ZT_ICMP6_MOBILE_PREFIX_ADVERTISEMENT: return "ICMP6_MOBILE_PREFIX_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP6_CERTIFICATION_PATH_SOLICITATION: return "ICMP6_CERTIFICATION_PATH_SOLICITATION";
|
||||||
|
case ZT_ICMP6_CERTIFICATION_PATH_ADVERTISEMENT: return "ICMP6_CERTIFICATION_PATH_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP6_MULTICAST_ROUTER_ADVERTISEMENT: return "ICMP6_MULTICAST_ROUTER_ADVERTISEMENT";
|
||||||
|
case ZT_ICMP6_MULTICAST_ROUTER_SOLICITATION: return "ICMP6_MULTICAST_ROUTER_SOLICITATION";
|
||||||
|
case ZT_ICMP6_MULTICAST_ROUTER_TERMINATION: return "ICMP6_MULTICAST_ROUTER_TERMINATION";
|
||||||
|
case ZT_ICMP6_RPL_CONTROL_MESSAGE: return "ICMP6_RPL_CONTROL_MESSAGE";
|
||||||
|
}
|
||||||
|
return UNKNOWN_NAME;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ZeroTier
|
284
attic/Filter.hpp
Normal file
284
attic/Filter.hpp
Normal file
|
@ -0,0 +1,284 @@
|
||||||
|
/*
|
||||||
|
* ZeroTier One - Network Virtualization Everywhere
|
||||||
|
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* --
|
||||||
|
*
|
||||||
|
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||||
|
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
*
|
||||||
|
* If you would like to embed ZeroTier into a commercial application or
|
||||||
|
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||||
|
* LLC. Start here: http://www.zerotier.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef _ZT_FILTER_HPP
|
||||||
|
#define _ZT_FILTER_HPP
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
#include <utility>
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
|
#include "Range.hpp"
|
||||||
|
|
||||||
|
/* Ethernet frame types that might be relevant to us */
|
||||||
|
#define ZT_ETHERTYPE_IPV4 0x0800
|
||||||
|
#define ZT_ETHERTYPE_ARP 0x0806
|
||||||
|
#define ZT_ETHERTYPE_RARP 0x8035
|
||||||
|
#define ZT_ETHERTYPE_ATALK 0x809b
|
||||||
|
#define ZT_ETHERTYPE_AARP 0x80f3
|
||||||
|
#define ZT_ETHERTYPE_IPX_A 0x8137
|
||||||
|
#define ZT_ETHERTYPE_IPX_B 0x8138
|
||||||
|
#define ZT_ETHERTYPE_IPV6 0x86dd
|
||||||
|
|
||||||
|
/* IP protocols we might care about */
|
||||||
|
#define ZT_IPPROTO_ICMP 0x01
|
||||||
|
#define ZT_IPPROTO_IGMP 0x02
|
||||||
|
#define ZT_IPPROTO_TCP 0x06
|
||||||
|
#define ZT_IPPROTO_UDP 0x11
|
||||||
|
#define ZT_IPPROTO_GRE 0x2f
|
||||||
|
#define ZT_IPPROTO_ESP 0x32
|
||||||
|
#define ZT_IPPROTO_AH 0x33
|
||||||
|
#define ZT_IPPROTO_ICMPV6 0x3a
|
||||||
|
#define ZT_IPPROTO_OSPF 0x59
|
||||||
|
#define ZT_IPPROTO_IPIP 0x5e
|
||||||
|
#define ZT_IPPROTO_IPCOMP 0x6c
|
||||||
|
#define ZT_IPPROTO_L2TP 0x73
|
||||||
|
#define ZT_IPPROTO_SCTP 0x84
|
||||||
|
#define ZT_IPPROTO_FC 0x85
|
||||||
|
#define ZT_IPPROTO_UDPLITE 0x88
|
||||||
|
#define ZT_IPPROTO_HIP 0x8b
|
||||||
|
|
||||||
|
/* IPv4 ICMP types */
|
||||||
|
#define ZT_ICMP_ECHO_REPLY 0
|
||||||
|
#define ZT_ICMP_DESTINATION_UNREACHABLE 3
|
||||||
|
#define ZT_ICMP_SOURCE_QUENCH 4
|
||||||
|
#define ZT_ICMP_REDIRECT 5
|
||||||
|
#define ZT_ICMP_ALTERNATE_HOST_ADDRESS 6
|
||||||
|
#define ZT_ICMP_ECHO_REQUEST 8
|
||||||
|
#define ZT_ICMP_ROUTER_ADVERTISEMENT 9
|
||||||
|
#define ZT_ICMP_ROUTER_SOLICITATION 10
|
||||||
|
#define ZT_ICMP_TIME_EXCEEDED 11
|
||||||
|
#define ZT_ICMP_BAD_IP_HEADER 12
|
||||||
|
#define ZT_ICMP_TIMESTAMP 13
|
||||||
|
#define ZT_ICMP_TIMESTAMP_REPLY 14
|
||||||
|
#define ZT_ICMP_INFORMATION_REQUEST 15
|
||||||
|
#define ZT_ICMP_INFORMATION_REPLY 16
|
||||||
|
#define ZT_ICMP_ADDRESS_MASK_REQUEST 17
|
||||||
|
#define ZT_ICMP_ADDRESS_MASK_REPLY 18
|
||||||
|
#define ZT_ICMP_TRACEROUTE 30
|
||||||
|
#define ZT_ICMP_MOBILE_HOST_REDIRECT 32
|
||||||
|
#define ZT_ICMP_MOBILE_REGISTRATION_REQUEST 35
|
||||||
|
#define ZT_ICMP_MOBILE_REGISTRATION_REPLY 36
|
||||||
|
|
||||||
|
/* IPv6 ICMP types */
|
||||||
|
#define ZT_ICMP6_DESTINATION_UNREACHABLE 1
|
||||||
|
#define ZT_ICMP6_PACKET_TOO_BIG 2
|
||||||
|
#define ZT_ICMP6_TIME_EXCEEDED 3
|
||||||
|
#define ZT_ICMP6_PARAMETER_PROBLEM 4
|
||||||
|
#define ZT_ICMP6_ECHO_REQUEST 128
|
||||||
|
#define ZT_ICMP6_ECHO_REPLY 129
|
||||||
|
#define ZT_ICMP6_MULTICAST_LISTENER_QUERY 130
|
||||||
|
#define ZT_ICMP6_MULTICAST_LISTENER_REPORT 131
|
||||||
|
#define ZT_ICMP6_MULTICAST_LISTENER_DONE 132
|
||||||
|
#define ZT_ICMP6_ROUTER_SOLICITATION 133
|
||||||
|
#define ZT_ICMP6_ROUTER_ADVERTISEMENT 134
|
||||||
|
#define ZT_ICMP6_NEIGHBOR_SOLICITATION 135
|
||||||
|
#define ZT_ICMP6_NEIGHBOR_ADVERTISEMENT 136
|
||||||
|
#define ZT_ICMP6_REDIRECT_MESSAGE 137
|
||||||
|
#define ZT_ICMP6_ROUTER_RENUMBERING 138
|
||||||
|
#define ZT_ICMP6_NODE_INFORMATION_QUERY 139
|
||||||
|
#define ZT_ICMP6_NODE_INFORMATION_RESPONSE 140
|
||||||
|
#define ZT_ICMP6_INV_NEIGHBOR_SOLICITATION 141
|
||||||
|
#define ZT_ICMP6_INV_NEIGHBOR_ADVERTISEMENT 142
|
||||||
|
#define ZT_ICMP6_MLDV2 143
|
||||||
|
#define ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REQUEST 144
|
||||||
|
#define ZT_ICMP6_HOME_AGENT_ADDRESS_DISCOVERY_REPLY 145
|
||||||
|
#define ZT_ICMP6_MOBILE_PREFIX_SOLICITATION 146
|
||||||
|
#define ZT_ICMP6_MOBILE_PREFIX_ADVERTISEMENT 147
|
||||||
|
#define ZT_ICMP6_CERTIFICATION_PATH_SOLICITATION 148
|
||||||
|
#define ZT_ICMP6_CERTIFICATION_PATH_ADVERTISEMENT 149
|
||||||
|
#define ZT_ICMP6_MULTICAST_ROUTER_ADVERTISEMENT 151
|
||||||
|
#define ZT_ICMP6_MULTICAST_ROUTER_SOLICITATION 152
|
||||||
|
#define ZT_ICMP6_MULTICAST_ROUTER_TERMINATION 153
|
||||||
|
#define ZT_ICMP6_RPL_CONTROL_MESSAGE 155
|
||||||
|
|
||||||
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
class RuntimeEnvironment;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A simple Ethernet frame level filter
|
||||||
|
*
|
||||||
|
* This doesn't specify actions, since it's used as a deny filter. The rule
|
||||||
|
* in ZT1 is "that which is not explicitly prohibited is allowed." (Except for
|
||||||
|
* ethertypes, which are handled by a whitelist.)
|
||||||
|
*/
|
||||||
|
class Filter
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
/**
|
||||||
|
* Value returned by etherTypeName, etc. on unknown
|
||||||
|
*
|
||||||
|
* These static methods return precisely this, so a pointer equality
|
||||||
|
* check will work.
|
||||||
|
*/
|
||||||
|
static const char *const UNKNOWN_NAME;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* An empty range as a more idiomatic way of specifying a wildcard match
|
||||||
|
*/
|
||||||
|
static const Range<unsigned int> ANY;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A filter rule
|
||||||
|
*/
|
||||||
|
class Rule
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
Rule()
|
||||||
|
throw() :
|
||||||
|
_etherType(),
|
||||||
|
_protocol(),
|
||||||
|
_port()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a rule from a string-serialized value
|
||||||
|
*
|
||||||
|
* @param s String formatted rule, such as returned by toString()
|
||||||
|
* @throws std::invalid_argument String formatted rule is not valid
|
||||||
|
*/
|
||||||
|
Rule(const char *s)
|
||||||
|
throw(std::invalid_argument);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct a new rule
|
||||||
|
*
|
||||||
|
* @param etype Ethernet type or empty range for ANY
|
||||||
|
* @param prot Protocol or empty range for ANY (meaning depends on ethertype, e.g. IP protocol numbers)
|
||||||
|
* @param prt Port or empty range for ANY (only applies to some protocols)
|
||||||
|
*/
|
||||||
|
Rule(const Range<unsigned int> &etype,const Range<unsigned int> &prot,const Range<unsigned int> &prt)
|
||||||
|
throw() :
|
||||||
|
_etherType(etype),
|
||||||
|
_protocol(prot),
|
||||||
|
_port(prt)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
inline const Range<unsigned int> ðerType() const throw() { return _etherType; }
|
||||||
|
inline const Range<unsigned int> &protocol() const throw() { return _protocol; }
|
||||||
|
inline const Range<unsigned int> &port() const throw() { return _port; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Test this rule against a frame
|
||||||
|
*
|
||||||
|
* @param etype Type of ethernet frame
|
||||||
|
* @param data Ethernet frame data
|
||||||
|
* @param len Length of ethernet frame
|
||||||
|
* @return True if rule matches
|
||||||
|
* @throws std::invalid_argument Frame invalid or not parseable
|
||||||
|
*/
|
||||||
|
bool operator()(unsigned int etype,const void *data,unsigned int len) const
|
||||||
|
throw(std::invalid_argument);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Serialize rule as string
|
||||||
|
*
|
||||||
|
* @return Human readable representation of rule
|
||||||
|
*/
|
||||||
|
std::string toString() const;
|
||||||
|
|
||||||
|
inline bool operator==(const Rule &r) const throw() { return ((_etherType == r._etherType)&&(_protocol == r._protocol)&&(_port == r._port)); }
|
||||||
|
inline bool operator!=(const Rule &r) const throw() { return !(*this == r); }
|
||||||
|
inline bool operator<(const Rule &r) const
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
if (_etherType < r._etherType)
|
||||||
|
return true;
|
||||||
|
else if (_etherType == r._etherType) {
|
||||||
|
if (_protocol < r._protocol)
|
||||||
|
return true;
|
||||||
|
else if (_protocol == r._protocol) {
|
||||||
|
if (_port < r._port)
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
inline bool operator>(const Rule &r) const throw() { return (r < *this); }
|
||||||
|
inline bool operator<=(const Rule &r) const throw() { return !(r < *this); }
|
||||||
|
inline bool operator>=(const Rule &r) const throw() { return !(*this < r); }
|
||||||
|
|
||||||
|
private:
|
||||||
|
Range<unsigned int> _etherType;
|
||||||
|
Range<unsigned int> _protocol;
|
||||||
|
Range<unsigned int> _port;
|
||||||
|
};
|
||||||
|
|
||||||
|
Filter() {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param s String-serialized filter representation
|
||||||
|
*/
|
||||||
|
Filter(const char *s)
|
||||||
|
throw(std::invalid_argument);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @return Comma-delimited list of string-format rules
|
||||||
|
*/
|
||||||
|
std::string toString() const;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Add a rule to this filter
|
||||||
|
*
|
||||||
|
* @param r Rule to add to filter
|
||||||
|
*/
|
||||||
|
void add(const Rule &r);
|
||||||
|
|
||||||
|
inline bool operator()(unsigned int etype,const void *data,unsigned int len) const
|
||||||
|
throw(std::invalid_argument)
|
||||||
|
{
|
||||||
|
for(std::vector<Rule>::const_iterator r(_rules.begin());r!=_rules.end();++r) {
|
||||||
|
if ((*r)(etype,data,len))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const char *etherTypeName(const unsigned int etherType)
|
||||||
|
throw();
|
||||||
|
static const char *ipProtocolName(const unsigned int ipp)
|
||||||
|
throw();
|
||||||
|
static const char *icmpTypeName(const unsigned int icmpType)
|
||||||
|
throw();
|
||||||
|
static const char *icmp6TypeName(const unsigned int icmp6Type)
|
||||||
|
throw();
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::vector<Rule> _rules;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace ZeroTier
|
||||||
|
|
||||||
|
#endif
|
651
attic/OSXEthernetTap.cpp.pcap-with-bridge-test
Normal file
651
attic/OSXEthernetTap.cpp.pcap-with-bridge-test
Normal file
|
@ -0,0 +1,651 @@
|
||||||
|
/*
|
||||||
|
* ZeroTier One - Network Virtualization Everywhere
|
||||||
|
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* --
|
||||||
|
*
|
||||||
|
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||||
|
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
*
|
||||||
|
* If you would like to embed ZeroTier into a commercial application or
|
||||||
|
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||||
|
* LLC. Start here: http://www.zerotier.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#include <sys/uio.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <net/route.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <net/if_arp.h>
|
||||||
|
#include <net/if_dl.h>
|
||||||
|
#include <net/if_media.h>
|
||||||
|
#include <netinet6/in6_var.h>
|
||||||
|
#include <netinet/in_var.h>
|
||||||
|
#include <netinet/icmp6.h>
|
||||||
|
|
||||||
|
#include <pcap/pcap.h>
|
||||||
|
|
||||||
|
// OSX compile fix... in6_var defines this in a struct which namespaces it for C++ ... why?!?
|
||||||
|
struct prf_ra {
|
||||||
|
u_char onlink : 1;
|
||||||
|
u_char autonomous : 1;
|
||||||
|
u_char reserved : 6;
|
||||||
|
} prf_ra;
|
||||||
|
|
||||||
|
#include <netinet6/nd6.h>
|
||||||
|
#include <ifaddrs.h>
|
||||||
|
|
||||||
|
// These are KERNEL_PRIVATE... why?
|
||||||
|
#ifndef SIOCAUTOCONF_START
|
||||||
|
#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq) /* accept rtadvd on this interface */
|
||||||
|
#endif
|
||||||
|
#ifndef SIOCAUTOCONF_STOP
|
||||||
|
#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq) /* stop accepting rtadv for this interface */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef ETH_ALEN
|
||||||
|
#define ETH_ALEN 6
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// This source is from:
|
||||||
|
// http://www.opensource.apple.com/source/Libinfo/Libinfo-406.17/gen.subproj/getifmaddrs.c?txt
|
||||||
|
// It's here because OSX 10.6 does not have this convenience function.
|
||||||
|
|
||||||
|
#define SALIGN (sizeof(uint32_t) - 1)
|
||||||
|
#define SA_RLEN(sa) ((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
|
||||||
|
(SALIGN + 1))
|
||||||
|
#define MAX_SYSCTL_TRY 5
|
||||||
|
#define RTA_MASKS (RTA_GATEWAY | RTA_IFP | RTA_IFA)
|
||||||
|
|
||||||
|
/* FreeBSD uses NET_RT_IFMALIST and RTM_NEWMADDR from <sys/socket.h> */
|
||||||
|
/* We can use NET_RT_IFLIST2 and RTM_NEWMADDR2 on Darwin */
|
||||||
|
//#define DARWIN_COMPAT
|
||||||
|
|
||||||
|
//#ifdef DARWIN_COMPAT
|
||||||
|
#define GIM_SYSCTL_MIB NET_RT_IFLIST2
|
||||||
|
#define GIM_RTM_ADDR RTM_NEWMADDR2
|
||||||
|
//#else
|
||||||
|
//#define GIM_SYSCTL_MIB NET_RT_IFMALIST
|
||||||
|
//#define GIM_RTM_ADDR RTM_NEWMADDR
|
||||||
|
//#endif
|
||||||
|
|
||||||
|
// Not in 10.6 includes so use our own
|
||||||
|
struct _intl_ifmaddrs {
|
||||||
|
struct _intl_ifmaddrs *ifma_next;
|
||||||
|
struct sockaddr *ifma_name;
|
||||||
|
struct sockaddr *ifma_addr;
|
||||||
|
struct sockaddr *ifma_lladdr;
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline int _intl_getifmaddrs(struct _intl_ifmaddrs **pif)
|
||||||
|
{
|
||||||
|
int icnt = 1;
|
||||||
|
int dcnt = 0;
|
||||||
|
int ntry = 0;
|
||||||
|
size_t len;
|
||||||
|
size_t needed;
|
||||||
|
int mib[6];
|
||||||
|
int i;
|
||||||
|
char *buf;
|
||||||
|
char *data;
|
||||||
|
char *next;
|
||||||
|
char *p;
|
||||||
|
struct ifma_msghdr2 *ifmam;
|
||||||
|
struct _intl_ifmaddrs *ifa, *ift;
|
||||||
|
struct rt_msghdr *rtm;
|
||||||
|
struct sockaddr *sa;
|
||||||
|
|
||||||
|
mib[0] = CTL_NET;
|
||||||
|
mib[1] = PF_ROUTE;
|
||||||
|
mib[2] = 0; /* protocol */
|
||||||
|
mib[3] = 0; /* wildcard address family */
|
||||||
|
mib[4] = GIM_SYSCTL_MIB;
|
||||||
|
mib[5] = 0; /* no flags */
|
||||||
|
do {
|
||||||
|
if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
|
||||||
|
return (-1);
|
||||||
|
if ((buf = (char *)malloc(needed)) == NULL)
|
||||||
|
return (-1);
|
||||||
|
if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
|
||||||
|
if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
|
||||||
|
free(buf);
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
free(buf);
|
||||||
|
buf = NULL;
|
||||||
|
}
|
||||||
|
} while (buf == NULL);
|
||||||
|
|
||||||
|
for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
|
||||||
|
rtm = (struct rt_msghdr *)(void *)next;
|
||||||
|
if (rtm->rtm_version != RTM_VERSION)
|
||||||
|
continue;
|
||||||
|
switch (rtm->rtm_type) {
|
||||||
|
case GIM_RTM_ADDR:
|
||||||
|
ifmam = (struct ifma_msghdr2 *)(void *)rtm;
|
||||||
|
if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
|
||||||
|
break;
|
||||||
|
icnt++;
|
||||||
|
p = (char *)(ifmam + 1);
|
||||||
|
for (i = 0; i < RTAX_MAX; i++) {
|
||||||
|
if ((RTA_MASKS & ifmam->ifmam_addrs &
|
||||||
|
(1 << i)) == 0)
|
||||||
|
continue;
|
||||||
|
sa = (struct sockaddr *)(void *)p;
|
||||||
|
len = SA_RLEN(sa);
|
||||||
|
dcnt += len;
|
||||||
|
p += len;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data = (char *)malloc(sizeof(struct _intl_ifmaddrs) * icnt + dcnt);
|
||||||
|
if (data == NULL) {
|
||||||
|
free(buf);
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
ifa = (struct _intl_ifmaddrs *)(void *)data;
|
||||||
|
data += sizeof(struct _intl_ifmaddrs) * icnt;
|
||||||
|
|
||||||
|
memset(ifa, 0, sizeof(struct _intl_ifmaddrs) * icnt);
|
||||||
|
ift = ifa;
|
||||||
|
|
||||||
|
for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
|
||||||
|
rtm = (struct rt_msghdr *)(void *)next;
|
||||||
|
if (rtm->rtm_version != RTM_VERSION)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
switch (rtm->rtm_type) {
|
||||||
|
case GIM_RTM_ADDR:
|
||||||
|
ifmam = (struct ifma_msghdr2 *)(void *)rtm;
|
||||||
|
if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
p = (char *)(ifmam + 1);
|
||||||
|
for (i = 0; i < RTAX_MAX; i++) {
|
||||||
|
if ((RTA_MASKS & ifmam->ifmam_addrs &
|
||||||
|
(1 << i)) == 0)
|
||||||
|
continue;
|
||||||
|
sa = (struct sockaddr *)(void *)p;
|
||||||
|
len = SA_RLEN(sa);
|
||||||
|
switch (i) {
|
||||||
|
case RTAX_GATEWAY:
|
||||||
|
ift->ifma_lladdr =
|
||||||
|
(struct sockaddr *)(void *)data;
|
||||||
|
memcpy(data, p, len);
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RTAX_IFP:
|
||||||
|
ift->ifma_name =
|
||||||
|
(struct sockaddr *)(void *)data;
|
||||||
|
memcpy(data, p, len);
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RTAX_IFA:
|
||||||
|
ift->ifma_addr =
|
||||||
|
(struct sockaddr *)(void *)data;
|
||||||
|
memcpy(data, p, len);
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p += len;
|
||||||
|
}
|
||||||
|
ift->ifma_next = ift + 1;
|
||||||
|
ift = ift->ifma_next;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
free(buf);
|
||||||
|
|
||||||
|
if (ift > ifa) {
|
||||||
|
ift--;
|
||||||
|
ift->ifma_next = NULL;
|
||||||
|
*pif = ifa;
|
||||||
|
} else {
|
||||||
|
*pif = NULL;
|
||||||
|
free(ifa);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
|
||||||
|
{
|
||||||
|
free(ifmp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <map>
|
||||||
|
#include <set>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include "../node/Constants.hpp"
|
||||||
|
#include "../node/Utils.hpp"
|
||||||
|
#include "../node/Mutex.hpp"
|
||||||
|
#include "../node/Dictionary.hpp"
|
||||||
|
#include "OSUtils.hpp"
|
||||||
|
#include "OSXEthernetTap.hpp"
|
||||||
|
|
||||||
|
// ff:ff:ff:ff:ff:ff with no ADI
|
||||||
|
static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
|
||||||
|
|
||||||
|
static inline bool _setIpv6Stuff(const char *ifname,bool performNUD,bool acceptRouterAdverts)
|
||||||
|
{
|
||||||
|
struct in6_ndireq nd;
|
||||||
|
struct in6_ifreq ifr;
|
||||||
|
|
||||||
|
int s = socket(AF_INET6,SOCK_DGRAM,0);
|
||||||
|
if (s <= 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
memset(&nd,0,sizeof(nd));
|
||||||
|
strncpy(nd.ifname,ifname,sizeof(nd.ifname));
|
||||||
|
|
||||||
|
if (ioctl(s,SIOCGIFINFO_IN6,&nd)) {
|
||||||
|
close(s);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long oldFlags = (unsigned long)nd.ndi.flags;
|
||||||
|
|
||||||
|
if (performNUD)
|
||||||
|
nd.ndi.flags |= ND6_IFF_PERFORMNUD;
|
||||||
|
else nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
|
||||||
|
|
||||||
|
if (oldFlags != (unsigned long)nd.ndi.flags) {
|
||||||
|
if (ioctl(s,SIOCSIFINFO_FLAGS,&nd)) {
|
||||||
|
close(s);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&ifr,0,sizeof(ifr));
|
||||||
|
strncpy(ifr.ifr_name,ifname,sizeof(ifr.ifr_name));
|
||||||
|
if (ioctl(s,acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP,&ifr)) {
|
||||||
|
close(s);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
close(s);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
static std::set<std::string> globalDeviceNames;
|
||||||
|
static Mutex globalTapCreateLock;
|
||||||
|
|
||||||
|
OSXEthernetTap::OSXEthernetTap(
|
||||||
|
const char *homePath,
|
||||||
|
const MAC &mac,
|
||||||
|
unsigned int mtu,
|
||||||
|
unsigned int metric,
|
||||||
|
uint64_t nwid,
|
||||||
|
const char *friendlyName,
|
||||||
|
void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *data,unsigned int len),
|
||||||
|
void *arg) :
|
||||||
|
_handler(handler),
|
||||||
|
_arg(arg),
|
||||||
|
_pcap((void *)0),
|
||||||
|
_nwid(nwid),
|
||||||
|
_mac(mac),
|
||||||
|
_homePath(homePath),
|
||||||
|
_mtu(mtu),
|
||||||
|
_metric(metric),
|
||||||
|
_enabled(true)
|
||||||
|
{
|
||||||
|
char errbuf[PCAP_ERRBUF_SIZE];
|
||||||
|
char devname[64],ethaddr[64],mtustr[32],metstr[32],nwids[32];
|
||||||
|
|
||||||
|
Utils::snprintf(nwids,sizeof(nwids),"%.16llx",nwid);
|
||||||
|
|
||||||
|
if (mtu > 2800)
|
||||||
|
throw std::runtime_error("max tap MTU is 2800");
|
||||||
|
|
||||||
|
Mutex::Lock _gl(globalTapCreateLock);
|
||||||
|
|
||||||
|
std::string desiredDevice;
|
||||||
|
Dictionary devmap;
|
||||||
|
{
|
||||||
|
std::string devmapbuf;
|
||||||
|
if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
|
||||||
|
devmap.fromString(devmapbuf);
|
||||||
|
desiredDevice = devmap.get(nwids,"");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((desiredDevice.length() >= 9)&&(desiredDevice.substr(0,6) == "bridge")) {
|
||||||
|
// length() >= 9 matches bridge### or bridge####
|
||||||
|
_dev = desiredDevice;
|
||||||
|
} else {
|
||||||
|
if (globalDeviceNames.size() >= (10000 - 128)) // sanity check... this would be nuts
|
||||||
|
throw std::runtime_error("too many devices!");
|
||||||
|
unsigned int pseudoBridgeNo = (unsigned int)((nwid ^ (nwid >> 32)) % (10000 - 128)) + 128; // range: bridge128 to bridge9999
|
||||||
|
sprintf(devname,"bridge%u",pseudoBridgeNo);
|
||||||
|
while (globalDeviceNames.count(std::string(devname)) > 0) {
|
||||||
|
++pseudoBridgeNo;
|
||||||
|
if (pseudoBridgeNo > 9999)
|
||||||
|
pseudoBridgeNo = 64;
|
||||||
|
sprintf(devname,"bridge%u",pseudoBridgeNo);
|
||||||
|
}
|
||||||
|
_dev = devname;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure MAC address and MTU, bring interface up
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"create",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
if (exitcode != 0)
|
||||||
|
throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
|
||||||
|
} else throw std::runtime_error("unable to fork()");
|
||||||
|
Utils::snprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
|
||||||
|
Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
|
||||||
|
Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
|
||||||
|
cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
if (exitcode != 0)
|
||||||
|
throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
|
||||||
|
} else throw std::runtime_error("unable to fork()");
|
||||||
|
|
||||||
|
_setIpv6Stuff(_dev.c_str(),true,false);
|
||||||
|
|
||||||
|
_pcap = (void *)pcap_create(_dev.c_str(),errbuf);
|
||||||
|
if (!_pcap) {
|
||||||
|
cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
}
|
||||||
|
throw std::runtime_error((std::string("pcap_create() on new bridge device failed: ") + errbuf).c_str());
|
||||||
|
}
|
||||||
|
pcap_set_promisc(reinterpret_cast<pcap_t *>(_pcap),1);
|
||||||
|
pcap_set_timeout(reinterpret_cast<pcap_t *>(_pcap),120000);
|
||||||
|
pcap_set_immediate_mode(reinterpret_cast<pcap_t *>(_pcap),1);
|
||||||
|
if (pcap_set_buffer_size(reinterpret_cast<pcap_t *>(_pcap),1024 * 1024 * 16) != 0) // 16MB
|
||||||
|
fprintf(stderr,"WARNING: pcap_set_buffer_size() failed!\n");
|
||||||
|
if (pcap_set_snaplen(reinterpret_cast<pcap_t *>(_pcap),4096) != 0)
|
||||||
|
fprintf(stderr,"WARNING: pcap_set_snaplen() failed!\n");
|
||||||
|
if (pcap_activate(reinterpret_cast<pcap_t *>(_pcap)) != 0) {
|
||||||
|
pcap_close(reinterpret_cast<pcap_t *>(_pcap));
|
||||||
|
cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
}
|
||||||
|
throw std::runtime_error("pcap_activate() on new bridge device failed.");
|
||||||
|
}
|
||||||
|
|
||||||
|
globalDeviceNames.insert(_dev);
|
||||||
|
|
||||||
|
devmap[nwids] = _dev;
|
||||||
|
OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
|
||||||
|
|
||||||
|
_thread = Thread::start(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
OSXEthernetTap::~OSXEthernetTap()
|
||||||
|
{
|
||||||
|
_enabled = false;
|
||||||
|
|
||||||
|
Mutex::Lock _gl(globalTapCreateLock);
|
||||||
|
globalDeviceNames.erase(_dev);
|
||||||
|
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"destroy",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
if (exitcode == 0) {
|
||||||
|
// Destroying the interface nukes pcap and terminates the thread.
|
||||||
|
Thread::join(_thread);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pcap_close(reinterpret_cast<pcap_t *>(_pcap));
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
|
||||||
|
{
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet",ip.toIpString().c_str(),"-alias",(const char *)0);
|
||||||
|
_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
waitpid(cpid,&exitcode,0);
|
||||||
|
return (exitcode == 0);
|
||||||
|
}
|
||||||
|
return false; // never reached, make compiler shut up about return value
|
||||||
|
}
|
||||||
|
|
||||||
|
bool OSXEthernetTap::addIp(const InetAddress &ip)
|
||||||
|
{
|
||||||
|
if (!ip)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
std::vector<InetAddress> allIps(ips());
|
||||||
|
if (std::binary_search(allIps.begin(),allIps.end(),ip))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// Remove and reconfigure if address is the same but netmask is different
|
||||||
|
for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
|
||||||
|
if ((i->ipsEqual(ip))&&(i->netmaskBits() != ip.netmaskBits())) {
|
||||||
|
if (___removeIp(_dev,*i))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.isV4() ? "inet" : "inet6",ip.toString().c_str(),"alias",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
return (exitcode == 0);
|
||||||
|
} // else return false...
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool OSXEthernetTap::removeIp(const InetAddress &ip)
|
||||||
|
{
|
||||||
|
if (!ip)
|
||||||
|
return true;
|
||||||
|
std::vector<InetAddress> allIps(ips());
|
||||||
|
if (!std::binary_search(allIps.begin(),allIps.end(),ip)) {
|
||||||
|
if (___removeIp(_dev,ip))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<InetAddress> OSXEthernetTap::ips() const
|
||||||
|
{
|
||||||
|
struct ifaddrs *ifa = (struct ifaddrs *)0;
|
||||||
|
if (getifaddrs(&ifa))
|
||||||
|
return std::vector<InetAddress>();
|
||||||
|
|
||||||
|
std::vector<InetAddress> r;
|
||||||
|
|
||||||
|
struct ifaddrs *p = ifa;
|
||||||
|
while (p) {
|
||||||
|
if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
|
||||||
|
switch(p->ifa_addr->sa_family) {
|
||||||
|
case AF_INET: {
|
||||||
|
struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
|
||||||
|
struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
|
||||||
|
r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
|
||||||
|
} break;
|
||||||
|
case AF_INET6: {
|
||||||
|
struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
|
||||||
|
struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
|
||||||
|
uint32_t b[4];
|
||||||
|
memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
|
||||||
|
r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
|
||||||
|
} break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p = p->ifa_next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ifa)
|
||||||
|
freeifaddrs(ifa);
|
||||||
|
|
||||||
|
std::sort(r.begin(),r.end());
|
||||||
|
std::unique(r.begin(),r.end());
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
|
||||||
|
{
|
||||||
|
char putBuf[4096];
|
||||||
|
if ((len <= _mtu)&&(_enabled)) {
|
||||||
|
to.copyTo(putBuf,6);
|
||||||
|
from.copyTo(putBuf + 6,6);
|
||||||
|
*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
|
||||||
|
memcpy(putBuf + 14,data,len);
|
||||||
|
len += 14;
|
||||||
|
int r = pcap_inject(reinterpret_cast<pcap_t *>(_pcap),putBuf,len);
|
||||||
|
if (r <= 0) {
|
||||||
|
printf("%s: pcap_inject() failed\n",_dev.c_str());
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
printf("%s: inject %s -> %s etherType==%u len=%u r==%d\n",_dev.c_str(),from.toString().c_str(),to.toString().c_str(),etherType,len,r);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string OSXEthernetTap::deviceName() const
|
||||||
|
{
|
||||||
|
return _dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::setFriendlyName(const char *friendlyName)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
|
||||||
|
{
|
||||||
|
std::vector<MulticastGroup> newGroups;
|
||||||
|
|
||||||
|
struct _intl_ifmaddrs *ifmap = (struct _intl_ifmaddrs *)0;
|
||||||
|
if (!_intl_getifmaddrs(&ifmap)) {
|
||||||
|
struct _intl_ifmaddrs *p = ifmap;
|
||||||
|
while (p) {
|
||||||
|
if (p->ifma_addr->sa_family == AF_LINK) {
|
||||||
|
struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
|
||||||
|
struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
|
||||||
|
if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
|
||||||
|
newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
|
||||||
|
}
|
||||||
|
p = p->ifma_next;
|
||||||
|
}
|
||||||
|
_intl_freeifmaddrs(ifmap);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<InetAddress> allIps(ips());
|
||||||
|
for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
|
||||||
|
newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
|
||||||
|
|
||||||
|
std::sort(newGroups.begin(),newGroups.end());
|
||||||
|
std::unique(newGroups.begin(),newGroups.end());
|
||||||
|
|
||||||
|
for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
|
||||||
|
if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
|
||||||
|
added.push_back(*m);
|
||||||
|
}
|
||||||
|
for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
|
||||||
|
if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
|
||||||
|
removed.push_back(*m);
|
||||||
|
}
|
||||||
|
|
||||||
|
_multicastGroups.swap(newGroups);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void _pcapHandler(u_char *ptr,const struct pcap_pkthdr *hdr,const u_char *data)
|
||||||
|
{
|
||||||
|
OSXEthernetTap *tap = reinterpret_cast<OSXEthernetTap *>(ptr);
|
||||||
|
if (hdr->caplen > 14) {
|
||||||
|
MAC to(data,6);
|
||||||
|
MAC from(data + 6,6);
|
||||||
|
if (from == tap->_mac) {
|
||||||
|
unsigned int etherType = ntohs(((const uint16_t *)data)[6]);
|
||||||
|
printf("%s: %s -> %s etherType==%u len==%u\n",tap->_dev.c_str(),from.toString().c_str(),to.toString().c_str(),etherType,(unsigned int)hdr->caplen);
|
||||||
|
// TODO: VLAN support
|
||||||
|
tap->_handler(tap->_arg,tap->_nwid,from,to,etherType,0,(const void *)(data + 14),hdr->len - 14);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::threadMain()
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
pcap_loop(reinterpret_cast<pcap_t *>(_pcap),-1,&_pcapHandler,reinterpret_cast<u_char *>(this));
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ZeroTier
|
832
attic/OSXEthernetTap.cpp.utun-work-in-progress
Normal file
832
attic/OSXEthernetTap.cpp.utun-work-in-progress
Normal file
|
@ -0,0 +1,832 @@
|
||||||
|
/*
|
||||||
|
* ZeroTier One - Network Virtualization Everywhere
|
||||||
|
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* --
|
||||||
|
*
|
||||||
|
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||||
|
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
*
|
||||||
|
* If you would like to embed ZeroTier into a commercial application or
|
||||||
|
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||||
|
* LLC. Start here: http://www.zerotier.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <errno.h>
|
||||||
|
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <signal.h>
|
||||||
|
|
||||||
|
#include <fcntl.h>
|
||||||
|
#include <sys/types.h>
|
||||||
|
#include <sys/stat.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/wait.h>
|
||||||
|
#include <sys/select.h>
|
||||||
|
#include <sys/cdefs.h>
|
||||||
|
#include <sys/uio.h>
|
||||||
|
#include <sys/param.h>
|
||||||
|
#include <sys/sysctl.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/socket.h>
|
||||||
|
#include <sys/sys_domain.h>
|
||||||
|
#include <sys/kern_control.h>
|
||||||
|
#include <net/if_utun.h>
|
||||||
|
#include <netinet/in.h>
|
||||||
|
#include <arpa/inet.h>
|
||||||
|
#include <net/route.h>
|
||||||
|
#include <net/if.h>
|
||||||
|
#include <net/if_arp.h>
|
||||||
|
#include <net/if_dl.h>
|
||||||
|
#include <net/if_media.h>
|
||||||
|
#include <netinet6/in6_var.h>
|
||||||
|
#include <netinet/in_var.h>
|
||||||
|
#include <netinet/icmp6.h>
|
||||||
|
|
||||||
|
// OSX compile fix... in6_var defines this in a struct which namespaces it for C++ ... why?!?
|
||||||
|
struct prf_ra {
|
||||||
|
u_char onlink : 1;
|
||||||
|
u_char autonomous : 1;
|
||||||
|
u_char reserved : 6;
|
||||||
|
} prf_ra;
|
||||||
|
|
||||||
|
#include <netinet6/nd6.h>
|
||||||
|
#include <ifaddrs.h>
|
||||||
|
|
||||||
|
// These are KERNEL_PRIVATE... why?
|
||||||
|
#ifndef SIOCAUTOCONF_START
|
||||||
|
#define SIOCAUTOCONF_START _IOWR('i', 132, struct in6_ifreq) /* accept rtadvd on this interface */
|
||||||
|
#endif
|
||||||
|
#ifndef SIOCAUTOCONF_STOP
|
||||||
|
#define SIOCAUTOCONF_STOP _IOWR('i', 133, struct in6_ifreq) /* stop accepting rtadv for this interface */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// This source is from:
|
||||||
|
// http://www.opensource.apple.com/source/Libinfo/Libinfo-406.17/gen.subproj/getifmaddrs.c?txt
|
||||||
|
// It's here because OSX 10.6 does not have this convenience function.
|
||||||
|
|
||||||
|
#define SALIGN (sizeof(uint32_t) - 1)
|
||||||
|
#define SA_RLEN(sa) ((sa)->sa_len ? (((sa)->sa_len + SALIGN) & ~SALIGN) : \
|
||||||
|
(SALIGN + 1))
|
||||||
|
#define MAX_SYSCTL_TRY 5
|
||||||
|
#define RTA_MASKS (RTA_GATEWAY | RTA_IFP | RTA_IFA)
|
||||||
|
|
||||||
|
/* FreeBSD uses NET_RT_IFMALIST and RTM_NEWMADDR from <sys/socket.h> */
|
||||||
|
/* We can use NET_RT_IFLIST2 and RTM_NEWMADDR2 on Darwin */
|
||||||
|
//#define DARWIN_COMPAT
|
||||||
|
|
||||||
|
//#ifdef DARWIN_COMPAT
|
||||||
|
#define GIM_SYSCTL_MIB NET_RT_IFLIST2
|
||||||
|
#define GIM_RTM_ADDR RTM_NEWMADDR2
|
||||||
|
//#else
|
||||||
|
//#define GIM_SYSCTL_MIB NET_RT_IFMALIST
|
||||||
|
//#define GIM_RTM_ADDR RTM_NEWMADDR
|
||||||
|
//#endif
|
||||||
|
|
||||||
|
// Not in 10.6 includes so use our own
|
||||||
|
struct _intl_ifmaddrs {
|
||||||
|
struct _intl_ifmaddrs *ifma_next;
|
||||||
|
struct sockaddr *ifma_name;
|
||||||
|
struct sockaddr *ifma_addr;
|
||||||
|
struct sockaddr *ifma_lladdr;
|
||||||
|
};
|
||||||
|
|
||||||
|
static inline int _intl_getifmaddrs(struct _intl_ifmaddrs **pif)
|
||||||
|
{
|
||||||
|
int icnt = 1;
|
||||||
|
int dcnt = 0;
|
||||||
|
int ntry = 0;
|
||||||
|
size_t len;
|
||||||
|
size_t needed;
|
||||||
|
int mib[6];
|
||||||
|
int i;
|
||||||
|
char *buf;
|
||||||
|
char *data;
|
||||||
|
char *next;
|
||||||
|
char *p;
|
||||||
|
struct ifma_msghdr2 *ifmam;
|
||||||
|
struct _intl_ifmaddrs *ifa, *ift;
|
||||||
|
struct rt_msghdr *rtm;
|
||||||
|
struct sockaddr *sa;
|
||||||
|
|
||||||
|
mib[0] = CTL_NET;
|
||||||
|
mib[1] = PF_ROUTE;
|
||||||
|
mib[2] = 0; /* protocol */
|
||||||
|
mib[3] = 0; /* wildcard address family */
|
||||||
|
mib[4] = GIM_SYSCTL_MIB;
|
||||||
|
mib[5] = 0; /* no flags */
|
||||||
|
do {
|
||||||
|
if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
|
||||||
|
return (-1);
|
||||||
|
if ((buf = (char *)malloc(needed)) == NULL)
|
||||||
|
return (-1);
|
||||||
|
if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0) {
|
||||||
|
if (errno != ENOMEM || ++ntry >= MAX_SYSCTL_TRY) {
|
||||||
|
free(buf);
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
free(buf);
|
||||||
|
buf = NULL;
|
||||||
|
}
|
||||||
|
} while (buf == NULL);
|
||||||
|
|
||||||
|
for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
|
||||||
|
rtm = (struct rt_msghdr *)(void *)next;
|
||||||
|
if (rtm->rtm_version != RTM_VERSION)
|
||||||
|
continue;
|
||||||
|
switch (rtm->rtm_type) {
|
||||||
|
case GIM_RTM_ADDR:
|
||||||
|
ifmam = (struct ifma_msghdr2 *)(void *)rtm;
|
||||||
|
if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
|
||||||
|
break;
|
||||||
|
icnt++;
|
||||||
|
p = (char *)(ifmam + 1);
|
||||||
|
for (i = 0; i < RTAX_MAX; i++) {
|
||||||
|
if ((RTA_MASKS & ifmam->ifmam_addrs &
|
||||||
|
(1 << i)) == 0)
|
||||||
|
continue;
|
||||||
|
sa = (struct sockaddr *)(void *)p;
|
||||||
|
len = SA_RLEN(sa);
|
||||||
|
dcnt += len;
|
||||||
|
p += len;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data = (char *)malloc(sizeof(struct _intl_ifmaddrs) * icnt + dcnt);
|
||||||
|
if (data == NULL) {
|
||||||
|
free(buf);
|
||||||
|
return (-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
ifa = (struct _intl_ifmaddrs *)(void *)data;
|
||||||
|
data += sizeof(struct _intl_ifmaddrs) * icnt;
|
||||||
|
|
||||||
|
memset(ifa, 0, sizeof(struct _intl_ifmaddrs) * icnt);
|
||||||
|
ift = ifa;
|
||||||
|
|
||||||
|
for (next = buf; next < buf + needed; next += rtm->rtm_msglen) {
|
||||||
|
rtm = (struct rt_msghdr *)(void *)next;
|
||||||
|
if (rtm->rtm_version != RTM_VERSION)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
switch (rtm->rtm_type) {
|
||||||
|
case GIM_RTM_ADDR:
|
||||||
|
ifmam = (struct ifma_msghdr2 *)(void *)rtm;
|
||||||
|
if ((ifmam->ifmam_addrs & RTA_IFA) == 0)
|
||||||
|
break;
|
||||||
|
|
||||||
|
p = (char *)(ifmam + 1);
|
||||||
|
for (i = 0; i < RTAX_MAX; i++) {
|
||||||
|
if ((RTA_MASKS & ifmam->ifmam_addrs &
|
||||||
|
(1 << i)) == 0)
|
||||||
|
continue;
|
||||||
|
sa = (struct sockaddr *)(void *)p;
|
||||||
|
len = SA_RLEN(sa);
|
||||||
|
switch (i) {
|
||||||
|
case RTAX_GATEWAY:
|
||||||
|
ift->ifma_lladdr =
|
||||||
|
(struct sockaddr *)(void *)data;
|
||||||
|
memcpy(data, p, len);
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RTAX_IFP:
|
||||||
|
ift->ifma_name =
|
||||||
|
(struct sockaddr *)(void *)data;
|
||||||
|
memcpy(data, p, len);
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case RTAX_IFA:
|
||||||
|
ift->ifma_addr =
|
||||||
|
(struct sockaddr *)(void *)data;
|
||||||
|
memcpy(data, p, len);
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
data += len;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
p += len;
|
||||||
|
}
|
||||||
|
ift->ifma_next = ift + 1;
|
||||||
|
ift = ift->ifma_next;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
free(buf);
|
||||||
|
|
||||||
|
if (ift > ifa) {
|
||||||
|
ift--;
|
||||||
|
ift->ifma_next = NULL;
|
||||||
|
*pif = ifa;
|
||||||
|
} else {
|
||||||
|
*pif = NULL;
|
||||||
|
free(ifa);
|
||||||
|
}
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void _intl_freeifmaddrs(struct _intl_ifmaddrs *ifmp)
|
||||||
|
{
|
||||||
|
free(ifmp);
|
||||||
|
}
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
// --------------------------------------------------------------------------
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <map>
|
||||||
|
#include <set>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
|
#include "../node/Constants.hpp"
|
||||||
|
#include "../node/Utils.hpp"
|
||||||
|
#include "../node/Mutex.hpp"
|
||||||
|
#include "../node/Dictionary.hpp"
|
||||||
|
#include "Arp.hpp"
|
||||||
|
#include "OSUtils.hpp"
|
||||||
|
#include "OSXEthernetTap.hpp"
|
||||||
|
|
||||||
|
// ff:ff:ff:ff:ff:ff with no ADI
|
||||||
|
static const ZeroTier::MulticastGroup _blindWildcardMulticastGroup(ZeroTier::MAC(0xff),0);
|
||||||
|
|
||||||
|
static inline bool _setIpv6Stuff(const char *ifname,bool performNUD,bool acceptRouterAdverts)
|
||||||
|
{
|
||||||
|
struct in6_ndireq nd;
|
||||||
|
struct in6_ifreq ifr;
|
||||||
|
|
||||||
|
int s = socket(AF_INET6,SOCK_DGRAM,0);
|
||||||
|
if (s <= 0)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
memset(&nd,0,sizeof(nd));
|
||||||
|
strncpy(nd.ifname,ifname,sizeof(nd.ifname));
|
||||||
|
|
||||||
|
if (ioctl(s,SIOCGIFINFO_IN6,&nd)) {
|
||||||
|
close(s);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long oldFlags = (unsigned long)nd.ndi.flags;
|
||||||
|
|
||||||
|
if (performNUD)
|
||||||
|
nd.ndi.flags |= ND6_IFF_PERFORMNUD;
|
||||||
|
else nd.ndi.flags &= ~ND6_IFF_PERFORMNUD;
|
||||||
|
|
||||||
|
if (oldFlags != (unsigned long)nd.ndi.flags) {
|
||||||
|
if (ioctl(s,SIOCSIFINFO_FLAGS,&nd)) {
|
||||||
|
close(s);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&ifr,0,sizeof(ifr));
|
||||||
|
strncpy(ifr.ifr_name,ifname,sizeof(ifr.ifr_name));
|
||||||
|
if (ioctl(s,acceptRouterAdverts ? SIOCAUTOCONF_START : SIOCAUTOCONF_STOP,&ifr)) {
|
||||||
|
close(s);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
close(s);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create an OSX-native utun device (utun# where # is desiredNumber)
|
||||||
|
// Adapted from public domain utun example code by Jonathan Levin
|
||||||
|
static int _make_utun(int desiredNumber)
|
||||||
|
{
|
||||||
|
struct sockaddr_ctl sc;
|
||||||
|
struct ctl_info ctlInfo;
|
||||||
|
struct ifreq ifr;
|
||||||
|
|
||||||
|
memset(&ctlInfo, 0, sizeof(ctlInfo));
|
||||||
|
if (strlcpy(ctlInfo.ctl_name, UTUN_CONTROL_NAME, sizeof(ctlInfo.ctl_name)) >= sizeof(ctlInfo.ctl_name)) {
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
|
||||||
|
if (fd == -1)
|
||||||
|
return -1;
|
||||||
|
if (ioctl(fd, CTLIOCGINFO, &ctlInfo) == -1) {
|
||||||
|
close(fd);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
sc.sc_id = ctlInfo.ctl_id;
|
||||||
|
sc.sc_len = sizeof(sc);
|
||||||
|
sc.sc_family = AF_SYSTEM;
|
||||||
|
sc.ss_sysaddr = AF_SYS_CONTROL;
|
||||||
|
sc.sc_unit = desiredNumber + 1;
|
||||||
|
|
||||||
|
if (connect(fd, (struct sockaddr *)&sc, sizeof(sc)) == -1) {
|
||||||
|
close(fd);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
memset(&ifr,0,sizeof(ifr));
|
||||||
|
sprintf(ifr.ifr_name,"utun%d",desiredNumber);
|
||||||
|
if (ioctl(fd,SIOCGIFFLAGS,(void *)&ifr) < 0) {
|
||||||
|
printf("SIOCGIFFLAGS failed\n");
|
||||||
|
}
|
||||||
|
ifr.ifr_flags &= ~IFF_POINTOPOINT;
|
||||||
|
if (ioctl(fd,SIOCSIFFLAGS,(void *)&ifr) < 0) {
|
||||||
|
printf("clear IFF_POINTOPOINT failed\n");
|
||||||
|
}
|
||||||
|
|
||||||
|
return fd;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
static long globalTapsRunning = 0;
|
||||||
|
static Mutex globalTapCreateLock;
|
||||||
|
|
||||||
|
OSXEthernetTap::OSXEthernetTap(
|
||||||
|
const char *homePath,
|
||||||
|
const MAC &mac,
|
||||||
|
unsigned int mtu,
|
||||||
|
unsigned int metric,
|
||||||
|
uint64_t nwid,
|
||||||
|
const char *friendlyName,
|
||||||
|
void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *data,unsigned int len),
|
||||||
|
void *arg) :
|
||||||
|
_handler(handler),
|
||||||
|
_arg(arg),
|
||||||
|
_arp((Arp *)0),
|
||||||
|
_nwid(nwid),
|
||||||
|
_homePath(homePath),
|
||||||
|
_mtu(mtu),
|
||||||
|
_metric(metric),
|
||||||
|
_fd(0),
|
||||||
|
_utun(false),
|
||||||
|
_enabled(true)
|
||||||
|
{
|
||||||
|
char devpath[64],ethaddr[64],mtustr[32],metstr[32],nwids[32];
|
||||||
|
struct stat stattmp;
|
||||||
|
|
||||||
|
Utils::snprintf(nwids,sizeof(nwids),"%.16llx",nwid);
|
||||||
|
|
||||||
|
if (mtu > 2800)
|
||||||
|
throw std::runtime_error("max tap MTU is 2800");
|
||||||
|
|
||||||
|
Mutex::Lock _gl(globalTapCreateLock);
|
||||||
|
|
||||||
|
// Read remembered previous device name, if any -- we'll try to reuse
|
||||||
|
Dictionary devmap;
|
||||||
|
std::string desiredDevice;
|
||||||
|
{
|
||||||
|
std::string devmapbuf;
|
||||||
|
if (OSUtils::readFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmapbuf)) {
|
||||||
|
devmap.fromString(devmapbuf);
|
||||||
|
desiredDevice = devmap.get(nwids,"");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (::stat((_homePath + ZT_PATH_SEPARATOR_S + "tap.kext").c_str(),&stattmp) == 0) {
|
||||||
|
// Try to init kext if it's there, otherwise revert to utun mode
|
||||||
|
|
||||||
|
if (::stat("/dev/zt0",&stattmp)) {
|
||||||
|
long kextpid = (long)vfork();
|
||||||
|
if (kextpid == 0) {
|
||||||
|
::chdir(homePath);
|
||||||
|
OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
|
||||||
|
::execl("/sbin/kextload","/sbin/kextload","-q","-repository",homePath,"tap.kext",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (kextpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(kextpid,&exitcode,0);
|
||||||
|
}
|
||||||
|
::usleep(500); // give tap device driver time to start up and try again
|
||||||
|
if (::stat("/dev/zt0",&stattmp))
|
||||||
|
_utun = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!_utun) {
|
||||||
|
// See if we can re-use the last device we had.
|
||||||
|
bool recalledDevice = false;
|
||||||
|
if (desiredDevice.length() > 2) {
|
||||||
|
Utils::snprintf(devpath,sizeof(devpath),"/dev/%s",desiredDevice.c_str());
|
||||||
|
if (stat(devpath,&stattmp) == 0) {
|
||||||
|
_fd = ::open(devpath,O_RDWR);
|
||||||
|
if (_fd > 0) {
|
||||||
|
_dev = desiredDevice;
|
||||||
|
recalledDevice = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Open the first unused tap device if we didn't recall a previous one.
|
||||||
|
if (!recalledDevice) {
|
||||||
|
for(int i=0;i<64;++i) {
|
||||||
|
Utils::snprintf(devpath,sizeof(devpath),"/dev/zt%d",i);
|
||||||
|
if (stat(devpath,&stattmp)) {
|
||||||
|
_utun = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
_fd = ::open(devpath,O_RDWR);
|
||||||
|
if (_fd > 0) {
|
||||||
|
char foo[16];
|
||||||
|
Utils::snprintf(foo,sizeof(foo),"zt%d",i);
|
||||||
|
_dev = foo;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (_fd <= 0)
|
||||||
|
_utun = true;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
_utun = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_utun) {
|
||||||
|
// Use OSX built-in utun device if kext is not available or doesn't work
|
||||||
|
|
||||||
|
int utunNo = 0;
|
||||||
|
|
||||||
|
if ((desiredDevice.length() > 4)&&(desiredDevice.substr(0,4) == "utun")) {
|
||||||
|
utunNo = Utils::strToInt(desiredDevice.substr(4).c_str());
|
||||||
|
if (utunNo >= 0)
|
||||||
|
_fd = _make_utun(utunNo);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_fd <= 0) {
|
||||||
|
// Start at utun8 to leave lower utuns unused since other stuff might
|
||||||
|
// want them -- OpenVPN, cjdns, etc. I'm not sure if those are smart
|
||||||
|
// enough to scan upward like this.
|
||||||
|
for(utunNo=8;utunNo<=256;++utunNo) {
|
||||||
|
if ((_fd = _make_utun(utunNo)) > 0)
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_fd <= 0)
|
||||||
|
throw std::runtime_error("unable to find/load ZeroTier tap driver OR use built-in utun driver in OSX; permission or system problem or too many open devices?");
|
||||||
|
|
||||||
|
Utils::snprintf(devpath,sizeof(devpath),"utun%d",utunNo);
|
||||||
|
_dev = devpath;
|
||||||
|
|
||||||
|
// Configure address and bring it up
|
||||||
|
Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
|
||||||
|
Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"mtu",mtustr,"metric",metstr,"up",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
if (exitcode) {
|
||||||
|
::close(_fd);
|
||||||
|
throw std::runtime_error("ifconfig failure activating utun interface");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
// Use our ZeroTier OSX tun/tap driver for zt# Ethernet tap device
|
||||||
|
|
||||||
|
if (fcntl(_fd,F_SETFL,fcntl(_fd,F_GETFL) & ~O_NONBLOCK) == -1) {
|
||||||
|
::close(_fd);
|
||||||
|
throw std::runtime_error("unable to set flags on file descriptor for TAP device");
|
||||||
|
}
|
||||||
|
|
||||||
|
// Configure MAC address and MTU, bring interface up
|
||||||
|
Utils::snprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
|
||||||
|
Utils::snprintf(mtustr,sizeof(mtustr),"%u",_mtu);
|
||||||
|
Utils::snprintf(metstr,sizeof(metstr),"%u",_metric);
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
if (exitcode) {
|
||||||
|
::close(_fd);
|
||||||
|
throw std::runtime_error("ifconfig failure setting link-layer address and activating tap interface");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_setIpv6Stuff(_dev.c_str(),true,false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set close-on-exec so that devices cannot persist if we fork/exec for update
|
||||||
|
fcntl(_fd,F_SETFD,fcntl(_fd,F_GETFD) | FD_CLOEXEC);
|
||||||
|
|
||||||
|
::pipe(_shutdownSignalPipe);
|
||||||
|
|
||||||
|
++globalTapsRunning;
|
||||||
|
|
||||||
|
devmap[nwids] = _dev;
|
||||||
|
OSUtils::writeFile((_homePath + ZT_PATH_SEPARATOR_S + "devicemap").c_str(),devmap.toString());
|
||||||
|
|
||||||
|
_thread = Thread::start(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
OSXEthernetTap::~OSXEthernetTap()
|
||||||
|
{
|
||||||
|
Mutex::Lock _gl(globalTapCreateLock);
|
||||||
|
|
||||||
|
::write(_shutdownSignalPipe[1],(const void *)this,1); // writing a byte causes thread to exit
|
||||||
|
Thread::join(_thread);
|
||||||
|
|
||||||
|
::close(_fd);
|
||||||
|
::close(_shutdownSignalPipe[0]);
|
||||||
|
::close(_shutdownSignalPipe[1]);
|
||||||
|
|
||||||
|
if (_utun) {
|
||||||
|
delete _arp;
|
||||||
|
} else {
|
||||||
|
if (--globalTapsRunning <= 0) {
|
||||||
|
globalTapsRunning = 0; // sanity check -- should not be possible
|
||||||
|
|
||||||
|
char tmp[16384];
|
||||||
|
sprintf(tmp,"%s/%s",_homePath.c_str(),"tap.kext");
|
||||||
|
long kextpid = (long)vfork();
|
||||||
|
if (kextpid == 0) {
|
||||||
|
OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
|
||||||
|
::execl("/sbin/kextunload","/sbin/kextunload",tmp,(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (kextpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(kextpid,&exitcode,0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::setEnabled(bool en)
|
||||||
|
{
|
||||||
|
_enabled = en;
|
||||||
|
// TODO: interface status change
|
||||||
|
}
|
||||||
|
|
||||||
|
bool OSXEthernetTap::enabled() const
|
||||||
|
{
|
||||||
|
return _enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool ___removeIp(const std::string &_dev,const InetAddress &ip)
|
||||||
|
{
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet",ip.toIpString().c_str(),"-alias",(const char *)0);
|
||||||
|
_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
waitpid(cpid,&exitcode,0);
|
||||||
|
return (exitcode == 0);
|
||||||
|
}
|
||||||
|
return false; // never reached, make compiler shut up about return value
|
||||||
|
}
|
||||||
|
|
||||||
|
bool OSXEthernetTap::addIp(const InetAddress &ip)
|
||||||
|
{
|
||||||
|
if (!ip)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
std::vector<InetAddress> allIps(ips());
|
||||||
|
if (std::binary_search(allIps.begin(),allIps.end(),ip))
|
||||||
|
return true;
|
||||||
|
|
||||||
|
// Remove and reconfigure if address is the same but netmask is different
|
||||||
|
for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
|
||||||
|
if ((i->ipsEqual(ip))&&(i->netmaskBits() != ip.netmaskBits())) {
|
||||||
|
if (___removeIp(_dev,*i))
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_utun) {
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
if (ip.ss_family == AF_INET6) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"inet6",ip.toString().c_str(),"alias",(const char *)0);
|
||||||
|
} else {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.toString().c_str(),ip.toIpString().c_str(),"alias",(const char *)0);
|
||||||
|
}
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
|
||||||
|
if (exitcode == 0) {
|
||||||
|
if (ip.ss_family == AF_INET) {
|
||||||
|
// Add route to network over tun for IPv4 -- otherwise it behaves
|
||||||
|
// as a simple point to point tunnel instead of a true route.
|
||||||
|
cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::close(STDERR_FILENO);
|
||||||
|
::close(STDOUT_FILENO);
|
||||||
|
::execl("/sbin/route","/sbin/route","add",ip.network().toString().c_str(),ip.toIpString().c_str(),(const char *)0);
|
||||||
|
::exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
return (exitcode == 0);
|
||||||
|
}
|
||||||
|
} else return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
long cpid = (long)vfork();
|
||||||
|
if (cpid == 0) {
|
||||||
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),ip.isV4() ? "inet" : "inet6",ip.toString().c_str(),"alias",(const char *)0);
|
||||||
|
::_exit(-1);
|
||||||
|
} else if (cpid > 0) {
|
||||||
|
int exitcode = -1;
|
||||||
|
::waitpid(cpid,&exitcode,0);
|
||||||
|
return (exitcode == 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool OSXEthernetTap::removeIp(const InetAddress &ip)
|
||||||
|
{
|
||||||
|
if (!ip)
|
||||||
|
return true;
|
||||||
|
std::vector<InetAddress> allIps(ips());
|
||||||
|
if (!std::binary_search(allIps.begin(),allIps.end(),ip)) {
|
||||||
|
if (___removeIp(_dev,ip))
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<InetAddress> OSXEthernetTap::ips() const
|
||||||
|
{
|
||||||
|
struct ifaddrs *ifa = (struct ifaddrs *)0;
|
||||||
|
if (getifaddrs(&ifa))
|
||||||
|
return std::vector<InetAddress>();
|
||||||
|
|
||||||
|
std::vector<InetAddress> r;
|
||||||
|
|
||||||
|
struct ifaddrs *p = ifa;
|
||||||
|
while (p) {
|
||||||
|
if ((!strcmp(p->ifa_name,_dev.c_str()))&&(p->ifa_addr)&&(p->ifa_netmask)&&(p->ifa_addr->sa_family == p->ifa_netmask->sa_family)) {
|
||||||
|
switch(p->ifa_addr->sa_family) {
|
||||||
|
case AF_INET: {
|
||||||
|
struct sockaddr_in *sin = (struct sockaddr_in *)p->ifa_addr;
|
||||||
|
struct sockaddr_in *nm = (struct sockaddr_in *)p->ifa_netmask;
|
||||||
|
r.push_back(InetAddress(&(sin->sin_addr.s_addr),4,Utils::countBits((uint32_t)nm->sin_addr.s_addr)));
|
||||||
|
} break;
|
||||||
|
case AF_INET6: {
|
||||||
|
struct sockaddr_in6 *sin = (struct sockaddr_in6 *)p->ifa_addr;
|
||||||
|
struct sockaddr_in6 *nm = (struct sockaddr_in6 *)p->ifa_netmask;
|
||||||
|
uint32_t b[4];
|
||||||
|
memcpy(b,nm->sin6_addr.s6_addr,sizeof(b));
|
||||||
|
r.push_back(InetAddress(sin->sin6_addr.s6_addr,16,Utils::countBits(b[0]) + Utils::countBits(b[1]) + Utils::countBits(b[2]) + Utils::countBits(b[3])));
|
||||||
|
} break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
p = p->ifa_next;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ifa)
|
||||||
|
freeifaddrs(ifa);
|
||||||
|
|
||||||
|
std::sort(r.begin(),r.end());
|
||||||
|
std::unique(r.begin(),r.end());
|
||||||
|
|
||||||
|
return r;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len)
|
||||||
|
{
|
||||||
|
char putBuf[4096];
|
||||||
|
if ((_fd > 0)&&(len <= _mtu)&&(_enabled)) {
|
||||||
|
to.copyTo(putBuf,6);
|
||||||
|
from.copyTo(putBuf + 6,6);
|
||||||
|
*((uint16_t *)(putBuf + 12)) = htons((uint16_t)etherType);
|
||||||
|
memcpy(putBuf + 14,data,len);
|
||||||
|
len += 14;
|
||||||
|
::write(_fd,putBuf,len);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string OSXEthernetTap::deviceName() const
|
||||||
|
{
|
||||||
|
return _dev;
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::setFriendlyName(const char *friendlyName)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed)
|
||||||
|
{
|
||||||
|
std::vector<MulticastGroup> newGroups;
|
||||||
|
|
||||||
|
struct _intl_ifmaddrs *ifmap = (struct _intl_ifmaddrs *)0;
|
||||||
|
if (!_intl_getifmaddrs(&ifmap)) {
|
||||||
|
struct _intl_ifmaddrs *p = ifmap;
|
||||||
|
while (p) {
|
||||||
|
if (p->ifma_addr->sa_family == AF_LINK) {
|
||||||
|
struct sockaddr_dl *in = (struct sockaddr_dl *)p->ifma_name;
|
||||||
|
struct sockaddr_dl *la = (struct sockaddr_dl *)p->ifma_addr;
|
||||||
|
if ((la->sdl_alen == 6)&&(in->sdl_nlen <= _dev.length())&&(!memcmp(_dev.data(),in->sdl_data,in->sdl_nlen)))
|
||||||
|
newGroups.push_back(MulticastGroup(MAC(la->sdl_data + la->sdl_nlen,6),0));
|
||||||
|
}
|
||||||
|
p = p->ifma_next;
|
||||||
|
}
|
||||||
|
_intl_freeifmaddrs(ifmap);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<InetAddress> allIps(ips());
|
||||||
|
for(std::vector<InetAddress>::iterator ip(allIps.begin());ip!=allIps.end();++ip)
|
||||||
|
newGroups.push_back(MulticastGroup::deriveMulticastGroupForAddressResolution(*ip));
|
||||||
|
|
||||||
|
std::sort(newGroups.begin(),newGroups.end());
|
||||||
|
std::unique(newGroups.begin(),newGroups.end());
|
||||||
|
|
||||||
|
for(std::vector<MulticastGroup>::iterator m(newGroups.begin());m!=newGroups.end();++m) {
|
||||||
|
if (!std::binary_search(_multicastGroups.begin(),_multicastGroups.end(),*m))
|
||||||
|
added.push_back(*m);
|
||||||
|
}
|
||||||
|
for(std::vector<MulticastGroup>::iterator m(_multicastGroups.begin());m!=_multicastGroups.end();++m) {
|
||||||
|
if (!std::binary_search(newGroups.begin(),newGroups.end(),*m))
|
||||||
|
removed.push_back(*m);
|
||||||
|
}
|
||||||
|
|
||||||
|
_multicastGroups.swap(newGroups);
|
||||||
|
}
|
||||||
|
|
||||||
|
void OSXEthernetTap::threadMain()
|
||||||
|
throw()
|
||||||
|
{
|
||||||
|
fd_set readfds,nullfds;
|
||||||
|
MAC to,from;
|
||||||
|
int n,nfds,r;
|
||||||
|
char getBuf[8194];
|
||||||
|
|
||||||
|
Thread::sleep(500);
|
||||||
|
|
||||||
|
FD_ZERO(&readfds);
|
||||||
|
FD_ZERO(&nullfds);
|
||||||
|
nfds = (int)std::max(_shutdownSignalPipe[0],_fd) + 1;
|
||||||
|
|
||||||
|
r = 0;
|
||||||
|
for(;;) {
|
||||||
|
FD_SET(_shutdownSignalPipe[0],&readfds);
|
||||||
|
FD_SET(_fd,&readfds);
|
||||||
|
select(nfds,&readfds,&nullfds,&nullfds,(struct timeval *)0);
|
||||||
|
|
||||||
|
if (FD_ISSET(_shutdownSignalPipe[0],&readfds)) // writes to shutdown pipe terminate thread
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (FD_ISSET(_fd,&readfds)) {
|
||||||
|
n = (int)::read(_fd,getBuf + r,sizeof(getBuf) - r);
|
||||||
|
if (n < 0) {
|
||||||
|
if ((errno != EINTR)&&(errno != ETIMEDOUT))
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
// Some tap drivers like to send the ethernet frame and the
|
||||||
|
// payload in two chunks, so handle that by accumulating
|
||||||
|
// data until we have at least a frame.
|
||||||
|
r += n;
|
||||||
|
if (r > 14) {
|
||||||
|
if (r > ((int)_mtu + 14)) // sanity check for weird TAP behavior on some platforms
|
||||||
|
r = _mtu + 14;
|
||||||
|
|
||||||
|
if (_enabled) {
|
||||||
|
to.setTo(getBuf,6);
|
||||||
|
from.setTo(getBuf + 6,6);
|
||||||
|
unsigned int etherType = ntohs(((const uint16_t *)getBuf)[6]);
|
||||||
|
// TODO: VLAN support
|
||||||
|
_handler(_arg,_nwid,from,to,etherType,0,(const void *)(getBuf + 14),r - 14);
|
||||||
|
}
|
||||||
|
|
||||||
|
r = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ZeroTier
|
96
attic/OSXEthernetTap.hpp.pcap-with-bridge-test
Normal file
96
attic/OSXEthernetTap.hpp.pcap-with-bridge-test
Normal file
|
@ -0,0 +1,96 @@
|
||||||
|
/*
|
||||||
|
* ZeroTier One - Network Virtualization Everywhere
|
||||||
|
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* --
|
||||||
|
*
|
||||||
|
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||||
|
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
*
|
||||||
|
* If you would like to embed ZeroTier into a commercial application or
|
||||||
|
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||||
|
* LLC. Start here: http://www.zerotier.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ZT_OSXETHERNETTAP_HPP
|
||||||
|
#define ZT_OSXETHERNETTAP_HPP
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "../node/Constants.hpp"
|
||||||
|
#include "../node/MAC.hpp"
|
||||||
|
#include "../node/InetAddress.hpp"
|
||||||
|
#include "../node/MulticastGroup.hpp"
|
||||||
|
|
||||||
|
#include "Thread.hpp"
|
||||||
|
|
||||||
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OSX Ethernet tap using ZeroTier kernel extension zt# devices
|
||||||
|
*/
|
||||||
|
class OSXEthernetTap
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
OSXEthernetTap(
|
||||||
|
const char *homePath,
|
||||||
|
const MAC &mac,
|
||||||
|
unsigned int mtu,
|
||||||
|
unsigned int metric,
|
||||||
|
uint64_t nwid,
|
||||||
|
const char *friendlyName,
|
||||||
|
void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
|
||||||
|
void *arg);
|
||||||
|
|
||||||
|
~OSXEthernetTap();
|
||||||
|
|
||||||
|
inline void setEnabled(bool en) { _enabled = en; }
|
||||||
|
inline bool enabled() const { return _enabled; }
|
||||||
|
bool addIp(const InetAddress &ip);
|
||||||
|
bool removeIp(const InetAddress &ip);
|
||||||
|
std::vector<InetAddress> ips() const;
|
||||||
|
void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
|
||||||
|
std::string deviceName() const;
|
||||||
|
void setFriendlyName(const char *friendlyName);
|
||||||
|
void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
|
||||||
|
|
||||||
|
void threadMain()
|
||||||
|
throw();
|
||||||
|
|
||||||
|
// Private members of OSXEthernetTap have public visibility to be accessable
|
||||||
|
// from an internal bounce function; don't modify directly.
|
||||||
|
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
|
||||||
|
void *_arg;
|
||||||
|
void *_pcap; // pcap_t *
|
||||||
|
uint64_t _nwid;
|
||||||
|
MAC _mac;
|
||||||
|
Thread _thread;
|
||||||
|
std::string _homePath;
|
||||||
|
std::string _dev;
|
||||||
|
std::vector<MulticastGroup> _multicastGroups;
|
||||||
|
unsigned int _mtu;
|
||||||
|
unsigned int _metric;
|
||||||
|
volatile bool _enabled;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace ZeroTier
|
||||||
|
|
||||||
|
#endif
|
101
attic/OSXEthernetTap.hpp.utun-work-in-progress
Normal file
101
attic/OSXEthernetTap.hpp.utun-work-in-progress
Normal file
|
@ -0,0 +1,101 @@
|
||||||
|
/*
|
||||||
|
* ZeroTier One - Network Virtualization Everywhere
|
||||||
|
* Copyright (C) 2011-2015 ZeroTier, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
*
|
||||||
|
* --
|
||||||
|
*
|
||||||
|
* ZeroTier may be used and distributed under the terms of the GPLv3, which
|
||||||
|
* are available at: http://www.gnu.org/licenses/gpl-3.0.html
|
||||||
|
*
|
||||||
|
* If you would like to embed ZeroTier into a commercial application or
|
||||||
|
* redistribute it in a modified binary form, please contact ZeroTier Networks
|
||||||
|
* LLC. Start here: http://www.zerotier.com/
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ZT_OSXETHERNETTAP_HPP
|
||||||
|
#define ZT_OSXETHERNETTAP_HPP
|
||||||
|
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include <stdexcept>
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "../node/Constants.hpp"
|
||||||
|
#include "../node/MAC.hpp"
|
||||||
|
#include "../node/InetAddress.hpp"
|
||||||
|
#include "../node/MulticastGroup.hpp"
|
||||||
|
|
||||||
|
#include "Thread.hpp"
|
||||||
|
|
||||||
|
namespace ZeroTier {
|
||||||
|
|
||||||
|
class Arp;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* OSX Ethernet tap supporting either ZeroTier tun/tap kext or OSX-native utun
|
||||||
|
*/
|
||||||
|
class OSXEthernetTap
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
OSXEthernetTap(
|
||||||
|
const char *homePath,
|
||||||
|
const MAC &mac,
|
||||||
|
unsigned int mtu,
|
||||||
|
unsigned int metric,
|
||||||
|
uint64_t nwid,
|
||||||
|
const char *friendlyName,
|
||||||
|
void (*handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int),
|
||||||
|
void *arg);
|
||||||
|
|
||||||
|
~OSXEthernetTap();
|
||||||
|
|
||||||
|
void setEnabled(bool en);
|
||||||
|
bool enabled() const;
|
||||||
|
bool addIp(const InetAddress &ip);
|
||||||
|
bool removeIp(const InetAddress &ip);
|
||||||
|
std::vector<InetAddress> ips() const;
|
||||||
|
void put(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len);
|
||||||
|
std::string deviceName() const;
|
||||||
|
void setFriendlyName(const char *friendlyName);
|
||||||
|
void scanMulticastGroups(std::vector<MulticastGroup> &added,std::vector<MulticastGroup> &removed);
|
||||||
|
|
||||||
|
inline bool isNativeUtun() const { return _utun; }
|
||||||
|
|
||||||
|
void threadMain()
|
||||||
|
throw();
|
||||||
|
|
||||||
|
private:
|
||||||
|
void (*_handler)(void *,uint64_t,const MAC &,const MAC &,unsigned int,unsigned int,const void *,unsigned int);
|
||||||
|
void *_arg;
|
||||||
|
Arp *_arp; // created and used if utun is enabled
|
||||||
|
uint64_t _nwid;
|
||||||
|
Thread _thread;
|
||||||
|
std::string _homePath;
|
||||||
|
std::string _dev;
|
||||||
|
std::vector<MulticastGroup> _multicastGroups;
|
||||||
|
unsigned int _mtu;
|
||||||
|
unsigned int _metric;
|
||||||
|
int _fd;
|
||||||
|
int _shutdownSignalPipe[2];
|
||||||
|
bool _utun;
|
||||||
|
volatile bool _enabled;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace ZeroTier
|
||||||
|
|
||||||
|
#endif
|
4
attic/README.md
Normal file
4
attic/README.md
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
Retired Code and Miscellaneous Junk
|
||||||
|
======
|
||||||
|
|
||||||
|
This directory is for old code that isn't used but we don't want to lose track of, and for anything else random like debug scripts.
|
|
@ -1,459 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Net;
|
|
||||||
using System.IO;
|
|
||||||
using System.Windows;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Windows.Threading;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
public class APIHandler
|
|
||||||
{
|
|
||||||
private string authtoken;
|
|
||||||
|
|
||||||
private string url = null;
|
|
||||||
|
|
||||||
private static volatile APIHandler instance;
|
|
||||||
private static object syncRoot = new Object();
|
|
||||||
|
|
||||||
public delegate void NetworkListCallback(List<ZeroTierNetwork> networks);
|
|
||||||
public delegate void StatusCallback(ZeroTierStatus status);
|
|
||||||
|
|
||||||
private string ZeroTierAddress = "";
|
|
||||||
|
|
||||||
public static APIHandler Instance
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
lock (syncRoot)
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
if (!initHandler())
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static bool initHandler(bool resetToken = false)
|
|
||||||
{
|
|
||||||
String localZtDir = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\ZeroTier\\One";
|
|
||||||
String globalZtDir = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\ZeroTier\\One";
|
|
||||||
|
|
||||||
String authToken = "";
|
|
||||||
Int32 port = 9993;
|
|
||||||
|
|
||||||
if (resetToken)
|
|
||||||
{
|
|
||||||
instance = null;
|
|
||||||
if (File.Exists(localZtDir + "\\authtoken.secret"))
|
|
||||||
{
|
|
||||||
File.Delete(localZtDir + "\\authtoken.secret");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (File.Exists(localZtDir + "\\zerotier-one.port"))
|
|
||||||
{
|
|
||||||
File.Delete(localZtDir + "\\zerotier-one.port");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!File.Exists(localZtDir + "\\authtoken.secret") || !File.Exists(localZtDir + "\\zerotier-one.port"))
|
|
||||||
{
|
|
||||||
// launch external process to copy file into place
|
|
||||||
String curPath = System.Reflection.Assembly.GetEntryAssembly().Location;
|
|
||||||
int index = curPath.LastIndexOf("\\");
|
|
||||||
curPath = curPath.Substring(0, index);
|
|
||||||
ProcessStartInfo startInfo = new ProcessStartInfo(curPath + "\\copyutil.exe", "\"" + globalZtDir + "\"" + " " + "\"" + localZtDir + "\"");
|
|
||||||
startInfo.Verb = "runas";
|
|
||||||
|
|
||||||
|
|
||||||
var process = Process.Start(startInfo);
|
|
||||||
process.WaitForExit();
|
|
||||||
}
|
|
||||||
|
|
||||||
authToken = readAuthToken(localZtDir + "\\authtoken.secret");
|
|
||||||
|
|
||||||
if ((authToken == null) || (authToken.Length <= 0))
|
|
||||||
{
|
|
||||||
MessageBox.Show("Unable to read ZeroTier One authtoken", "ZeroTier One");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
port = readPort(localZtDir + "\\zerotier-one.port");
|
|
||||||
instance = new APIHandler(port, authToken);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static String readAuthToken(String path)
|
|
||||||
{
|
|
||||||
String authToken = "";
|
|
||||||
|
|
||||||
if (File.Exists(path))
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
byte[] tmp = File.ReadAllBytes(path);
|
|
||||||
authToken = System.Text.Encoding.UTF8.GetString(tmp).Trim();
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
MessageBox.Show("Unable to read ZeroTier One Auth Token from:\r\n" + path, "ZeroTier One");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return authToken;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Int32 readPort(String path)
|
|
||||||
{
|
|
||||||
Int32 port = 9993;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
byte[] tmp = File.ReadAllBytes(path);
|
|
||||||
port = Int32.Parse(System.Text.Encoding.ASCII.GetString(tmp).Trim());
|
|
||||||
if ((port <= 0) || (port > 65535))
|
|
||||||
port = 9993;
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
return port;
|
|
||||||
}
|
|
||||||
|
|
||||||
private APIHandler()
|
|
||||||
{
|
|
||||||
url = "http://127.0.0.1:9993";
|
|
||||||
}
|
|
||||||
|
|
||||||
public APIHandler(int port, string authtoken)
|
|
||||||
{
|
|
||||||
url = "http://127.0.0.1:" + port;
|
|
||||||
this.authtoken = authtoken;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void GetStatus(StatusCallback cb)
|
|
||||||
{
|
|
||||||
var request = WebRequest.Create(url + "/status" + "?auth=" + authtoken) as HttpWebRequest;
|
|
||||||
if (request != null)
|
|
||||||
{
|
|
||||||
request.Method = "GET";
|
|
||||||
request.ContentType = "application/json";
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var httpResponse = (HttpWebResponse)request.GetResponse();
|
|
||||||
if (httpResponse.StatusCode == HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
|
|
||||||
{
|
|
||||||
var responseText = streamReader.ReadToEnd();
|
|
||||||
|
|
||||||
ZeroTierStatus status = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
status = JsonConvert.DeserializeObject<ZeroTierStatus>(responseText);
|
|
||||||
|
|
||||||
if (ZeroTierAddress != status.Address)
|
|
||||||
{
|
|
||||||
ZeroTierAddress = status.Address;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (JsonReaderException e)
|
|
||||||
{
|
|
||||||
Console.WriteLine(e.ToString());
|
|
||||||
}
|
|
||||||
cb(status);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (httpResponse.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Net.Sockets.SocketException)
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
catch (System.Net.WebException e)
|
|
||||||
{
|
|
||||||
HttpWebResponse res = (HttpWebResponse)e.Response;
|
|
||||||
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void GetNetworks(NetworkListCallback cb)
|
|
||||||
{
|
|
||||||
var request = WebRequest.Create(url + "/network" + "?auth=" + authtoken) as HttpWebRequest;
|
|
||||||
if (request == null)
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
request.Method = "GET";
|
|
||||||
request.ContentType = "application/json";
|
|
||||||
request.Timeout = 10000;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var httpResponse = (HttpWebResponse)request.GetResponse();
|
|
||||||
|
|
||||||
if (httpResponse.StatusCode == HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
|
|
||||||
{
|
|
||||||
var responseText = streamReader.ReadToEnd();
|
|
||||||
|
|
||||||
List<ZeroTierNetwork> networkList = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
networkList = JsonConvert.DeserializeObject<List<ZeroTierNetwork>>(responseText);
|
|
||||||
foreach (ZeroTierNetwork n in networkList)
|
|
||||||
{
|
|
||||||
// all networks received via JSON are connected by definition
|
|
||||||
n.IsConnected = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (JsonReaderException e)
|
|
||||||
{
|
|
||||||
Console.WriteLine(e.ToString());
|
|
||||||
}
|
|
||||||
cb(networkList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (httpResponse.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Net.Sockets.SocketException)
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
catch (System.Net.WebException e)
|
|
||||||
{
|
|
||||||
HttpWebResponse res = (HttpWebResponse)e.Response;
|
|
||||||
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void JoinNetwork(Dispatcher d, string nwid, bool allowManaged = true, bool allowGlobal = false, bool allowDefault = false, bool allowDNS = false)
|
|
||||||
{
|
|
||||||
Task.Factory.StartNew(() =>
|
|
||||||
{
|
|
||||||
var request = WebRequest.Create(url + "/network/" + nwid + "?auth=" + authtoken) as HttpWebRequest;
|
|
||||||
if (request == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
request.Method = "POST";
|
|
||||||
request.ContentType = "applicaiton/json";
|
|
||||||
request.Timeout = 30000;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
using (var streamWriter = new StreamWriter(((HttpWebRequest)request).GetRequestStream()))
|
|
||||||
{
|
|
||||||
string json = "{\"allowManaged\":" + (allowManaged ? "true" : "false") + "," +
|
|
||||||
"\"allowGlobal\":" + (allowGlobal ? "true" : "false") + "," +
|
|
||||||
"\"allowDefault\":" + (allowDefault ? "true" : "false") + "," +
|
|
||||||
"\"allowDNS\":" + (allowDNS ? "true" : "false") + "}";
|
|
||||||
streamWriter.Write(json);
|
|
||||||
streamWriter.Flush();
|
|
||||||
streamWriter.Close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Net.WebException)
|
|
||||||
{
|
|
||||||
d.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
MessageBox.Show("Error Joining Network: Cannot connect to ZeroTier service.");
|
|
||||||
}));
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var httpResponse = (HttpWebResponse)request.GetResponse();
|
|
||||||
|
|
||||||
if (httpResponse.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
else if (httpResponse.StatusCode != HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Error sending join network message");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Net.Sockets.SocketException)
|
|
||||||
{
|
|
||||||
d.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
MessageBox.Show("Error Joining Network: Cannot connect to ZeroTier service.");
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
catch (System.Net.WebException e)
|
|
||||||
{
|
|
||||||
HttpWebResponse res = (HttpWebResponse)e.Response;
|
|
||||||
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
d.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
MessageBox.Show("Error Joining Network: Cannot connect to ZeroTier service.");
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void LeaveNetwork(Dispatcher d, string nwid)
|
|
||||||
{
|
|
||||||
Task.Factory.StartNew(() =>
|
|
||||||
{
|
|
||||||
var request = WebRequest.Create(url + "/network/" + nwid + "?auth=" + authtoken) as HttpWebRequest;
|
|
||||||
if (request == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
request.Method = "DELETE";
|
|
||||||
request.Timeout = 30000;
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var httpResponse = (HttpWebResponse)request.GetResponse();
|
|
||||||
|
|
||||||
if (httpResponse.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
else if (httpResponse.StatusCode != HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Error sending leave network message");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Net.Sockets.SocketException)
|
|
||||||
{
|
|
||||||
d.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
MessageBox.Show("Error Leaving Network: Cannot connect to ZeroTier service.");
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
catch (System.Net.WebException e)
|
|
||||||
{
|
|
||||||
HttpWebResponse res = (HttpWebResponse)e.Response;
|
|
||||||
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
d.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
MessageBox.Show("Error Leaving Network: Cannot connect to ZeroTier service.");
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
Console.WriteLine("Error leaving network: Unknown error");
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public delegate void PeersCallback(List<ZeroTierPeer> peers);
|
|
||||||
|
|
||||||
public void GetPeers(PeersCallback cb)
|
|
||||||
{
|
|
||||||
var request = WebRequest.Create(url + "/peer" + "?auth=" + authtoken) as HttpWebRequest;
|
|
||||||
if (request == null)
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
request.Method = "GET";
|
|
||||||
request.ContentType = "application/json";
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var httpResponse = (HttpWebResponse)request.GetResponse();
|
|
||||||
if (httpResponse.StatusCode == HttpStatusCode.OK)
|
|
||||||
{
|
|
||||||
using (var streamReader = new StreamReader(httpResponse.GetResponseStream()))
|
|
||||||
{
|
|
||||||
var responseText = streamReader.ReadToEnd();
|
|
||||||
//Console.WriteLine(responseText);
|
|
||||||
List<ZeroTierPeer> peerList = null;
|
|
||||||
try
|
|
||||||
{
|
|
||||||
peerList = JsonConvert.DeserializeObject<List<ZeroTierPeer>>(responseText);
|
|
||||||
}
|
|
||||||
catch (JsonReaderException e)
|
|
||||||
{
|
|
||||||
Console.WriteLine(e.ToString());
|
|
||||||
}
|
|
||||||
cb(peerList);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (httpResponse.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (System.Net.Sockets.SocketException)
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
catch (System.Net.WebException e)
|
|
||||||
{
|
|
||||||
HttpWebResponse res = (HttpWebResponse)e.Response;
|
|
||||||
if (res != null && res.StatusCode == HttpStatusCode.Unauthorized)
|
|
||||||
{
|
|
||||||
APIHandler.initHandler(true);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
cb(null);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public string NodeAddress()
|
|
||||||
{
|
|
||||||
return ZeroTierAddress;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
<Window x:Class="WinUI.AboutView"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:local="clr-namespace:WinUI"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Title="AboutView" Height="368.267" Width="300" Icon="ZeroTierIcon.ico">
|
|
||||||
<Grid>
|
|
||||||
<Image x:Name="image" HorizontalAlignment="Center" Height="100" Margin="0,10,0,0" VerticalAlignment="Top" Width="100" Source="ZeroTierIcon.ico"/>
|
|
||||||
<RichTextBox x:Name="richTextBox" HorizontalAlignment="Left" Height="209" Margin="10,123,0,0" VerticalAlignment="Top" Width="275" IsReadOnly="True" IsDocumentEnabled="True" BorderThickness="0" FontSize="18" RenderTransformOrigin="0.506,0.63">
|
|
||||||
<RichTextBox.Resources>
|
|
||||||
<Style TargetType="Hyperlink">
|
|
||||||
<Setter Property="Cursor" Value="Hand" />
|
|
||||||
</Style>
|
|
||||||
</RichTextBox.Resources>
|
|
||||||
<FlowDocument>
|
|
||||||
<Paragraph TextAlignment="Center">
|
|
||||||
<Run Text="ZeroTier One"/>
|
|
||||||
</Paragraph>
|
|
||||||
<Paragraph TextAlignment="Center">
|
|
||||||
<Run FontSize="14" Text="Version 1.6.6"/>
|
|
||||||
<LineBreak/>
|
|
||||||
<Run FontSize="14" Text="(c) 2011-2021 ZeroTier, Inc."/>
|
|
||||||
<LineBreak/>
|
|
||||||
<Run FontSize="14" Text="www.zerotier.com"/>
|
|
||||||
</Paragraph>
|
|
||||||
<Paragraph TextAlignment="Center">
|
|
||||||
<Run FontSize="14" Text="ZeroTier One allows your computer to join virtual networks. Just select "join" and enter a network's 16-digit ID. Each network appears on your computer as a new network port."/>
|
|
||||||
</Paragraph>
|
|
||||||
</FlowDocument>
|
|
||||||
</RichTextBox>
|
|
||||||
|
|
||||||
</Grid>
|
|
||||||
</Window>
|
|
|
@ -1,35 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for AboutView.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class AboutView : Window
|
|
||||||
{
|
|
||||||
public AboutView()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void Hyperlink_MouseLeftButtonDown(object sender, RequestNavigateEventArgs e)
|
|
||||||
{
|
|
||||||
var hyperlink = (Hyperlink)sender;
|
|
||||||
Process.Start(hyperlink.NavigateUri.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,256 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class CentralAPI
|
|
||||||
{
|
|
||||||
private static volatile CentralAPI instance;
|
|
||||||
private static object syncRoot = new Object();
|
|
||||||
|
|
||||||
private CookieContainer cookieContainer;
|
|
||||||
private HttpClientHandler clientHandler;
|
|
||||||
private HttpClient client;
|
|
||||||
|
|
||||||
private CentralServer server;
|
|
||||||
public CentralServer Central
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return this.server;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
this.server = value;
|
|
||||||
WriteCentralConfig();
|
|
||||||
UpdateRequestHeaders();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static CentralAPI Instance
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
lock (syncRoot)
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
instance = new CentralAPI();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private CentralAPI()
|
|
||||||
{
|
|
||||||
#if DEBUG
|
|
||||||
ServicePointManager.ServerCertificateValidationCallback += (sender, cert, chain, sslPolicyErrors) => true;
|
|
||||||
#endif
|
|
||||||
cookieContainer = new CookieContainer();
|
|
||||||
clientHandler = new HttpClientHandler
|
|
||||||
{
|
|
||||||
AllowAutoRedirect = true,
|
|
||||||
UseCookies = true,
|
|
||||||
CookieContainer = cookieContainer
|
|
||||||
};
|
|
||||||
|
|
||||||
client = new HttpClient(clientHandler);
|
|
||||||
|
|
||||||
string centralConfigPath = CentralConfigFile();
|
|
||||||
if (File.Exists(centralConfigPath))
|
|
||||||
{
|
|
||||||
byte[] tmp = File.ReadAllBytes(centralConfigPath);
|
|
||||||
string json = Encoding.UTF8.GetString(tmp).Trim();
|
|
||||||
CentralServer ctmp = JsonConvert.DeserializeObject<CentralServer>(json);
|
|
||||||
if (ctmp != null)
|
|
||||||
{
|
|
||||||
Central = ctmp;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Central = new CentralServer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Central = new CentralServer();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool HasAccessToken()
|
|
||||||
{
|
|
||||||
if (Central == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return !string.IsNullOrEmpty(Central.APIKey);
|
|
||||||
}
|
|
||||||
|
|
||||||
private string ZeroTierDir()
|
|
||||||
{
|
|
||||||
return Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\ZeroTier\\One";
|
|
||||||
}
|
|
||||||
|
|
||||||
private string CentralConfigFile()
|
|
||||||
{
|
|
||||||
return ZeroTierDir() + "\\central.conf";
|
|
||||||
}
|
|
||||||
|
|
||||||
public void WriteCentralConfig()
|
|
||||||
{
|
|
||||||
string json = JsonConvert.SerializeObject(Central);
|
|
||||||
byte[] tmp = Encoding.UTF8.GetBytes(json);
|
|
||||||
if (tmp != null)
|
|
||||||
{
|
|
||||||
File.WriteAllBytes(CentralConfigFile(), tmp);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UpdateRequestHeaders()
|
|
||||||
{
|
|
||||||
if (client.DefaultRequestHeaders.Contains("Authorization"))
|
|
||||||
{
|
|
||||||
client.DefaultRequestHeaders.Remove("Authorization");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(Central.APIKey))
|
|
||||||
{
|
|
||||||
client.DefaultRequestHeaders.Add("Authorization", "bearer " + Central.APIKey);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> Login(string email, string password, bool isNewUser)
|
|
||||||
{
|
|
||||||
string postURL = Central.ServerURL + "/api/_auth/local";
|
|
||||||
CentralLogin login = new CentralLogin(email, password, isNewUser);
|
|
||||||
var content = new StringContent(JsonConvert.SerializeObject(login), Encoding.UTF8, "application/json");
|
|
||||||
HttpResponseMessage response = await client.PostAsync(postURL, content);
|
|
||||||
|
|
||||||
if (!response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
string resContent = await response.Content.ReadAsStringAsync();
|
|
||||||
|
|
||||||
CentralUser user = JsonConvert.DeserializeObject<CentralUser>(resContent);
|
|
||||||
|
|
||||||
if (user.Tokens.Count == 0)
|
|
||||||
{
|
|
||||||
// create token
|
|
||||||
user = await CreateAuthToken(user);
|
|
||||||
}
|
|
||||||
|
|
||||||
Central.APIKey = user.Tokens[0];
|
|
||||||
|
|
||||||
UpdateRequestHeaders();
|
|
||||||
WriteCentralConfig();
|
|
||||||
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<CentralUser> CreateAuthToken(CentralUser user)
|
|
||||||
{
|
|
||||||
string randomTokenURL = Central.ServerURL + "/api/randomToken";
|
|
||||||
HttpResponseMessage response = await client.GetAsync(randomTokenURL);
|
|
||||||
|
|
||||||
if (!response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
// TODO: throw an error
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
string resContent = await response.Content.ReadAsStringAsync();
|
|
||||||
|
|
||||||
CentralToken t = JsonConvert.DeserializeObject<CentralToken>(resContent);
|
|
||||||
|
|
||||||
user.Tokens.Add(t.Token);
|
|
||||||
|
|
||||||
string tokenObj = "{ \"tokens\": " + JsonConvert.SerializeObject(user.Tokens) + " } ";
|
|
||||||
|
|
||||||
string postURL = Central.ServerURL + "/api/user/" + user.Id;
|
|
||||||
var postContent = new StringContent(tokenObj, Encoding.UTF8, "application/json");
|
|
||||||
response = await client.PostAsync(postURL, postContent);
|
|
||||||
|
|
||||||
if (!response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
// TODO: thrown an error
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
resContent = await response.Content.ReadAsStringAsync();
|
|
||||||
user = JsonConvert.DeserializeObject<CentralUser>(resContent);
|
|
||||||
|
|
||||||
return user;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<List<CentralNetwork>> GetNetworkList()
|
|
||||||
{
|
|
||||||
string networkURL = Central.ServerURL + "/api/network";
|
|
||||||
|
|
||||||
HttpResponseMessage response = await client.GetAsync(networkURL);
|
|
||||||
|
|
||||||
if (!response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
// TODO: Throw Error
|
|
||||||
return new List<CentralNetwork>();
|
|
||||||
}
|
|
||||||
|
|
||||||
string resContent = await response.Content.ReadAsStringAsync();
|
|
||||||
|
|
||||||
List<CentralNetwork> networkList = JsonConvert.DeserializeObject<List<CentralNetwork>>(resContent);
|
|
||||||
|
|
||||||
return networkList;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<CentralNetwork> CreateNewNetwork()
|
|
||||||
{
|
|
||||||
string networkURL = Central.ServerURL + "/api/network?easy=1";
|
|
||||||
CentralNetwork network = new CentralNetwork();
|
|
||||||
network.Config = new CentralNetwork.CentralNetworkConfig();
|
|
||||||
network.Config.Name = NetworkNameGenerator.GenerateName();
|
|
||||||
string jsonNetwork = JsonConvert.SerializeObject(network);
|
|
||||||
var postContent = new StringContent(jsonNetwork, Encoding.UTF8, "application/json");
|
|
||||||
HttpResponseMessage response = await client.PostAsync(networkURL, postContent);
|
|
||||||
|
|
||||||
if (!response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
string resContent = await response.Content.ReadAsStringAsync();
|
|
||||||
|
|
||||||
CentralNetwork newNetwork = JsonConvert.DeserializeObject<CentralNetwork>(resContent);
|
|
||||||
|
|
||||||
return newNetwork;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<bool> AuthorizeNode(string nodeAddress, string networkId)
|
|
||||||
{
|
|
||||||
string json = "{ \"config\": { \"authorized\": true } }";
|
|
||||||
string postURL = Central.ServerURL + "/api/network/" + networkId + "/member/" + nodeAddress;
|
|
||||||
var postContent = new StringContent(json, Encoding.UTF8, "application/json");
|
|
||||||
HttpResponseMessage response = await client.PostAsync(postURL, postContent);
|
|
||||||
|
|
||||||
if (response.IsSuccessStatusCode)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class CentralLogin
|
|
||||||
{
|
|
||||||
|
|
||||||
|
|
||||||
public CentralLogin(string email, string password, bool isNew)
|
|
||||||
{
|
|
||||||
Login = email;
|
|
||||||
Password = password;
|
|
||||||
IsNew = isNew;
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("login")]
|
|
||||||
public string Login { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("password")]
|
|
||||||
public string Password { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("register")]
|
|
||||||
public bool IsNew { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,48 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class CentralNetwork
|
|
||||||
{
|
|
||||||
[JsonProperty("id")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("type")]
|
|
||||||
public string Type { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("clock")]
|
|
||||||
public UInt64 Clock { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("rulesSource")]
|
|
||||||
public string RulesSource { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("description")]
|
|
||||||
public string Description { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("ownerId")]
|
|
||||||
public string OwnerID { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("onlineMemberCount")]
|
|
||||||
public int OnlineMemberCount { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("config")]
|
|
||||||
public CentralNetworkConfig Config { get; set; }
|
|
||||||
|
|
||||||
public class CentralNetworkConfig
|
|
||||||
{
|
|
||||||
[JsonProperty("id")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("nwid")]
|
|
||||||
public string NetworkID { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("name")]
|
|
||||||
public string Name { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class CentralServer
|
|
||||||
{
|
|
||||||
public CentralServer()
|
|
||||||
{
|
|
||||||
ServerURL = "https://my.zerotier.com";
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("server_url")]
|
|
||||||
public string ServerURL { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("api_key")]
|
|
||||||
public string APIKey { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,21 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class CentralToken
|
|
||||||
{
|
|
||||||
[JsonProperty("token")]
|
|
||||||
public string Token { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("clock")]
|
|
||||||
public UInt64 Clock { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("raw")]
|
|
||||||
public string Raw { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,51 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class CentralUser
|
|
||||||
{
|
|
||||||
public class CentralGlobalPermissions
|
|
||||||
{
|
|
||||||
[JsonProperty("a")]
|
|
||||||
public bool Administrator { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("d")]
|
|
||||||
public bool Delete { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("m")]
|
|
||||||
public bool Modify { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("r")]
|
|
||||||
public bool Read { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("id")]
|
|
||||||
public string Id { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("type")]
|
|
||||||
public string Type { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("clock")]
|
|
||||||
public UInt64 Clock { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("globalPermissions")]
|
|
||||||
public CentralGlobalPermissions GlobalPermissions { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("displayName")]
|
|
||||||
public string DisplayName { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("email")]
|
|
||||||
public string Email { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("smsNumber")]
|
|
||||||
public string SmsNumber { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("tokens")]
|
|
||||||
public List<string> Tokens { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
interface ISwitchable
|
|
||||||
{
|
|
||||||
void UtilizeState(object state);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,17 +0,0 @@
|
||||||
<Window x:Class="WinUI.JoinNetworkView"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:local="clr-namespace:WinUI"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Title="Join a Network" SizeToContent="WidthAndHeight" Height="Auto" Width="Auto" Icon="ZeroTierIcon.ico">
|
|
||||||
<Grid HorizontalAlignment="Left" Margin="0,0,0,0" Width="315">
|
|
||||||
<TextBox x:Name="joinNetworkBox" HorizontalAlignment="Left" Height="23" Margin="10,10,0,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="291" PreviewTextInput="joinNetworkBox_OnTextEntered" PreviewKeyDown="joinNetworkBox_OnKeyDown"/>
|
|
||||||
<CheckBox x:Name="allowManagedCheckbox" Content="Allow Managed" HorizontalAlignment="Left" Margin="10,38,0,0" VerticalAlignment="Top" IsChecked="True"/>
|
|
||||||
<CheckBox x:Name="allowGlobalCheckbox" Content="Allow Global" HorizontalAlignment="Left" Margin="118,38,0,0" VerticalAlignment="Top"/>
|
|
||||||
<CheckBox x:Name="allowDefaultCheckbox" Content="Allow Default" HorizontalAlignment="Left" Margin="10,58,0,0" VerticalAlignment="Top"/>
|
|
||||||
<CheckBox x:Name="allowDNSCheckbox" Content="Allow DNS" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="118,58,0,0"/>
|
|
||||||
<Button x:Name="joinButton" Content="Join" HorizontalAlignment="Left" Margin="226,58,0,10" Background="#FFFFB354" VerticalAlignment="Top" Width="75" Click="joinButton_Click" IsEnabled="False"/>
|
|
||||||
</Grid>
|
|
||||||
</Window>
|
|
|
@ -1,127 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for JoinNetworkView.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class JoinNetworkView : Window
|
|
||||||
{
|
|
||||||
Regex charRegex = new Regex("[0-9a-fxA-FX]");
|
|
||||||
Regex wholeStringRegex = new Regex("^[0-9a-fxA-FX]+$");
|
|
||||||
|
|
||||||
public JoinNetworkView()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
DataObject.AddPastingHandler(joinNetworkBox, onPaste);
|
|
||||||
DataObject.AddCopyingHandler(joinNetworkBox, onCopyCut);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void joinNetworkBox_OnTextEntered(object sender, TextCompositionEventArgs e)
|
|
||||||
{
|
|
||||||
e.Handled = !charRegex.IsMatch(e.Text);
|
|
||||||
|
|
||||||
if ( (joinNetworkBox.Text.Length + e.Text.Length) == 16)
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void joinNetworkBox_OnKeyDown(object sender, KeyEventArgs e)
|
|
||||||
{
|
|
||||||
if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
|
|
||||||
{
|
|
||||||
if (e.Key == Key.X && joinNetworkBox.IsSelectionActive)
|
|
||||||
{
|
|
||||||
// handle ctrl-x removing characters
|
|
||||||
joinButton.IsEnabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else if (e.Key == Key.Delete || e.Key == Key.Back)
|
|
||||||
{
|
|
||||||
if ((joinNetworkBox.Text.Length - 1) == 16)
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if ((joinNetworkBox.Text.Length + 1) > 16)
|
|
||||||
{
|
|
||||||
e.Handled = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onPaste(object sender, DataObjectPastingEventArgs e)
|
|
||||||
{
|
|
||||||
var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
|
|
||||||
if (!isText)
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
|
|
||||||
|
|
||||||
if (!wholeStringRegex.IsMatch(text))
|
|
||||||
{
|
|
||||||
e.Handled = true;
|
|
||||||
e.CancelCommand();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (text.Length == 16 || (joinNetworkBox.Text.Length + text.Length) == 16)
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = true;
|
|
||||||
}
|
|
||||||
else if (text.Length > 16 || (joinNetworkBox.Text.Length + text.Length) > 16)
|
|
||||||
{
|
|
||||||
e.Handled = true;
|
|
||||||
e.CancelCommand();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
joinButton.IsEnabled = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onCopyCut(object sender, DataObjectCopyingEventArgs e)
|
|
||||||
{
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
private void joinButton_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
bool allowDefault = allowDefaultCheckbox.IsChecked.Value;
|
|
||||||
bool allowGlobal = allowGlobalCheckbox.IsChecked.Value;
|
|
||||||
bool allowManaged = allowManagedCheckbox.IsChecked.Value;
|
|
||||||
bool allowDNS = allowDNSCheckbox.IsChecked.Value;
|
|
||||||
|
|
||||||
APIHandler.Instance.JoinNetwork(this.Dispatcher, joinNetworkBox.Text, allowManaged, allowGlobal, allowDefault, allowDNS);
|
|
||||||
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,183 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for NetworkInfoView.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class NetworkInfoView : UserControl
|
|
||||||
{
|
|
||||||
public ZeroTierNetwork network;
|
|
||||||
|
|
||||||
public NetworkInfoView(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
this.network = network;
|
|
||||||
|
|
||||||
UpdateNetworkData();
|
|
||||||
|
|
||||||
allowDefault.Checked += AllowDefault_CheckStateChanged;
|
|
||||||
allowDefault.Unchecked += AllowDefault_CheckStateChanged;
|
|
||||||
allowGlobal.Checked += AllowGlobal_CheckStateChanged;
|
|
||||||
allowGlobal.Unchecked += AllowGlobal_CheckStateChanged;
|
|
||||||
allowManaged.Checked += AllowManaged_CheckStateChanged;
|
|
||||||
allowManaged.Unchecked += AllowManaged_CheckStateChanged;
|
|
||||||
allowDNS.Checked += AllowDNS_CheckStateChanged;
|
|
||||||
allowDNS.Unchecked += AllowDNS_CheckStateChanged;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void UpdateNetworkData()
|
|
||||||
{
|
|
||||||
|
|
||||||
if (this.networkId.Text != network.NetworkId)
|
|
||||||
this.networkId.Text = network.NetworkId;
|
|
||||||
|
|
||||||
if (this.networkName.Text != network.NetworkName)
|
|
||||||
this.networkName.Text = network.NetworkName;
|
|
||||||
|
|
||||||
if (this.networkStatus.Text != network.NetworkStatus)
|
|
||||||
this.networkStatus.Text = network.NetworkStatus;
|
|
||||||
|
|
||||||
if (this.networkType.Text != network.NetworkType)
|
|
||||||
this.networkType.Text = network.NetworkType;
|
|
||||||
|
|
||||||
if (this.macAddress.Text != network.MacAddress)
|
|
||||||
this.macAddress.Text = network.MacAddress;
|
|
||||||
|
|
||||||
if (this.mtu.Text != network.MTU.ToString())
|
|
||||||
this.mtu.Text = network.MTU.ToString();
|
|
||||||
|
|
||||||
this.broadcastEnabled.Text = (network.BroadcastEnabled ? "ENABLED" : "DISABLED");
|
|
||||||
this.bridgingEnabled.Text = (network.Bridge ? "ENABLED" : "DISABLED");
|
|
||||||
|
|
||||||
if (this.deviceName.Text != network.DeviceName)
|
|
||||||
this.deviceName.Text = network.DeviceName;
|
|
||||||
|
|
||||||
string iplist = "";
|
|
||||||
for (int i = 0; i < network.AssignedAddresses.Length; ++i)
|
|
||||||
{
|
|
||||||
iplist += network.AssignedAddresses[i];
|
|
||||||
if (i < (network.AssignedAddresses.Length - 1))
|
|
||||||
iplist += "\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (this.managedIps.Text != iplist)
|
|
||||||
this.managedIps.Text = iplist;
|
|
||||||
|
|
||||||
this.allowDefault.IsChecked = network.AllowDefault;
|
|
||||||
this.allowGlobal.IsChecked = network.AllowGlobal;
|
|
||||||
this.allowManaged.IsChecked = network.AllowManaged;
|
|
||||||
this.allowDNS.IsChecked = network.AllowDNS;
|
|
||||||
|
|
||||||
this.connectedCheckBox.Checked -= connectedCheckBox_Checked;
|
|
||||||
this.connectedCheckBox.Unchecked -= connectedCheckbox_Unchecked;
|
|
||||||
|
|
||||||
this.connectedCheckBox.IsChecked = network.IsConnected;
|
|
||||||
|
|
||||||
this.connectedCheckBox.Checked += connectedCheckBox_Checked;
|
|
||||||
this.connectedCheckBox.Unchecked += connectedCheckbox_Unchecked;
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool HasNetwork(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
if (this.network.NetworkId.Equals(network.NetworkId))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SetNetworkInfo(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
this.network = network;
|
|
||||||
|
|
||||||
UpdateNetworkData();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void deleteButton_Click(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
APIHandler.Instance.LeaveNetwork(this.Dispatcher, network.NetworkId);
|
|
||||||
NetworkMonitor.Instance.RemoveNetwork(network.NetworkId);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AllowManaged_CheckStateChanged(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CheckBox cb = sender as CheckBox;
|
|
||||||
APIHandler.Instance.JoinNetwork(this.Dispatcher, network.NetworkId,
|
|
||||||
allowManaged.IsChecked ?? false,
|
|
||||||
allowGlobal.IsChecked ?? false,
|
|
||||||
allowDefault.IsChecked ?? false,
|
|
||||||
allowDNS.IsChecked ?? false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AllowGlobal_CheckStateChanged(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CheckBox cb = sender as CheckBox;
|
|
||||||
APIHandler.Instance.JoinNetwork(this.Dispatcher, network.NetworkId,
|
|
||||||
allowManaged.IsChecked ?? false,
|
|
||||||
allowGlobal.IsChecked ?? false,
|
|
||||||
allowDefault.IsChecked ?? false,
|
|
||||||
allowDNS.IsChecked ?? false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AllowDefault_CheckStateChanged(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CheckBox cb = sender as CheckBox;
|
|
||||||
APIHandler.Instance.JoinNetwork(this.Dispatcher, network.NetworkId,
|
|
||||||
allowManaged.IsChecked ?? false,
|
|
||||||
allowGlobal.IsChecked ?? false,
|
|
||||||
allowDefault.IsChecked ?? false,
|
|
||||||
allowDNS.IsChecked ?? false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AllowDNS_CheckStateChanged(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CheckBox cb = sender as CheckBox;
|
|
||||||
APIHandler.Instance.JoinNetwork(this.Dispatcher, network.NetworkId,
|
|
||||||
allowManaged.IsChecked ?? false,
|
|
||||||
allowGlobal.IsChecked ?? false,
|
|
||||||
allowDefault.IsChecked ?? false,
|
|
||||||
allowDNS.IsChecked ?? false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void connectedCheckBox_Checked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
onConnectedCheckboxUpdated(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void connectedCheckbox_Unchecked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
onConnectedCheckboxUpdated(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onConnectedCheckboxUpdated(bool isChecked)
|
|
||||||
{
|
|
||||||
if (isChecked)
|
|
||||||
{
|
|
||||||
bool global = allowGlobal.IsChecked.Value;
|
|
||||||
bool managed = allowManaged.IsChecked.Value;
|
|
||||||
bool defRoute = allowDefault.IsChecked.Value;
|
|
||||||
bool dns = allowDNS.IsChecked.Value;
|
|
||||||
|
|
||||||
APIHandler.Instance.JoinNetwork(this.Dispatcher, networkId.Text, managed, global, defRoute, dns);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
APIHandler.Instance.LeaveNetwork(this.Dispatcher, networkId.Text);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,85 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Timers;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
using System.Windows.Threading;
|
|
||||||
using System.ComponentModel;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for MainWindow.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class NetworkListView : Window
|
|
||||||
{
|
|
||||||
Regex charRegex = new Regex("[0-9a-fxA-FX]");
|
|
||||||
Regex wholeStringRegex = new Regex("^[0-9a-fxA-FX]+$");
|
|
||||||
|
|
||||||
public NetworkListView()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
Closed += onClosed;
|
|
||||||
|
|
||||||
NetworkMonitor.Instance.SubscribeNetworkUpdates(updateNetworks);
|
|
||||||
}
|
|
||||||
|
|
||||||
~NetworkListView()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void OnClosing(CancelEventArgs e)
|
|
||||||
{
|
|
||||||
e.Cancel = true;
|
|
||||||
Hide();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void onClosed(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
NetworkMonitor.Instance.UnsubscribeNetworkUpdates(updateNetworks);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateNetworks(List<ZeroTierNetwork> networks)
|
|
||||||
{
|
|
||||||
if (networks != null)
|
|
||||||
{
|
|
||||||
networksPage.Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
networksPage.setNetworks(networks);
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnNetworkEntered(object sender, TextCompositionEventArgs e)
|
|
||||||
{
|
|
||||||
e.Handled = !charRegex.IsMatch(e.Text);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OnPaste(object sender, DataObjectPastingEventArgs e)
|
|
||||||
{
|
|
||||||
var isText = e.SourceDataObject.GetDataPresent(DataFormats.UnicodeText, true);
|
|
||||||
if (!isText) return;
|
|
||||||
|
|
||||||
var text = e.SourceDataObject.GetData(DataFormats.UnicodeText) as string;
|
|
||||||
|
|
||||||
if (!wholeStringRegex.IsMatch(text))
|
|
||||||
{
|
|
||||||
e.CancelCommand();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,203 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class NetworkMonitor
|
|
||||||
{
|
|
||||||
public delegate void NetworkListCallback(List<ZeroTierNetwork> networks);
|
|
||||||
public delegate void StatusCallback(ZeroTierStatus status);
|
|
||||||
|
|
||||||
private Thread runThread;
|
|
||||||
private NetworkListCallback _nwCb;
|
|
||||||
private StatusCallback _stCb;
|
|
||||||
|
|
||||||
|
|
||||||
private List<ZeroTierNetwork> _knownNetworks = new List<ZeroTierNetwork>();
|
|
||||||
|
|
||||||
private static NetworkMonitor instance;
|
|
||||||
private static object syncRoot = new object();
|
|
||||||
|
|
||||||
public static NetworkMonitor Instance
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
lock (syncRoot)
|
|
||||||
{
|
|
||||||
if (instance == null)
|
|
||||||
{
|
|
||||||
instance = new NetworkMonitor();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return instance;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private NetworkMonitor()
|
|
||||||
{
|
|
||||||
runThread = new Thread(new ThreadStart(run));
|
|
||||||
loadNetworks();
|
|
||||||
|
|
||||||
runThread.Start();
|
|
||||||
}
|
|
||||||
|
|
||||||
~NetworkMonitor()
|
|
||||||
{
|
|
||||||
runThread.Interrupt();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void loadNetworks()
|
|
||||||
{
|
|
||||||
String dataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\ZeroTier\\One";
|
|
||||||
String dataFile = Path.Combine(dataPath, "networks.dat");
|
|
||||||
|
|
||||||
if (File.Exists(dataFile))
|
|
||||||
{
|
|
||||||
List<ZeroTierNetwork> netList;
|
|
||||||
|
|
||||||
using (Stream stream = File.Open(dataFile, FileMode.Open))
|
|
||||||
{
|
|
||||||
var bformatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
|
|
||||||
netList = (List<ZeroTierNetwork>)bformatter.Deserialize(stream);
|
|
||||||
stream.Close();
|
|
||||||
}
|
|
||||||
|
|
||||||
lock (_knownNetworks)
|
|
||||||
{
|
|
||||||
_knownNetworks = netList;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void writeNetworks()
|
|
||||||
{
|
|
||||||
String dataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + "\\ZeroTier\\One";
|
|
||||||
String dataFile = Path.Combine(dataPath, "networks.dat");
|
|
||||||
|
|
||||||
if (!Directory.Exists(dataPath))
|
|
||||||
{
|
|
||||||
Directory.CreateDirectory(dataPath);
|
|
||||||
}
|
|
||||||
|
|
||||||
using (Stream stream = File.Open(dataFile, FileMode.OpenOrCreate))
|
|
||||||
{
|
|
||||||
lock (_knownNetworks)
|
|
||||||
{
|
|
||||||
var bformatter = new System.Runtime.Serialization.Formatters.Binary.BinaryFormatter();
|
|
||||||
bformatter.Serialize(stream, _knownNetworks);
|
|
||||||
stream.Flush();
|
|
||||||
stream.Close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void apiNetworkCallback(List<ZeroTierNetwork> networks)
|
|
||||||
{
|
|
||||||
if (networks == null)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
lock (_knownNetworks)
|
|
||||||
{
|
|
||||||
_knownNetworks = _knownNetworks.Union(networks, new NetworkEqualityComparer()).ToList();
|
|
||||||
|
|
||||||
foreach (ZeroTierNetwork n in _knownNetworks)
|
|
||||||
{
|
|
||||||
if (networks.Contains(n))
|
|
||||||
{
|
|
||||||
n.IsConnected = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
n.IsConnected = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
_knownNetworks.Sort();
|
|
||||||
_nwCb(_knownNetworks);
|
|
||||||
}
|
|
||||||
|
|
||||||
writeNetworks();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void apiStatusCallback(ZeroTierStatus status)
|
|
||||||
{
|
|
||||||
_stCb(status);
|
|
||||||
}
|
|
||||||
|
|
||||||
private void run()
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
while (runThread.IsAlive)
|
|
||||||
{
|
|
||||||
APIHandler handler = APIHandler.Instance;
|
|
||||||
|
|
||||||
if (handler != null)
|
|
||||||
{
|
|
||||||
handler.GetNetworks(apiNetworkCallback);
|
|
||||||
handler.GetStatus(apiStatusCallback);
|
|
||||||
}
|
|
||||||
|
|
||||||
Thread.Sleep(2000);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception e)
|
|
||||||
{
|
|
||||||
Console.WriteLine("Monitor Thread Exception: " + "\n" + e.StackTrace);
|
|
||||||
}
|
|
||||||
Console.WriteLine("Monitor Thread Ended");
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SubscribeStatusUpdates(StatusCallback cb)
|
|
||||||
{
|
|
||||||
_stCb += cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UnsubscribeStatusUpdates(StatusCallback cb)
|
|
||||||
{
|
|
||||||
_stCb -= cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SubscribeNetworkUpdates(NetworkListCallback cb)
|
|
||||||
{
|
|
||||||
_nwCb += cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UnsubscribeNetworkUpdates(NetworkListCallback cb)
|
|
||||||
{
|
|
||||||
_nwCb -= cb;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void RemoveNetwork(String networkID)
|
|
||||||
{
|
|
||||||
lock(_knownNetworks)
|
|
||||||
{
|
|
||||||
foreach (ZeroTierNetwork n in _knownNetworks)
|
|
||||||
{
|
|
||||||
if (n.NetworkId.Equals(networkID))
|
|
||||||
{
|
|
||||||
_knownNetworks.Remove(n);
|
|
||||||
writeNetworks();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void StopMonitor()
|
|
||||||
{
|
|
||||||
runThread.Abort();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,201 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
class NetworkNameGenerator
|
|
||||||
{
|
|
||||||
public static string GenerateName()
|
|
||||||
{
|
|
||||||
Random r = new Random(DateTime.Now.Millisecond);
|
|
||||||
int firstIndex = r.Next(0, FIRST.Length);
|
|
||||||
int secondIndex = r.Next(0, SECOND.Length);
|
|
||||||
return FIRST[firstIndex] + "_" + SECOND[secondIndex];
|
|
||||||
}
|
|
||||||
|
|
||||||
private static string[] FIRST =
|
|
||||||
{
|
|
||||||
"admiring",
|
|
||||||
"adoring",
|
|
||||||
"agitated",
|
|
||||||
"amazing",
|
|
||||||
"angry",
|
|
||||||
"awesome",
|
|
||||||
"berserk",
|
|
||||||
"big",
|
|
||||||
"clever",
|
|
||||||
"compassionate",
|
|
||||||
"cranky",
|
|
||||||
"crazy",
|
|
||||||
"desperate",
|
|
||||||
"determined",
|
|
||||||
"distracted",
|
|
||||||
"dreamy",
|
|
||||||
"ecstatic",
|
|
||||||
"elated",
|
|
||||||
"elegant",
|
|
||||||
"fervent",
|
|
||||||
"focused",
|
|
||||||
"furious",
|
|
||||||
"gigantic",
|
|
||||||
"gloomy",
|
|
||||||
"goofy",
|
|
||||||
"grave",
|
|
||||||
"happy",
|
|
||||||
"high",
|
|
||||||
"hopeful",
|
|
||||||
"hungry",
|
|
||||||
"insane",
|
|
||||||
"jolly",
|
|
||||||
"jovial",
|
|
||||||
"lonely",
|
|
||||||
"loving",
|
|
||||||
"modest",
|
|
||||||
"nostalgic",
|
|
||||||
"pedantic",
|
|
||||||
"pensive",
|
|
||||||
"prickly",
|
|
||||||
"reverent",
|
|
||||||
"romantic",
|
|
||||||
"sad",
|
|
||||||
"serene",
|
|
||||||
"sharp",
|
|
||||||
"silly",
|
|
||||||
"sleepy",
|
|
||||||
"stoic",
|
|
||||||
"stupefied",
|
|
||||||
"suspicious",
|
|
||||||
"tender",
|
|
||||||
"thirsty",
|
|
||||||
"tiny",
|
|
||||||
"trusting"
|
|
||||||
};
|
|
||||||
|
|
||||||
private static string[] SECOND =
|
|
||||||
{
|
|
||||||
// constructed telephone-like devices in 1854
|
|
||||||
"meucci",
|
|
||||||
|
|
||||||
// prototype make-or-break telephones in 1860
|
|
||||||
"reis",
|
|
||||||
|
|
||||||
// Alexander Graham Bell
|
|
||||||
"bell",
|
|
||||||
|
|
||||||
// designed telephone using water microphone in 1876
|
|
||||||
"gray",
|
|
||||||
|
|
||||||
// Tivadar Puskás invented the telephone switchboard exchange in 1876.
|
|
||||||
"puskas",
|
|
||||||
|
|
||||||
// Thomas Edison, invented the carbon microphone which produced a strong telephone signal.
|
|
||||||
"edison",
|
|
||||||
|
|
||||||
// 1950s, Paul Baran developed the concept Distributed Adaptive Message Block Switching
|
|
||||||
"baran",
|
|
||||||
|
|
||||||
// Donald Davies coined the phrase 'packet switching network'
|
|
||||||
"davies",
|
|
||||||
|
|
||||||
// Robert Licklider helped get ARPANET funded
|
|
||||||
"licklider",
|
|
||||||
|
|
||||||
// Robert Taylor, ARPANET pioneer
|
|
||||||
"taylor",
|
|
||||||
|
|
||||||
// Lawrence Roberts, ARPANET
|
|
||||||
"roberts",
|
|
||||||
|
|
||||||
// Vint Cerf, TCP
|
|
||||||
"cerf",
|
|
||||||
|
|
||||||
// Bob Kahn, TCP
|
|
||||||
"kahn",
|
|
||||||
|
|
||||||
// David P Reed, UDP
|
|
||||||
"reed",
|
|
||||||
|
|
||||||
// Community Memory was created by Efrem Lipkin, Mark Szpakowski, and Lee Felsenstein, acting as The Community Memory Project within the Resource One computer center at Project One in San Francisco.
|
|
||||||
"lipkin",
|
|
||||||
"szpakowski",
|
|
||||||
"felsenstein",
|
|
||||||
|
|
||||||
// The first public dial-up BBS was developed by Ward Christensen and Randy Suess.
|
|
||||||
"christensen",
|
|
||||||
"suess",
|
|
||||||
|
|
||||||
// Joybubbles (May 25, 1949 – August 8, 2007), born Josef Carl Engressia, Jr. in Richmond, Virginia, USA, was an early phone phreak.
|
|
||||||
"engressia",
|
|
||||||
"joybubbles",
|
|
||||||
|
|
||||||
// John Thomas Draper (born 1943), also known as Captain Crunch, Crunch or Crunchman (after Cap'n Crunch breakfast cereal mascot), is an American computer programmer and former phone phreak
|
|
||||||
"draper",
|
|
||||||
|
|
||||||
// Dennis C. Hayes, founder of Hayes Microcomputer Products
|
|
||||||
// "The Modem of Dennis Hayes and Dale Heatherington."
|
|
||||||
"hayes",
|
|
||||||
"heatherington",
|
|
||||||
|
|
||||||
// "Ethernet was developed at Xerox PARC between 1973 and 1974.[7][8] It was inspired by ALOHAnet, which Robert Metcalfe had studied as part of his PhD dissertation."
|
|
||||||
"metcalfe",
|
|
||||||
|
|
||||||
// William Bradford Shockley Jr. (February 13, 1910 – August 12, 1989) was an American physicist and inventor. Shockley was the manager of a research group that included John Bardeen and Walter Brattain. The three scientists invented the point contact transistor in 1947
|
|
||||||
"shockley",
|
|
||||||
"bardeen",
|
|
||||||
"brattain",
|
|
||||||
|
|
||||||
// "Randall Erck invented the modern modem as we know it today. There were devices similar to modems used by the military, but they were designed more for the purpose of sending encripted nuclear launch codes to various bases around the world."
|
|
||||||
"erck",
|
|
||||||
|
|
||||||
// Leonard Kleinrock, packet switching network pioneer
|
|
||||||
"kleinrock",
|
|
||||||
|
|
||||||
// Tim Berners-Lee, WWW
|
|
||||||
"berners_lee",
|
|
||||||
|
|
||||||
// Steve Wozniak, early phone phreak
|
|
||||||
"wozniak",
|
|
||||||
|
|
||||||
// James Fields Smathers of Kansas City invented what is considered the first practical power-operated typewriter in 1914.
|
|
||||||
"smathers",
|
|
||||||
|
|
||||||
// The teleprinter evolved through a series of inventions by a number of engineers, including Royal Earl House, David Edward Hughes, Emile Baudot, Donald Murray, Charles L. Krum, Edward Kleinschmidt and Frederick G. Creed.
|
|
||||||
"house",
|
|
||||||
"hughes",
|
|
||||||
"baudot",
|
|
||||||
"murray",
|
|
||||||
"krum",
|
|
||||||
"kleinschmidt",
|
|
||||||
"creed",
|
|
||||||
|
|
||||||
// Ron Rosenbaum, author of "Secrets of the Little Blue Box" which mainstreamed phone phreaking
|
|
||||||
"rosenbaum",
|
|
||||||
|
|
||||||
// Bram Cohen. Bram Cohen (born October 12, 1975) is an American computer programmer, best known as the author of the peer-to-peer (P2P) BitTorrent protocol,
|
|
||||||
"cohen",
|
|
||||||
|
|
||||||
// Jarkko Oikarinen (born 16 August 1967, in Kuusamo, Finland) is the inventor of the first Internet chat network, called Internet Relay Chat (IRC), where he is known as WiZ.
|
|
||||||
"oikarinen",
|
|
||||||
|
|
||||||
// "What you probably didn't know is that the author of Trumpet Winsock — Peter Tattam from Tasmania, Australia — didn't see much money for his efforts."
|
|
||||||
"tattam",
|
|
||||||
|
|
||||||
// Satoshi Nakamoto
|
|
||||||
"nakamoto",
|
|
||||||
|
|
||||||
// Philo Farnsworth, inventor of the first practical TV tube
|
|
||||||
"farnsworth",
|
|
||||||
|
|
||||||
// Scottish inventor John Logie Baird employed the Nipkow disk in his prototype video systems. On 25 March 1925, Baird gave the first public demonstration of televised silhouette images in motion, at Selfridge's Department Store in London.
|
|
||||||
"baird",
|
|
||||||
|
|
||||||
// Beginning in 1836, the American artist Samuel F. B. Morse, the American physicist Joseph Henry, and Alfred Vail developed an electrical telegraph system.
|
|
||||||
"morse",
|
|
||||||
"henry",
|
|
||||||
"vail"
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,42 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Runtime.Serialization;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class NetworkRoute : ISerializable
|
|
||||||
{
|
|
||||||
protected NetworkRoute(SerializationInfo info, StreamingContext ctx)
|
|
||||||
{
|
|
||||||
Target = info.GetString("target");
|
|
||||||
Via = info.GetString("via");
|
|
||||||
Flags = info.GetInt32("flags");
|
|
||||||
Metric = info.GetInt32("metric");
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void GetObjectData(SerializationInfo info, StreamingContext ctx)
|
|
||||||
{
|
|
||||||
info.AddValue("target", Target);
|
|
||||||
info.AddValue("via", Via);
|
|
||||||
info.AddValue("flags", Flags);
|
|
||||||
info.AddValue("metric", Metric);
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("target")]
|
|
||||||
public string Target { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("via")]
|
|
||||||
public string Via { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("flags")]
|
|
||||||
public int Flags { get; set; }
|
|
||||||
|
|
||||||
[JsonProperty("metric")]
|
|
||||||
public int Metric { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,99 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Navigation;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for NetworksPage.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class NetworksPage : UserControl
|
|
||||||
{
|
|
||||||
public NetworksPage()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setNetworks(List<ZeroTierNetwork> networks)
|
|
||||||
{
|
|
||||||
if (networks == null)
|
|
||||||
{
|
|
||||||
this.wrapPanel.Children.Clear();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (ZeroTierNetwork network in networks)
|
|
||||||
{
|
|
||||||
NetworkInfoView view = ChildWithNetwork(network);
|
|
||||||
if (view != null)
|
|
||||||
{
|
|
||||||
view.SetNetworkInfo(network);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
wrapPanel.Children.Add(
|
|
||||||
new NetworkInfoView(
|
|
||||||
network));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// remove networks we're no longer joined to.
|
|
||||||
List<ZeroTierNetwork> tmpList = GetNetworksFromChildren();
|
|
||||||
foreach (ZeroTierNetwork n in networks)
|
|
||||||
{
|
|
||||||
if (tmpList.Contains(n))
|
|
||||||
{
|
|
||||||
tmpList.Remove(n);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach (ZeroTierNetwork n in tmpList)
|
|
||||||
{
|
|
||||||
NetworkInfoView view = ChildWithNetwork(n);
|
|
||||||
if (view != null)
|
|
||||||
{
|
|
||||||
wrapPanel.Children.Remove(view);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private NetworkInfoView ChildWithNetwork(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
List<NetworkInfoView> list = wrapPanel.Children.OfType<NetworkInfoView>().ToList();
|
|
||||||
|
|
||||||
foreach (NetworkInfoView view in list)
|
|
||||||
{
|
|
||||||
if (view.HasNetwork(network))
|
|
||||||
{
|
|
||||||
return view;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private List<ZeroTierNetwork> GetNetworksFromChildren()
|
|
||||||
{
|
|
||||||
List<ZeroTierNetwork> networks = new List<ZeroTierNetwork>(wrapPanel.Children.Count);
|
|
||||||
|
|
||||||
List<NetworkInfoView> list = wrapPanel.Children.OfType<NetworkInfoView>().ToList();
|
|
||||||
foreach (NetworkInfoView n in list)
|
|
||||||
{
|
|
||||||
networks.Add(n.network);
|
|
||||||
}
|
|
||||||
|
|
||||||
return networks;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
<Window x:Class="WinUI.PreferencesView"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:local="clr-namespace:WinUI"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Title="PreferencesView" SizeToContent="WidthAndHeight" Height="Auto" Width="Auto" Icon="ZeroTierIcon.ico">
|
|
||||||
<Grid>
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
<ColumnDefinition Width="Auto"/>
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<Grid.RowDefinitions>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
<RowDefinition Height="Auto"/>
|
|
||||||
</Grid.RowDefinitions>
|
|
||||||
<CheckBox x:Name="startupCheckbox" Content="Launch ZeroTier On Startup" HorizontalAlignment="Left" Margin="10" VerticalAlignment="Top" Grid.Column="0" Grid.ColumnSpan="2" Grid.Row="0"/>
|
|
||||||
|
|
||||||
<TextBlock Text="Central Instance:" Grid.Row="1" Grid.Column="0" Margin="10"/>
|
|
||||||
<TextBox x:Name="CentralInstanceTextBox" Grid.Row="1" Grid.Column="1" MinWidth="200" Margin="10"/>
|
|
||||||
|
|
||||||
<TextBlock Text="API Key:" Grid.Row="2" Grid.Column="0" Margin="10"/>
|
|
||||||
<TextBox x:Name="APIKeyTextBox" Grid.Row="2" Grid.Column="1" MinWidth="200" Margin="10"/>
|
|
||||||
|
|
||||||
<Button x:Name="OKButton" Grid.Row="3" Grid.Column="1" Background="#FFFFB354" Content="OK" Margin="10" Width="90" HorizontalAlignment="Right" Click="OKButton_Clicked"/>
|
|
||||||
</Grid>
|
|
||||||
</Window>
|
|
|
@ -1,74 +0,0 @@
|
||||||
using Microsoft.Win32;
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for PreferencesView.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class PreferencesView : Window
|
|
||||||
{
|
|
||||||
public static string AppName = "ZeroTier One";
|
|
||||||
private RegistryKey rk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
|
|
||||||
private string AppLocation = System.Reflection.Assembly.GetExecutingAssembly().Location;
|
|
||||||
public PreferencesView()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
|
|
||||||
string keyValue = rk.GetValue(AppName) as string;
|
|
||||||
|
|
||||||
if (keyValue != null && keyValue.Equals(AppLocation))
|
|
||||||
{
|
|
||||||
startupCheckbox.IsChecked = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
CentralAPI api = CentralAPI.Instance;
|
|
||||||
CentralInstanceTextBox.Text = api.Central.ServerURL;
|
|
||||||
APIKeyTextBox.Text = api.Central.APIKey;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void OKButton_Clicked(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
CentralAPI api = CentralAPI.Instance;
|
|
||||||
|
|
||||||
if (api.Central.ServerURL != CentralInstanceTextBox.Text ||
|
|
||||||
api.Central.APIKey != APIKeyTextBox.Text)
|
|
||||||
{
|
|
||||||
CentralServer newServer = new CentralServer();
|
|
||||||
newServer.ServerURL = CentralInstanceTextBox.Text;
|
|
||||||
newServer.APIKey = APIKeyTextBox.Text;
|
|
||||||
|
|
||||||
api.Central = newServer;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (startupCheckbox.IsChecked.HasValue && (bool)startupCheckbox.IsChecked)
|
|
||||||
{
|
|
||||||
rk.SetValue(AppName, AppLocation);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string keyValue = rk.GetValue(AppName) as string;
|
|
||||||
|
|
||||||
if (keyValue != null && keyValue.Equals(AppLocation))
|
|
||||||
{
|
|
||||||
rk.DeleteValue(AppName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Close();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
Binary file not shown.
Before Width: | Height: | Size: 44 KiB |
|
@ -1,65 +0,0 @@
|
||||||
<Window x:Class="WinUI.ToolbarItem"
|
|
||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
|
||||||
xmlns:local="clr-namespace:WinUI"
|
|
||||||
xmlns:tb="http://www.hardcodet.net/taskbar"
|
|
||||||
xmlns:scm="clr-namespace:System.ComponentModel;assembly=WindowsBase"
|
|
||||||
mc:Ignorable="d"
|
|
||||||
Height="300" Width="300" Visibility="Hidden" Name="Toolbar">
|
|
||||||
|
|
||||||
<Window.Resources>
|
|
||||||
<CollectionViewSource Source="{Binding ElementName=Toolbar, Path=NetworkCollection}" x:Key="KnownNetworks">
|
|
||||||
<CollectionViewSource.SortDescriptions>
|
|
||||||
<scm:SortDescription PropertyName="Header" Direction="Ascending"/>
|
|
||||||
</CollectionViewSource.SortDescriptions>
|
|
||||||
</CollectionViewSource>
|
|
||||||
</Window.Resources>
|
|
||||||
|
|
||||||
<Grid>
|
|
||||||
<tb:TaskbarIcon x:Name="MyNotifyIcon"
|
|
||||||
IconSource="ZeroTierIcon.ico"
|
|
||||||
ToolTipText="ZeroTier One"
|
|
||||||
MenuActivation="LeftOrRightClick">
|
|
||||||
<tb:TaskbarIcon.ContextMenu>
|
|
||||||
<ContextMenu>
|
|
||||||
<ContextMenu.ItemsSource>
|
|
||||||
<CompositeCollection>
|
|
||||||
<MenuItem Header="Node ID: unknown"
|
|
||||||
Click="ToolbarItem_NodeIDClicked"
|
|
||||||
x:Name="nodeIdMenuItem"/>
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="Join Network..."
|
|
||||||
Click="ToolbarItem_JoinNetworkClicked"/>
|
|
||||||
<MenuItem Header="Show Networks..."
|
|
||||||
Click="ToolbarItem_ShowNetworksClicked"/>
|
|
||||||
<Separator/>
|
|
||||||
|
|
||||||
<CollectionContainer Collection="{Binding Source={StaticResource KnownNetworks}}">
|
|
||||||
|
|
||||||
</CollectionContainer>
|
|
||||||
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="ZeroTier Central"
|
|
||||||
Click="ToolbarItem_CentralClicked"/>
|
|
||||||
<MenuItem Header="Create and Join Network"
|
|
||||||
Click="ToolbarItem_NewNetwork"
|
|
||||||
x:Name="newNetworkItem"/>
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="About..."
|
|
||||||
Click="ToolbarItem_AboutClicked"/>
|
|
||||||
<MenuItem Header="Preferences..."
|
|
||||||
Click="ToolbarItem_PreferencesClicked"/>
|
|
||||||
<Separator/>
|
|
||||||
<MenuItem Header="Quit"
|
|
||||||
Click="ToolbarItem_QuitClicked"/>
|
|
||||||
|
|
||||||
</CompositeCollection>
|
|
||||||
</ContextMenu.ItemsSource>
|
|
||||||
</ContextMenu>
|
|
||||||
</tb:TaskbarIcon.ContextMenu>
|
|
||||||
|
|
||||||
</tb:TaskbarIcon>
|
|
||||||
</Grid>
|
|
||||||
</Window>
|
|
|
@ -1,353 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Collections.ObjectModel;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Net.Http;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using System.Windows;
|
|
||||||
using System.Windows.Controls;
|
|
||||||
using System.Windows.Data;
|
|
||||||
using System.Windows.Documents;
|
|
||||||
using System.Windows.Input;
|
|
||||||
using System.Windows.Media;
|
|
||||||
using System.Windows.Media.Imaging;
|
|
||||||
using System.Windows.Shapes;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using System.Timers;
|
|
||||||
using System.Windows.Threading;
|
|
||||||
using System.IO;
|
|
||||||
using System.Diagnostics;
|
|
||||||
using Microsoft.Win32;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Interaction logic for ToolbarItem.xaml
|
|
||||||
/// </summary>
|
|
||||||
public partial class ToolbarItem : Window, INotifyPropertyChanged
|
|
||||||
{
|
|
||||||
private APIHandler handler = APIHandler.Instance;
|
|
||||||
|
|
||||||
private Point netListLocation = new Point(0, 0);
|
|
||||||
private Point joinNetLocation = new Point(0, 0);
|
|
||||||
private Point aboutViewLocation = new Point(0, 0);
|
|
||||||
private Point prefsViewLocation = new Point(0, 0);
|
|
||||||
|
|
||||||
private NetworkListView netListView = new NetworkListView();
|
|
||||||
private JoinNetworkView joinNetView = null;
|
|
||||||
private AboutView aboutView = null;
|
|
||||||
private PreferencesView prefsView = null;
|
|
||||||
|
|
||||||
private NetworkMonitor mon = NetworkMonitor.Instance;
|
|
||||||
|
|
||||||
private ObservableCollection<MenuItem> _networkCollection = new ObservableCollection<MenuItem>();
|
|
||||||
|
|
||||||
|
|
||||||
public ObservableCollection<MenuItem> NetworkCollection
|
|
||||||
{
|
|
||||||
get { return _networkCollection; }
|
|
||||||
set { _networkCollection = value; }
|
|
||||||
}
|
|
||||||
|
|
||||||
private string nodeId;
|
|
||||||
|
|
||||||
public ToolbarItem()
|
|
||||||
{
|
|
||||||
InitializeComponent();
|
|
||||||
|
|
||||||
mon.SubscribeNetworkUpdates(updateNetworks);
|
|
||||||
mon.SubscribeStatusUpdates(updateStatus);
|
|
||||||
|
|
||||||
SystemEvents.DisplaySettingsChanged += new EventHandler(SystemEvents_DisplaySettingsChanged);
|
|
||||||
}
|
|
||||||
|
|
||||||
~ToolbarItem()
|
|
||||||
{
|
|
||||||
mon.UnsubscribeNetworkUpdates(updateNetworks);
|
|
||||||
mon.UnsubscribeStatusUpdates(updateStatus);
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
|
|
||||||
protected void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
|
|
||||||
{
|
|
||||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateNetworks(List<ZeroTierNetwork> networks)
|
|
||||||
{
|
|
||||||
if (networks != null)
|
|
||||||
{
|
|
||||||
Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
NetworkCollection.Clear();
|
|
||||||
foreach (ZeroTierNetwork n in networks)
|
|
||||||
{
|
|
||||||
MenuItem item = new MenuItem();
|
|
||||||
item.Header = n.Title.Replace("_", "__");
|
|
||||||
item.DataContext = n;
|
|
||||||
item.IsChecked = n.IsConnected;
|
|
||||||
item.Click += ToolbarItem_NetworkClicked;
|
|
||||||
|
|
||||||
NetworkCollection.Add(item);
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void updateStatus(ZeroTierStatus status)
|
|
||||||
{
|
|
||||||
if (status != null)
|
|
||||||
{
|
|
||||||
Dispatcher.BeginInvoke(DispatcherPriority.Normal, new Action(() =>
|
|
||||||
{
|
|
||||||
nodeIdMenuItem.Header = "Node ID: " + status.Address;
|
|
||||||
nodeIdMenuItem.IsEnabled = true;
|
|
||||||
nodeId = status.Address;
|
|
||||||
|
|
||||||
if (CentralAPI.Instance.HasAccessToken())
|
|
||||||
{
|
|
||||||
newNetworkItem.IsEnabled = true;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
newNetworkItem.IsEnabled = false;
|
|
||||||
}
|
|
||||||
}));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_NodeIDClicked(object sender, System.Windows.RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
Clipboard.SetDataObject(nodeId);
|
|
||||||
}
|
|
||||||
catch (ArgumentNullException)
|
|
||||||
{
|
|
||||||
// tried to copy a null nodeId
|
|
||||||
Console.WriteLine("ArgumentNullException");
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
Console.WriteLine(ex.ToString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_ShowNetworksClicked(object sender, System.Windows.RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if (netListView == null)
|
|
||||||
{
|
|
||||||
netListView = new WinUI.NetworkListView();
|
|
||||||
netListView.Closed += ShowNetworksClosed;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool netListNeedsMoving = true;
|
|
||||||
if (netListLocation.X > 0 && netListLocation.Y > 0)
|
|
||||||
{
|
|
||||||
netListView.Left = netListLocation.X;
|
|
||||||
netListView.Top = netListLocation.Y;
|
|
||||||
netListNeedsMoving = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
netListView.Show();
|
|
||||||
|
|
||||||
if (netListNeedsMoving)
|
|
||||||
{
|
|
||||||
setWindowPosition(netListView);
|
|
||||||
netListLocation.X = netListView.Left;
|
|
||||||
netListLocation.Y = netListView.Top;
|
|
||||||
}
|
|
||||||
|
|
||||||
netListView.Activate();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ShowNetworksClosed(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
netListView = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_JoinNetworkClicked(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
if (joinNetView == null)
|
|
||||||
{
|
|
||||||
joinNetView = new JoinNetworkView();
|
|
||||||
joinNetView.Closed += JoinNetworkClosed;
|
|
||||||
|
|
||||||
bool needsMove = true;
|
|
||||||
if (joinNetLocation.X > 0 && joinNetLocation.Y > 0)
|
|
||||||
{
|
|
||||||
joinNetView.Left = joinNetLocation.X;
|
|
||||||
joinNetView.Top = joinNetLocation.Y;
|
|
||||||
needsMove = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
joinNetView.Show();
|
|
||||||
|
|
||||||
if (needsMove)
|
|
||||||
{
|
|
||||||
setWindowPosition(joinNetView);
|
|
||||||
joinNetLocation.X = joinNetView.Left;
|
|
||||||
joinNetLocation.Y = joinNetView.Top;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
joinNetView.Activate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void JoinNetworkClosed(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
joinNetView = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_CentralClicked(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
Process.Start("https://my.zerotier.com");
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_AboutClicked(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
if (aboutView == null)
|
|
||||||
{
|
|
||||||
aboutView = new AboutView();
|
|
||||||
aboutView.Closed += AboutClosed;
|
|
||||||
|
|
||||||
bool needsMove = true;
|
|
||||||
if (aboutViewLocation.X > 0 && aboutViewLocation.Y > 0)
|
|
||||||
{
|
|
||||||
aboutView.Left = aboutViewLocation.X;
|
|
||||||
aboutView.Top = aboutViewLocation.Y;
|
|
||||||
needsMove = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
aboutView.Show();
|
|
||||||
|
|
||||||
if (needsMove)
|
|
||||||
{
|
|
||||||
setWindowPosition(aboutView);
|
|
||||||
aboutViewLocation.X = aboutView.Left;
|
|
||||||
aboutViewLocation.Y = aboutView.Top;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
aboutView.Activate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void AboutClosed(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
aboutView = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_PreferencesClicked(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
if (prefsView == null)
|
|
||||||
{
|
|
||||||
prefsView = new PreferencesView();
|
|
||||||
prefsView.Closed += PreferencesClosed;
|
|
||||||
|
|
||||||
bool needsMove = true;
|
|
||||||
if (prefsViewLocation.X > 0 && prefsViewLocation.Y > 0)
|
|
||||||
{
|
|
||||||
prefsView.Left = prefsViewLocation.X;
|
|
||||||
prefsView.Top = prefsViewLocation.Y;
|
|
||||||
needsMove = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
prefsView.Show();
|
|
||||||
|
|
||||||
if (needsMove)
|
|
||||||
{
|
|
||||||
setWindowPosition(prefsView);
|
|
||||||
prefsViewLocation.X = prefsView.Left;
|
|
||||||
prefsViewLocation.Y = prefsView.Top;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
prefsView.Activate();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void PreferencesClosed(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
prefsView = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_QuitClicked(object sender, System.EventArgs e)
|
|
||||||
{
|
|
||||||
NetworkMonitor.Instance.StopMonitor();
|
|
||||||
Close();
|
|
||||||
Application.Current.Shutdown();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void ToolbarItem_NetworkClicked(object sender, System.Windows.RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if(sender.GetType() == typeof(MenuItem))
|
|
||||||
{
|
|
||||||
MenuItem item = e.Source as MenuItem;
|
|
||||||
if (item.DataContext != null)
|
|
||||||
{
|
|
||||||
ZeroTierNetwork network = item.DataContext as ZeroTierNetwork;
|
|
||||||
if (item.IsChecked)
|
|
||||||
{
|
|
||||||
APIHandler.Instance.LeaveNetwork(Dispatcher, network.NetworkId);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
APIHandler.Instance.JoinNetwork(Dispatcher, network.NetworkId, network.AllowManaged, network.AllowGlobal, network.AllowDefault);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private async void ToolbarItem_NewNetwork(object sender, System.Windows.RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
if (CentralAPI.Instance.HasAccessToken())
|
|
||||||
{
|
|
||||||
CentralAPI api = CentralAPI.Instance;
|
|
||||||
CentralNetwork newNetwork = await api.CreateNewNetwork();
|
|
||||||
|
|
||||||
APIHandler handler = APIHandler.Instance;
|
|
||||||
handler.JoinNetwork(this.Dispatcher, newNetwork.Id);
|
|
||||||
|
|
||||||
string nodeId = APIHandler.Instance.NodeAddress();
|
|
||||||
bool authorized = await CentralAPI.Instance.AuthorizeNode(nodeId, newNetwork.Id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void setWindowPosition(Window w)
|
|
||||||
{
|
|
||||||
double width = w.ActualWidth;
|
|
||||||
double height = w.ActualHeight;
|
|
||||||
|
|
||||||
double screenHeight = SystemParameters.PrimaryScreenHeight;
|
|
||||||
double screenWidth = SystemParameters.PrimaryScreenWidth;
|
|
||||||
|
|
||||||
double top = screenHeight - height - 40;
|
|
||||||
double left = screenWidth - width - 20;
|
|
||||||
|
|
||||||
w.Top = top;
|
|
||||||
w.Left = left;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SystemEvents_DisplaySettingsChanged(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
// reset cached locations to (0, 0) when display size changes
|
|
||||||
netListLocation.X = 0;
|
|
||||||
netListLocation.Y = 0;
|
|
||||||
joinNetLocation.X = 0;
|
|
||||||
joinNetLocation.Y = 0;
|
|
||||||
aboutViewLocation.X = 0;
|
|
||||||
aboutViewLocation.Y = 0;
|
|
||||||
prefsViewLocation.X = 0;
|
|
||||||
prefsViewLocation.Y = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,516 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.ComponentModel;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Runtime.Serialization;
|
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Newtonsoft.Json;
|
|
||||||
|
|
||||||
namespace WinUI
|
|
||||||
{
|
|
||||||
[Serializable]
|
|
||||||
public class ZeroTierNetwork : ISerializable, IEquatable<ZeroTierNetwork>, IComparable<ZeroTierNetwork>, INotifyPropertyChanged
|
|
||||||
{
|
|
||||||
private string networkId;
|
|
||||||
private string macAddress;
|
|
||||||
private string networkName;
|
|
||||||
private string networkStatus;
|
|
||||||
private string networkType;
|
|
||||||
private Int32 mtu;
|
|
||||||
private bool dhcp;
|
|
||||||
private bool bridge;
|
|
||||||
private bool broadcastEnabled;
|
|
||||||
private Int32 portError;
|
|
||||||
private Int32 netconfRevision;
|
|
||||||
private string[] assignedAddresses;
|
|
||||||
private NetworkRoute[] routes;
|
|
||||||
private string deviceName;
|
|
||||||
private bool allowManaged;
|
|
||||||
private bool allowGlobal;
|
|
||||||
private bool allowDefault;
|
|
||||||
private bool allowDNS;
|
|
||||||
private bool isConnected;
|
|
||||||
|
|
||||||
protected ZeroTierNetwork(SerializationInfo info, StreamingContext ctx)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
NetworkId = info.GetString("nwid");
|
|
||||||
MacAddress = info.GetString("mac");
|
|
||||||
NetworkName = info.GetString("name");
|
|
||||||
NetworkStatus = info.GetString("status");
|
|
||||||
NetworkType = info.GetString("type");
|
|
||||||
MTU = info.GetInt32("mtu");
|
|
||||||
DHCP = info.GetBoolean("dhcp");
|
|
||||||
Bridge = info.GetBoolean("bridge");
|
|
||||||
BroadcastEnabled = info.GetBoolean("broadcastEnabled");
|
|
||||||
PortError = info.GetInt32("portError");
|
|
||||||
NetconfRevision = info.GetInt32("netconfRevision");
|
|
||||||
AssignedAddresses = (string[])info.GetValue("assignedAddresses", typeof(string[]));
|
|
||||||
Routes = (NetworkRoute[])info.GetValue("routes", typeof(NetworkRoute[]));
|
|
||||||
DeviceName = info.GetString("portDeviceName");
|
|
||||||
AllowManaged = info.GetBoolean("allowManaged");
|
|
||||||
AllowGlobal = info.GetBoolean("allowGlobal");
|
|
||||||
AllowDefault = info.GetBoolean("allowDefault");
|
|
||||||
AllowDNS = info.GetBoolean("allowDNS");
|
|
||||||
}
|
|
||||||
catch { }
|
|
||||||
IsConnected = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public event PropertyChangedEventHandler PropertyChanged;
|
|
||||||
|
|
||||||
public virtual void GetObjectData(SerializationInfo info, StreamingContext ctx)
|
|
||||||
{
|
|
||||||
info.AddValue("nwid", NetworkId);
|
|
||||||
info.AddValue("mac", MacAddress);
|
|
||||||
info.AddValue("name", NetworkName);
|
|
||||||
info.AddValue("status", NetworkStatus);
|
|
||||||
info.AddValue("type", NetworkType);
|
|
||||||
info.AddValue("mtu", MTU);
|
|
||||||
info.AddValue("dhcp", DHCP);
|
|
||||||
info.AddValue("bridge", Bridge);
|
|
||||||
info.AddValue("broadcastEnabled", BroadcastEnabled);
|
|
||||||
info.AddValue("portError", PortError);
|
|
||||||
info.AddValue("netconfRevision", NetconfRevision);
|
|
||||||
info.AddValue("assignedAddresses", AssignedAddresses);
|
|
||||||
info.AddValue("routes", Routes);
|
|
||||||
info.AddValue("portDeviceName", DeviceName);
|
|
||||||
info.AddValue("allowManaged", AllowManaged);
|
|
||||||
info.AddValue("allowGlobal", AllowGlobal);
|
|
||||||
info.AddValue("allowDefault", AllowDefault);
|
|
||||||
info.AddValue("allowDNS", AllowDNS);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void UpdateNetwork(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
if (network == null)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (!NetworkId.Equals(network.NetworkId))
|
|
||||||
{
|
|
||||||
NetworkId = network.NetworkId;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!MacAddress.Equals(network.MacAddress))
|
|
||||||
{
|
|
||||||
MacAddress = network.MacAddress;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!NetworkName.Equals(network.NetworkName))
|
|
||||||
{
|
|
||||||
NetworkName = network.NetworkName;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!NetworkStatus.Equals(network.NetworkStatus))
|
|
||||||
{
|
|
||||||
NetworkStatus = network.NetworkStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!NetworkType.Equals(network.NetworkType))
|
|
||||||
{
|
|
||||||
NetworkType = network.NetworkType;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (MTU != network.MTU)
|
|
||||||
{
|
|
||||||
MTU = network.MTU;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (DHCP != network.DHCP)
|
|
||||||
{
|
|
||||||
DHCP = network.DHCP;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (Bridge != network.Bridge)
|
|
||||||
{
|
|
||||||
Bridge = network.Bridge;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (BroadcastEnabled != network.BroadcastEnabled)
|
|
||||||
{
|
|
||||||
BroadcastEnabled = network.BroadcastEnabled;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (PortError != network.PortError)
|
|
||||||
{
|
|
||||||
PortError = network.PortError;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (NetconfRevision != network.NetconfRevision)
|
|
||||||
{
|
|
||||||
NetconfRevision = network.NetconfRevision;
|
|
||||||
}
|
|
||||||
|
|
||||||
AssignedAddresses = network.AssignedAddresses;
|
|
||||||
|
|
||||||
Routes = network.Routes;
|
|
||||||
|
|
||||||
if (!DeviceName.Equals(network.DeviceName))
|
|
||||||
{
|
|
||||||
DeviceName = network.DeviceName;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AllowManaged != network.AllowManaged)
|
|
||||||
{
|
|
||||||
AllowManaged = network.AllowManaged;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AllowGlobal != network.AllowGlobal)
|
|
||||||
{
|
|
||||||
AllowGlobal = network.AllowGlobal;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AllowDefault != network.AllowDefault)
|
|
||||||
{
|
|
||||||
AllowDefault = network.AllowDefault;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (AllowDNS != network.AllowDNS)
|
|
||||||
{
|
|
||||||
AllowDNS = network.AllowDNS;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (IsConnected != network.IsConnected)
|
|
||||||
{
|
|
||||||
IsConnected = network.IsConnected;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void NotifyPropertyChanged([CallerMemberName] string propertyName = null)
|
|
||||||
{
|
|
||||||
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("nwid")]
|
|
||||||
public string NetworkId {
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return networkId;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
networkId = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("mac")]
|
|
||||||
public string MacAddress
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return macAddress;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
macAddress = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("name")]
|
|
||||||
public string NetworkName
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return networkName;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
networkName = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("status")]
|
|
||||||
public string NetworkStatus
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return networkStatus;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
networkStatus = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("type")]
|
|
||||||
public string NetworkType
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return networkType;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
networkType = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("mtu")]
|
|
||||||
public int MTU
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return mtu;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
mtu = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("dhcp")]
|
|
||||||
public bool DHCP
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return dhcp;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
dhcp = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("bridge")]
|
|
||||||
public bool Bridge
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return bridge;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
bridge = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("broadcastEnabled")]
|
|
||||||
public bool BroadcastEnabled
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return broadcastEnabled;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
broadcastEnabled = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("portError")]
|
|
||||||
public int PortError
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return portError;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
portError = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("netconfRevision")]
|
|
||||||
public int NetconfRevision
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return netconfRevision;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
netconfRevision = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("assignedAddresses")]
|
|
||||||
public string[] AssignedAddresses
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return assignedAddresses;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
assignedAddresses = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("routes")]
|
|
||||||
public NetworkRoute[] Routes
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return routes;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
routes = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("portDeviceName")]
|
|
||||||
public string DeviceName
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return deviceName;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
deviceName = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("allowManaged")]
|
|
||||||
public bool AllowManaged
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return allowManaged;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
allowManaged = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("allowGlobal")]
|
|
||||||
public bool AllowGlobal
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return allowGlobal;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
allowGlobal = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("allowDefault")]
|
|
||||||
public bool AllowDefault
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return allowDefault;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
allowDefault = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[JsonProperty("allowDNS")]
|
|
||||||
public bool AllowDNS
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return allowDNS;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
allowDNS = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsConnected
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
return isConnected;
|
|
||||||
}
|
|
||||||
set
|
|
||||||
{
|
|
||||||
isConnected = value;
|
|
||||||
NotifyPropertyChanged();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public String Title
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
|
|
||||||
if (NetworkName != null && NetworkName.Length > 0)
|
|
||||||
{
|
|
||||||
return NetworkId + " (" + NetworkName + ")";
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return NetworkId;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool Equals(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
if (NetworkId == null || network == null)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
return NetworkId.Equals(network.NetworkId);
|
|
||||||
}
|
|
||||||
|
|
||||||
public int CompareTo(ZeroTierNetwork network)
|
|
||||||
{
|
|
||||||
if (NetworkId == null || network == null)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
UInt64 thisNwid = UInt64.Parse(NetworkId, System.Globalization.NumberStyles.HexNumber);
|
|
||||||
UInt64 otherNwid = UInt64.Parse(network.NetworkId, System.Globalization.NumberStyles.HexNumber);
|
|
||||||
|
|
||||||
if (thisNwid > otherNwid)
|
|
||||||
{
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
else if (thisNwid < otherNwid)
|
|
||||||
{
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class NetworkEqualityComparer : IEqualityComparer<ZeroTierNetwork>
|
|
||||||
{
|
|
||||||
public bool Equals(ZeroTierNetwork lhs, ZeroTierNetwork rhs)
|
|
||||||
{
|
|
||||||
if (lhs.NetworkId.Equals(rhs.NetworkId))
|
|
||||||
{
|
|
||||||
lhs.UpdateNetwork(rhs);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int GetHashCode(ZeroTierNetwork obj)
|
|
||||||
{
|
|
||||||
return obj.NetworkId.GetHashCode();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,5 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<packages>
|
|
||||||
<package id="Hardcodet.NotifyIcon.Wpf" version="1.0.8" targetFramework="net45" />
|
|
||||||
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
|
|
||||||
</packages>
|
|
BIN
attic/big-http-test/2015-11-10_01_50000.out.xz
Normal file
BIN
attic/big-http-test/2015-11-10_01_50000.out.xz
Normal file
Binary file not shown.
BIN
attic/big-http-test/2015-11-10_02_50000.out.xz
Normal file
BIN
attic/big-http-test/2015-11-10_02_50000.out.xz
Normal file
Binary file not shown.
BIN
attic/big-http-test/2015-11-10_03_12500_ec2-east-only.out.xz
Normal file
BIN
attic/big-http-test/2015-11-10_03_12500_ec2-east-only.out.xz
Normal file
Binary file not shown.
24
attic/big-http-test/Dockerfile
Normal file
24
attic/big-http-test/Dockerfile
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
FROM centos:latest
|
||||||
|
|
||||||
|
MAINTAINER https://www.zerotier.com/
|
||||||
|
|
||||||
|
EXPOSE 9993/udp
|
||||||
|
|
||||||
|
ADD nodesource-el.repo /etc/yum.repos.d/nodesource-el.repo
|
||||||
|
RUN yum -y update && yum install -y nodejs && yum clean all
|
||||||
|
|
||||||
|
RUN mkdir -p /var/lib/zerotier-one
|
||||||
|
RUN mkdir -p /var/lib/zerotier-one/networks.d
|
||||||
|
RUN touch /var/lib/zerotier-one/networks.d/ffffffffffffffff.conf
|
||||||
|
|
||||||
|
ADD package.json /
|
||||||
|
RUN npm install
|
||||||
|
|
||||||
|
ADD zerotier-one /
|
||||||
|
RUN chmod a+x /zerotier-one
|
||||||
|
|
||||||
|
ADD agent.js /
|
||||||
|
ADD docker-main.sh /
|
||||||
|
RUN chmod a+x /docker-main.sh
|
||||||
|
|
||||||
|
CMD ["./docker-main.sh"]
|
12
attic/big-http-test/README.md
Normal file
12
attic/big-http-test/README.md
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
HTTP one-to-all test
|
||||||
|
======
|
||||||
|
|
||||||
|
*This is really internal use code. You're free to test it out but expect to do some editing/tweaking to make it work. We used this to run some massive scale tests of our new geo-cluster-based root server infrastructure prior to taking it live.*
|
||||||
|
|
||||||
|
Before using this code you will want to edit agent.js to change SERVER_HOST to the IP address of where you will run server.js. This should typically be an open Internet IP, since this makes reporting not dependent upon the thing being tested. Also note that this thing does no security of any kind. It's designed for one-off tests run over a short period of time, not to be anything that runs permanently. You will also want to edit the Dockerfile if you want to build containers and change the network ID to the network you want to run tests over.
|
||||||
|
|
||||||
|
This code can be deployed across a large number of VMs or containers to test and benchmark HTTP traffic within a virtual network at scale. The agent acts as a server and can query other agents, while the server collects agent data and tells agents about each other. It's designed to use RFC4193-based ZeroTier IPv6 addresses within the cluster, which allows the easy provisioning of a large cluster without IP conflicts.
|
||||||
|
|
||||||
|
The Dockerfile builds an image that launches the agent. The image must be "docker run" with "--device=/dev/net/tun --privileged" to permit it to open a tun/tap device within the container. (Unfortunately CAP_NET_ADMIN may not work due to a bug in Docker and/or Linux.) You can run a bunch with a command like:
|
||||||
|
|
||||||
|
for ((n=0;n<10;n++)); do docker run --device=/dev/net/tun --privileged -d zerotier/http-test; done
|
196
attic/big-http-test/agent.js
Normal file
196
attic/big-http-test/agent.js
Normal file
|
@ -0,0 +1,196 @@
|
||||||
|
// ZeroTier distributed HTTP test agent
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Customizable parameters:
|
||||||
|
|
||||||
|
// Time between startup and first test attempt
|
||||||
|
var TEST_STARTUP_LAG = 10000;
|
||||||
|
|
||||||
|
// Maximum interval between test attempts (actual timing is random % this)
|
||||||
|
var TEST_INTERVAL_MAX = (60000 * 10);
|
||||||
|
|
||||||
|
// Test timeout in ms
|
||||||
|
var TEST_TIMEOUT = 30000;
|
||||||
|
|
||||||
|
// Where should I get other agents' IDs and POST results?
|
||||||
|
var SERVER_HOST = '52.26.196.147';
|
||||||
|
var SERVER_PORT = 18080;
|
||||||
|
|
||||||
|
// Which port do agents use to serve up test data to each other?
|
||||||
|
var AGENT_PORT = 18888;
|
||||||
|
|
||||||
|
// Payload size in bytes
|
||||||
|
var PAYLOAD_SIZE = 5000;
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
var ipaddr = require('ipaddr.js');
|
||||||
|
var os = require('os');
|
||||||
|
var http = require('http');
|
||||||
|
var async = require('async');
|
||||||
|
|
||||||
|
var express = require('express');
|
||||||
|
var app = express();
|
||||||
|
|
||||||
|
// Find our ZeroTier-assigned RFC4193 IPv6 address
|
||||||
|
var thisAgentId = null;
|
||||||
|
var interfaces = os.networkInterfaces();
|
||||||
|
if (!interfaces) {
|
||||||
|
console.error('FATAL: os.networkInterfaces() failed.');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
for(var ifname in interfaces) {
|
||||||
|
var ifaddrs = interfaces[ifname];
|
||||||
|
if (Array.isArray(ifaddrs)) {
|
||||||
|
for(var i=0;i<ifaddrs.length;++i) {
|
||||||
|
if (ifaddrs[i].family == 'IPv6') {
|
||||||
|
try {
|
||||||
|
var ipbytes = ipaddr.parse(ifaddrs[i].address).toByteArray();
|
||||||
|
if ((ipbytes.length === 16)&&(ipbytes[0] == 0xfd)&&(ipbytes[9] == 0x99)&&(ipbytes[10] == 0x93)) {
|
||||||
|
thisAgentId = '';
|
||||||
|
for(var j=0;j<16;++j) {
|
||||||
|
var tmp = ipbytes[j].toString(16);
|
||||||
|
if (tmp.length === 1)
|
||||||
|
thisAgentId += '0';
|
||||||
|
thisAgentId += tmp;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
console.error(e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (thisAgentId === null) {
|
||||||
|
console.error('FATAL: no ZeroTier-assigned RFC4193 IPv6 addresses found on any local interface!');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
//console.log(thisAgentId);
|
||||||
|
|
||||||
|
// Create a random (and therefore not very compressable) payload
|
||||||
|
var payload = new Buffer(PAYLOAD_SIZE);
|
||||||
|
for(var xx=0;xx<PAYLOAD_SIZE;++xx) {
|
||||||
|
payload.writeUInt8(Math.round(Math.random() * 255.0),xx);
|
||||||
|
}
|
||||||
|
|
||||||
|
function agentIdToIp(agentId)
|
||||||
|
{
|
||||||
|
var ip = '';
|
||||||
|
ip += agentId.substr(0,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(4,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(8,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(12,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(16,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(20,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(24,4);
|
||||||
|
ip += ':';
|
||||||
|
ip += agentId.substr(28,4);
|
||||||
|
return ip;
|
||||||
|
};
|
||||||
|
|
||||||
|
var lastTestResult = null;
|
||||||
|
var allOtherAgents = {};
|
||||||
|
|
||||||
|
function doTest()
|
||||||
|
{
|
||||||
|
var submit = http.request({
|
||||||
|
host: SERVER_HOST,
|
||||||
|
port: SERVER_PORT,
|
||||||
|
path: '/'+thisAgentId,
|
||||||
|
method: 'POST'
|
||||||
|
},function(res) {
|
||||||
|
var body = '';
|
||||||
|
res.on('data',function(chunk) { body += chunk.toString(); });
|
||||||
|
res.on('end',function() {
|
||||||
|
|
||||||
|
if (body) {
|
||||||
|
try {
|
||||||
|
var peers = JSON.parse(body);
|
||||||
|
if (Array.isArray(peers)) {
|
||||||
|
for(var xx=0;xx<peers.length;++xx)
|
||||||
|
allOtherAgents[peers[xx]] = true;
|
||||||
|
}
|
||||||
|
} catch (e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
var agents = Object.keys(allOtherAgents);
|
||||||
|
if (agents.length > 1) {
|
||||||
|
|
||||||
|
var target = agents[Math.floor(Math.random() * agents.length)];
|
||||||
|
while (target === thisAgentId)
|
||||||
|
target = agents[Math.floor(Math.random() * agents.length)];
|
||||||
|
|
||||||
|
var testRequest = null;
|
||||||
|
var timeoutId = null;
|
||||||
|
timeoutId = setTimeout(function() {
|
||||||
|
if (testRequest !== null)
|
||||||
|
testRequest.abort();
|
||||||
|
timeoutId = null;
|
||||||
|
},TEST_TIMEOUT);
|
||||||
|
var startTime = Date.now();
|
||||||
|
|
||||||
|
testRequest = http.get({
|
||||||
|
host: agentIdToIp(target),
|
||||||
|
port: AGENT_PORT,
|
||||||
|
path: '/'
|
||||||
|
},function(res) {
|
||||||
|
var bytes = 0;
|
||||||
|
res.on('data',function(chunk) { bytes += chunk.length; });
|
||||||
|
res.on('end',function() {
|
||||||
|
lastTestResult = {
|
||||||
|
source: thisAgentId,
|
||||||
|
target: target,
|
||||||
|
time: (Date.now() - startTime),
|
||||||
|
bytes: bytes,
|
||||||
|
timedOut: (timeoutId === null),
|
||||||
|
error: null
|
||||||
|
};
|
||||||
|
if (timeoutId !== null)
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
return setTimeout(doTest,Math.round(Math.random() * TEST_INTERVAL_MAX) + 1);
|
||||||
|
});
|
||||||
|
}).on('error',function(e) {
|
||||||
|
lastTestResult = {
|
||||||
|
source: thisAgentId,
|
||||||
|
target: target,
|
||||||
|
time: (Date.now() - startTime),
|
||||||
|
bytes: 0,
|
||||||
|
timedOut: (timeoutId === null),
|
||||||
|
error: e.toString()
|
||||||
|
};
|
||||||
|
if (timeoutId !== null)
|
||||||
|
clearTimeout(timeoutId);
|
||||||
|
return setTimeout(doTest,Math.round(Math.random() * TEST_INTERVAL_MAX) + 1);
|
||||||
|
});
|
||||||
|
|
||||||
|
} else {
|
||||||
|
return setTimeout(doTest,1000);
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
}).on('error',function(e) {
|
||||||
|
console.log('POST failed: '+e.toString());
|
||||||
|
return setTimeout(doTest,1000);
|
||||||
|
});
|
||||||
|
if (lastTestResult !== null) {
|
||||||
|
submit.write(JSON.stringify(lastTestResult));
|
||||||
|
lastTestResult = null;
|
||||||
|
}
|
||||||
|
submit.end();
|
||||||
|
};
|
||||||
|
|
||||||
|
// Agents just serve up a test payload
|
||||||
|
app.get('/',function(req,res) { return res.status(200).send(payload); });
|
||||||
|
|
||||||
|
var expressServer = app.listen(AGENT_PORT,function () {
|
||||||
|
// Start timeout-based loop
|
||||||
|
setTimeout(doTest(),TEST_STARTUP_LAG);
|
||||||
|
});
|
9
attic/big-http-test/big-test-kill.sh
Executable file
9
attic/big-http-test/big-test-kill.sh
Executable file
|
@ -0,0 +1,9 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Kills all running Docker containers on all big-test-hosts
|
||||||
|
|
||||||
|
export PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin:/sbin
|
||||||
|
|
||||||
|
pssh -h big-test-hosts -x '-t -t' -i -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -t 0 -p 256 "sudo docker ps -aq | xargs -r sudo docker rm -f"
|
||||||
|
|
||||||
|
exit 0
|
13
attic/big-http-test/big-test-start.sh
Executable file
13
attic/big-http-test/big-test-start.sh
Executable file
|
@ -0,0 +1,13 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# More than 500 container seems to result in a lot of sporadic failures, probably due to Linux kernel scaling issues with virtual network ports
|
||||||
|
# 250 with a 16GB RAM VM like Amazon m4.xlarge seems good
|
||||||
|
NUM_CONTAINERS=250
|
||||||
|
CONTAINER_IMAGE=zerotier/http-test
|
||||||
|
SCALE_UP_DELAY=10
|
||||||
|
|
||||||
|
export PATH=/bin:/usr/bin:/usr/local/bin:/usr/sbin:/sbin
|
||||||
|
|
||||||
|
pssh -h big-test-hosts -x '-t -t' -i -OUserKnownHostsFile=/dev/null -OStrictHostKeyChecking=no -t 0 -p 256 "sudo sysctl -w net.netfilter.nf_conntrack_max=262144 ; for ((n=0;n<$NUM_CONTAINERS;n++)); do sudo docker run --device=/dev/net/tun --privileged -d $CONTAINER_IMAGE; sleep $SCALE_UP_DELAY; done"
|
||||||
|
|
||||||
|
exit 0
|
65
attic/big-http-test/crunch-results.js
Normal file
65
attic/big-http-test/crunch-results.js
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
//
|
||||||
|
// Pipe the output of server.js into this to convert raw test results into bracketed statistics
|
||||||
|
// suitable for graphing.
|
||||||
|
//
|
||||||
|
|
||||||
|
// Time duration per statistical bracket
|
||||||
|
var BRACKET_SIZE = 10000;
|
||||||
|
|
||||||
|
// Number of bytes expected from each test
|
||||||
|
var EXPECTED_BYTES = 5000;
|
||||||
|
|
||||||
|
var readline = require('readline');
|
||||||
|
var rl = readline.createInterface({
|
||||||
|
input: process.stdin,
|
||||||
|
output: process.stdout,
|
||||||
|
terminal: false
|
||||||
|
});
|
||||||
|
|
||||||
|
var count = 0.0;
|
||||||
|
var overallCount = 0.0;
|
||||||
|
var totalFailures = 0.0;
|
||||||
|
var totalOverallFailures = 0.0;
|
||||||
|
var totalMs = 0;
|
||||||
|
var totalData = 0;
|
||||||
|
var devices = {};
|
||||||
|
var lastBracketTs = 0;
|
||||||
|
|
||||||
|
rl.on('line',function(line) {
|
||||||
|
line = line.trim();
|
||||||
|
var ls = line.split(',');
|
||||||
|
if (ls.length == 7) {
|
||||||
|
var ts = parseInt(ls[0]);
|
||||||
|
var fromId = ls[1];
|
||||||
|
var toId = ls[2];
|
||||||
|
var ms = parseFloat(ls[3]);
|
||||||
|
var bytes = parseInt(ls[4]);
|
||||||
|
var timedOut = (ls[5] == 'true') ? true : false;
|
||||||
|
var errMsg = ls[6];
|
||||||
|
|
||||||
|
count += 1.0;
|
||||||
|
overallCount += 1.0;
|
||||||
|
if ((bytes !== EXPECTED_BYTES)||(timedOut)) {
|
||||||
|
totalFailures += 1.0;
|
||||||
|
totalOverallFailures += 1.0;
|
||||||
|
}
|
||||||
|
totalMs += ms;
|
||||||
|
totalData += bytes;
|
||||||
|
|
||||||
|
devices[fromId] = true;
|
||||||
|
devices[toId] = true;
|
||||||
|
|
||||||
|
if (lastBracketTs === 0)
|
||||||
|
lastBracketTs = ts;
|
||||||
|
|
||||||
|
if (((ts - lastBracketTs) >= BRACKET_SIZE)&&(count > 0.0)) {
|
||||||
|
console.log(count.toString()+','+overallCount.toString()+','+(totalMs / count)+','+(totalFailures / count)+','+(totalOverallFailures / overallCount)+','+totalData+','+Object.keys(devices).length);
|
||||||
|
|
||||||
|
count = 0.0;
|
||||||
|
totalFailures = 0.0;
|
||||||
|
totalMs = 0;
|
||||||
|
totalData = 0;
|
||||||
|
lastBracketTs = ts;
|
||||||
|
}
|
||||||
|
} // else ignore junk
|
||||||
|
});
|
16
attic/big-http-test/docker-main.sh
Executable file
16
attic/big-http-test/docker-main.sh
Executable file
|
@ -0,0 +1,16 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
export PATH=/bin:/usr/bin:/usr/local/bin:/sbin:/usr/sbin
|
||||||
|
|
||||||
|
/zerotier-one -d >>zerotier-one.out 2>&1
|
||||||
|
|
||||||
|
# Wait for ZeroTier to start and join the network
|
||||||
|
while [ ! -d "/proc/sys/net/ipv6/conf/zt0" ]; do
|
||||||
|
sleep 0.25
|
||||||
|
done
|
||||||
|
|
||||||
|
# Wait just a bit longer for stuff to settle
|
||||||
|
sleep 5
|
||||||
|
|
||||||
|
exec node --harmony /agent.js >>agent.out 2>&1
|
||||||
|
#exec node --harmony /agent.js
|
6
attic/big-http-test/nodesource-el.repo
Normal file
6
attic/big-http-test/nodesource-el.repo
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
[nodesource]
|
||||||
|
name=Node.js Packages for Enterprise Linux 7 - $basearch
|
||||||
|
baseurl=https://rpm.nodesource.com/pub_4.x/el/7/$basearch
|
||||||
|
failovermethod=priority
|
||||||
|
enabled=1
|
||||||
|
gpgcheck=0
|
16
attic/big-http-test/package.json
Normal file
16
attic/big-http-test/package.json
Normal file
|
@ -0,0 +1,16 @@
|
||||||
|
{
|
||||||
|
"name": "zerotier-test-http",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"description": "ZeroTier in-network HTTP test",
|
||||||
|
"main": "agent.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"author": "ZeroTier, Inc.",
|
||||||
|
"license": "GPL-3.0",
|
||||||
|
"dependencies": {
|
||||||
|
"async": "^1.5.0",
|
||||||
|
"express": "^4.13.3",
|
||||||
|
"ipaddr.js": "^1.0.3"
|
||||||
|
}
|
||||||
|
}
|
53
attic/big-http-test/server.js
Normal file
53
attic/big-http-test/server.js
Normal file
|
@ -0,0 +1,53 @@
|
||||||
|
// ZeroTier distributed HTTP test coordinator and result-reporting server
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
// Customizable parameters:
|
||||||
|
|
||||||
|
var SERVER_PORT = 18080;
|
||||||
|
|
||||||
|
// ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
var fs = require('fs');
|
||||||
|
|
||||||
|
var express = require('express');
|
||||||
|
var app = express();
|
||||||
|
|
||||||
|
app.use(function(req,res,next) {
|
||||||
|
req.rawBody = '';
|
||||||
|
req.on('data', function(chunk) { req.rawBody += chunk.toString(); });
|
||||||
|
req.on('end', function() { return next(); });
|
||||||
|
});
|
||||||
|
|
||||||
|
var knownAgents = {};
|
||||||
|
|
||||||
|
app.post('/:agentId',function(req,res) {
|
||||||
|
var agentId = req.params.agentId;
|
||||||
|
if ((!agentId)||(agentId.length !== 32))
|
||||||
|
return res.status(404).send('');
|
||||||
|
|
||||||
|
if (req.rawBody) {
|
||||||
|
var receiveTime = Date.now();
|
||||||
|
var resultData = null;
|
||||||
|
try {
|
||||||
|
resultData = JSON.parse(req.rawBody);
|
||||||
|
console.log(Date.now().toString()+','+resultData.source+','+resultData.target+','+resultData.time+','+resultData.bytes+','+resultData.timedOut+',"'+((resultData.error) ? resultData.error : '')+'"');
|
||||||
|
} catch (e) {}
|
||||||
|
}
|
||||||
|
|
||||||
|
knownAgents[agentId] = true;
|
||||||
|
var thisUpdate = [];
|
||||||
|
var agents = Object.keys(knownAgents);
|
||||||
|
if (agents.length < 100)
|
||||||
|
thisUpdate = agents;
|
||||||
|
else {
|
||||||
|
for(var xx=0;xx<100;++xx)
|
||||||
|
thisUpdate.push(agents[Math.floor(Math.random() * agents.length)]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return res.status(200).send(JSON.stringify(thisUpdate));
|
||||||
|
});
|
||||||
|
|
||||||
|
var expressServer = app.listen(SERVER_PORT,function () {
|
||||||
|
console.log('LISTENING ON '+SERVER_PORT);
|
||||||
|
console.log('');
|
||||||
|
});
|
|
@ -1,17 +0,0 @@
|
||||||
CC=gcc
|
|
||||||
CXX=g++
|
|
||||||
|
|
||||||
#ARCH_FLAGS=-arch x86_64 -arch i386 -arch ppc
|
|
||||||
|
|
||||||
DEFS=-DHAS_DEV_URANDOM
|
|
||||||
CXXDEFS=-DBOOST_DISABLE_ASSERTS -DBOOST_NO_TYPEID -DNDEBUG
|
|
||||||
|
|
||||||
CFLAGS=-mmacosx-version-min=10.4 -std=c99 -O6 -ftree-vectorize -Wall $(DEFS) $(ARCH_FLAGS)
|
|
||||||
CXXFLAGS=-mmacosx-version-min=10.4 -Drestrict=__restrict__ -O6 -ftree-vectorize -Wall $(DEFS) $(CXXDEFS) $(ARCH_FLAGS)
|
|
||||||
|
|
||||||
LDFLAGS=-mmacosx-version-min=10.4 $(ARCH_FLAGS)
|
|
||||||
DLLFLAGS=$(ARCH_FLAGS) -shared
|
|
||||||
DLLEXT=dylib
|
|
||||||
|
|
||||||
LIBANODE_LIBS=-lcrypto -lpthread -lresolv
|
|
||||||
LIBSPARK_LIBS=-lz
|
|
|
@ -1,17 +0,0 @@
|
||||||
CC=gcc
|
|
||||||
CXX=g++
|
|
||||||
|
|
||||||
DEFS=-DHAS_DEV_URANDOM
|
|
||||||
|
|
||||||
CFLAGS=-std=c99 -O6 -fPIC -Wall $(DEFS)
|
|
||||||
CXXFLAGS=-Drestrict=__restrict__ -O6 -Wall $(DEFS) -I..
|
|
||||||
|
|
||||||
#CFLAGS=-g -Wall $(DEFS)
|
|
||||||
#CXXFLAGS=-g -Wall $(DEFS)
|
|
||||||
|
|
||||||
LDFLAGS=
|
|
||||||
DLLFLAGS=-shared
|
|
||||||
DLLEXT=so
|
|
||||||
|
|
||||||
LIBANODE_LIBS=-lcrypto -lresolv -pthread
|
|
||||||
LIBSPARK_LIBS=-lz
|
|
|
@ -1,764 +0,0 @@
|
||||||
*****************************************************************************
|
|
||||||
Anode Protocol Specification Draft
|
|
||||||
Version 0.8
|
|
||||||
|
|
||||||
(c)2009-2010 Adam Ierymenko
|
|
||||||
*****************************************************************************
|
|
||||||
|
|
||||||
Table of Contents
|
|
||||||
|
|
||||||
*****************************************************************************
|
|
||||||
|
|
||||||
1. Introduction
|
|
||||||
|
|
||||||
Anode provides three components that work together to provide a global,
|
|
||||||
secure, and mobile addressing system for computer networks:
|
|
||||||
|
|
||||||
1) An addressing system based on public key cryptography enabling network
|
|
||||||
devices or applications to assign themselves secure, unique, and globally
|
|
||||||
reachable network addresses in a flat address space.
|
|
||||||
|
|
||||||
2) A system enabling network participants holding global addresses to locate
|
|
||||||
one another on local or global networks with "zero configuration."
|
|
||||||
|
|
||||||
3) A communications protocol for communication between addressed network
|
|
||||||
participants that requires no special operating system support and no
|
|
||||||
changes to existing network infrastructure.
|
|
||||||
|
|
||||||
Using Anode, both fixed and mobile applications and devices can communicate
|
|
||||||
directly as if they were all connected to the same VPN. Anode restores the
|
|
||||||
original vision of the Internet as a "flat" network where anything can talk
|
|
||||||
to anything, and adds the added benefits of address mobility and strong
|
|
||||||
protection against address spoofing and other protocol level attacks.
|
|
||||||
|
|
||||||
1.1. Design Philosophy
|
|
||||||
|
|
||||||
Anode's design philosophy is the classical "KISS" principle: "Keep It Simple
|
|
||||||
Stupid." Anode's design principles are:
|
|
||||||
|
|
||||||
#1: Do not try to solve too many problems at once, and stay in scope.
|
|
||||||
|
|
||||||
Anode does not attempt to solve too many problems at once. It attempts to
|
|
||||||
solve the problems of mobile addressing, address portability, and "flat"
|
|
||||||
addressing in the presence of NAT or other barriers.
|
|
||||||
|
|
||||||
It does not attempt to duplicate the full functionality of SSL, X.509, SSH,
|
|
||||||
XMPP, an enterprise service bus, a pub/sub architecture, BitTorrent, etc. All
|
|
||||||
of those protocols and services can be used over Anode if their functionality
|
|
||||||
is desired.
|
|
||||||
|
|
||||||
#2: Avoid state management.
|
|
||||||
|
|
||||||
State multiplies the complexity and failure modes of network protocols. State
|
|
||||||
also tends to get in the way of the achievement of new features implicitly
|
|
||||||
(see principle #4). Avoid state whenever possible.
|
|
||||||
|
|
||||||
#3: Avoid algorithm and dependency bloat.
|
|
||||||
|
|
||||||
Anode uses only elliptic curve Diffie-Hellman (EC-DH) and AES-256. No other
|
|
||||||
cryptographic algorithms or hash functions are presently necessary. This
|
|
||||||
yields implementations compact enough for embedded devices.
|
|
||||||
|
|
||||||
Anode also requires few or no dependencies, depending on whether the two
|
|
||||||
needed cryptographic algorithms are obtained through a library or included.
|
|
||||||
No other protocols or libraries are required in an implementation.
|
|
||||||
|
|
||||||
#4: Achieve features implicitly.
|
|
||||||
|
|
||||||
Use a simple stateless design that allows features to be achieved implicitly
|
|
||||||
rather than specified explicitly. For example, Anode can do multi-homing and
|
|
||||||
could be used to build a mesh network, but neither of these features is
|
|
||||||
explicitly specified.
|
|
||||||
|
|
||||||
*****************************************************************************
|
|
||||||
|
|
||||||
2. Core Concepts and Algorithms
|
|
||||||
|
|
||||||
This section describes addresses, zones, common algorithms, and other core
|
|
||||||
concepts.
|
|
||||||
|
|
||||||
2.1. Zones
|
|
||||||
|
|
||||||
A zone is a 32-bit integer encoded into every Anode address. Zones serve to
|
|
||||||
assist in the location of peers by address on global IP networks. They are
|
|
||||||
not presently significant for local communications, though they could be
|
|
||||||
used to partition addresses into groups or link them with configuration
|
|
||||||
options.
|
|
||||||
|
|
||||||
Each zone has a corresponding zone file which can be fetched in a number of
|
|
||||||
ways (see below). A zone file is a flat text format dictionary of the format
|
|
||||||
"key=value" separated by carriage returns. Line feeds are ignored, and any
|
|
||||||
character may be escaped with a backslash (\) character. Blank lines are
|
|
||||||
ignored.
|
|
||||||
|
|
||||||
The following entries must appear in a zone file:
|
|
||||||
|
|
||||||
n=<zone name>
|
|
||||||
d=<zone description>
|
|
||||||
c=<zone contact, e-mail address of zone administrator>
|
|
||||||
r=<zone revision, monotonically increasing integer with each edit>
|
|
||||||
ttl=<seconds before zone file should be re-checked for changes>
|
|
||||||
|
|
||||||
Additional fields may appear as well, including fields specific to special
|
|
||||||
applications or protocols supported within the zone. Some of these are
|
|
||||||
defined in this document.
|
|
||||||
|
|
||||||
Zone file fetching mechanisms are described below. Multiple mechanisms are
|
|
||||||
specified to enable fallback in the event that one mechanism is not available.
|
|
||||||
|
|
||||||
2.1.1. Zone File Retrieval
|
|
||||||
|
|
||||||
Zone files are retrieved via HTTP, with the HTTP address being formed in one
|
|
||||||
of two ways.
|
|
||||||
|
|
||||||
The preferred DNS method:
|
|
||||||
|
|
||||||
To fetch a zone file via DNS, use the zone ID to generate a host name and URI
|
|
||||||
of the form:
|
|
||||||
|
|
||||||
http://a--XXXXXXXX.net/z
|
|
||||||
|
|
||||||
The XXXXXXXX field is the zone ID in hexadecimal.
|
|
||||||
|
|
||||||
The fallback IP method:
|
|
||||||
|
|
||||||
For fallback in the absence of DNS, the zone ID can be used directly as an
|
|
||||||
IPv4 or IPv4-mapped-to-IPv6 IP address. A URI is generated of the form:
|
|
||||||
|
|
||||||
http://ip_address/z
|
|
||||||
|
|
||||||
Support for this method requires that a zone ID be chosen to correspond to a
|
|
||||||
permanent IPv4 (preferably mappable to IPv6 space as well) IP address.
|
|
||||||
|
|
||||||
2.1.2. Zone ID Reservation
|
|
||||||
|
|
||||||
By convention, a zone ID is considered reserved when a domain of the form
|
|
||||||
"a--XXXXXXXX.net" (where XXXXXXXX is the ID in hex) is registered.
|
|
||||||
|
|
||||||
It is recommended that this be done even for zone IDs not used for global
|
|
||||||
address location in order to globally reserve them.
|
|
||||||
|
|
||||||
2.2. Addresses
|
|
||||||
|
|
||||||
Anode addresses are binary strings containing a 32-bit zone ID, a public key,
|
|
||||||
and possibly other fields. Only one address type is presently defined:
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Name | Type ID | Elliptic Curve Parameters | Total Length |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| ANODE-256-40 | 1 | NIST-P-256 | 40 |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Name | Binary Layout |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| ANODE-256-40 | <type[1]><zone[4]><unused[2]><public key[33]> |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
The public key is a "compressed" form elliptic curve public key as described
|
|
||||||
in RFC5480.
|
|
||||||
|
|
||||||
The unused section of the address must be zero. These bytes are reserved for
|
|
||||||
future use.
|
|
||||||
|
|
||||||
2.2.1. ASCII Format For Addresses
|
|
||||||
|
|
||||||
Addresses are encoded in ASCII using base-32, which provides a quotable and
|
|
||||||
printable encoding that is of manageable length and is case-insensitive. For
|
|
||||||
example, an ANODE-256-40 address is 64 characters long in base-32 encoding.
|
|
||||||
|
|
||||||
2.3. Relaying
|
|
||||||
|
|
||||||
An Anode peer may optionally relay packets to any other reachable peer.
|
|
||||||
Relaying is accomplished by sending a packet to a peer with the recipient set
|
|
||||||
to the final recipient. The receiving peer will, if relaying is allowed and if
|
|
||||||
it knows of or can reach the recipient, forward the packet.
|
|
||||||
|
|
||||||
No error is returned if relaying fails, so relay paths are treated as possible
|
|
||||||
paths for communication until a return is received in the same way as direct
|
|
||||||
paths.
|
|
||||||
|
|
||||||
Relaying can be used by peers to send messages indirectly, locate one
|
|
||||||
another, and determine network location information to facilitate the
|
|
||||||
establishment of direct communications.
|
|
||||||
|
|
||||||
Peers may refuse to relay or may limit the transmission rate at which packets
|
|
||||||
can be relayed.
|
|
||||||
|
|
||||||
2.3.1. Zone Relays
|
|
||||||
|
|
||||||
If a zone's addresses are globally reachable on global IP networks, it must
|
|
||||||
have one or more zone relays. These must have globally reachable public
|
|
||||||
static IP addresses.
|
|
||||||
|
|
||||||
Zone relays are specified in the zone file in the following format:
|
|
||||||
|
|
||||||
zr.<address checksum>=<ip>[,<ip>]:<udp port>:<tcp port>:<anode addresses>
|
|
||||||
|
|
||||||
The address checksum is the sum of the bytes in the Anode address modulus
|
|
||||||
the number of "zr" entries, in hexadecimal. For example, if a zone had four
|
|
||||||
global relays its zone file could contain the lines:
|
|
||||||
|
|
||||||
zr.0=1.2.3.4:4343:4344:klj4j3...
|
|
||||||
zr.1=2.3.4.5:4343:4344:00194j...
|
|
||||||
zr.2=3.4.5.6:4343:4344:1j42zz...
|
|
||||||
zr.3=4.5.6.7:4343:4344:z94j1q...
|
|
||||||
|
|
||||||
The relay would be chosen by taking the sum of the bytes in the address
|
|
||||||
modulo 4. For example, if the bytes of an address sum to 5081 then relay
|
|
||||||
zr.1 would be used to communicate with that address.
|
|
||||||
|
|
||||||
If more than one IP address is listed for a given relay, the peer must choose
|
|
||||||
at random from among the addresses of the desired type (IPv4 or IPv6).
|
|
||||||
|
|
||||||
Each relay must have one Anode address for every address type supported within
|
|
||||||
the zone. (At present there is only one address type defined.)
|
|
||||||
|
|
||||||
Peers should prefer UDP and fall back to TCP only if UDP is not available.
|
|
||||||
|
|
||||||
To make itself available, a peer must make itself known to its designated zone
|
|
||||||
relay. This is accomplished by sending a PING message.
|
|
||||||
|
|
||||||
2.4. Key Agreement and Derivation
|
|
||||||
|
|
||||||
Key agreement is performed using elliptic curve Diffie-Hellman. This yields
|
|
||||||
a raw key whose size depends on the elliptic curve parameters in use.
|
|
||||||
|
|
||||||
The following algorithm is used to derive a key of any length from a raw
|
|
||||||
key generated through key agreement:
|
|
||||||
|
|
||||||
1) Zero the derived key buffer.
|
|
||||||
2) Determine the largest of the original raw key or the derived key.
|
|
||||||
3) Loop from 0 to the largest length determined in step 2, XOR each byte of
|
|
||||||
the derived key buffer with the corresponding byte of the original key
|
|
||||||
buffer with each index being modulus the length of the respective buffer.
|
|
||||||
|
|
||||||
2.5. Message Authentication
|
|
||||||
|
|
||||||
For message authentication, CMAC-AES (with AES-256) is used. This is also
|
|
||||||
known in some literature as OMAC1-AES. The key is derived from key agreement
|
|
||||||
between the key pair of the sending peer and the address of the recipient.
|
|
||||||
|
|
||||||
2.6. AES-DIGEST
|
|
||||||
|
|
||||||
To maintain cryptographic algorithm frugality, a cryptographic hash function
|
|
||||||
is constructed from the AES-256 cipher. This hash function uses the common
|
|
||||||
Davis-Meyer construction with Merkle-Damgård length padding.
|
|
||||||
|
|
||||||
It is described by the following pseudocode:
|
|
||||||
|
|
||||||
byte previous_digest[16]
|
|
||||||
byte digest[16] = { 0,0,... }
|
|
||||||
byte block[32] = { 0,0,... }
|
|
||||||
integer block_counter = 0
|
|
||||||
|
|
||||||
; digest message
|
|
||||||
for each byte b of message
|
|
||||||
block[block_counter] = b
|
|
||||||
block_counter = block_counter + 1
|
|
||||||
if block_counter == 32 then
|
|
||||||
block_counter = 0
|
|
||||||
save digest[] in previous_digest[]
|
|
||||||
encrypt digest[] with aes-256 using block[] as 256-bit aes-256 key
|
|
||||||
xor digest[] with previous_digest[]
|
|
||||||
end if
|
|
||||||
next
|
|
||||||
|
|
||||||
; append end marker, do final block
|
|
||||||
block[block_counter] = 0x80
|
|
||||||
block_counter = block_counter + 1
|
|
||||||
zero rest of block[] from block_counter to 15
|
|
||||||
save digest[] in previous_digest[]
|
|
||||||
encrypt digest[] with aes-256 using block[] as 256-bit aes-256 key
|
|
||||||
xor digest[] with previous_digest[]
|
|
||||||
|
|
||||||
; Merkle-Damgård length padding
|
|
||||||
zero first 8 bytes of block[]
|
|
||||||
fill last 8 bytes of block[] w/64-bit length in big-endian order
|
|
||||||
save digest[] in previous_digest[]
|
|
||||||
encrypt digest[] with aes-256 using block[] as 256-bit aes-128 key
|
|
||||||
xor digest[] with previous_digest[]
|
|
||||||
|
|
||||||
; digest[] now contains 128-bit message digest
|
|
||||||
|
|
||||||
2.7. Short Address Identifiers (Address IDs)
|
|
||||||
|
|
||||||
A short 8-byte version of the Anode address is used in the protocol to reduce
|
|
||||||
transmission overhead when both sides are already aware of the other's full
|
|
||||||
address.
|
|
||||||
|
|
||||||
The short address identifier is formed by computing the AES-DIGEST of the
|
|
||||||
full address and then XORing the first 8 bytes of the digest with the last
|
|
||||||
8 bytes to yield an 8-byte shortened digest.
|
|
||||||
|
|
||||||
2.8. DNS Resolution of Anode Addresses
|
|
||||||
|
|
||||||
Anode addresses can be saved in DNS TXT records in the following format:
|
|
||||||
|
|
||||||
anode:<address in base32 ASCII encoding>
|
|
||||||
|
|
||||||
This permits Anode addresses to be resolved from normal DNS host name.
|
|
||||||
|
|
||||||
2.9. Packet Transmission Mechanisms
|
|
||||||
|
|
||||||
2.9.1. UDP Transmission
|
|
||||||
|
|
||||||
The recommended method of sending Anode packets is UDP. Each packet is simply
|
|
||||||
sent as a UDP packet.
|
|
||||||
|
|
||||||
2.9.2. TCP Transmission
|
|
||||||
|
|
||||||
To send packets over TCP, each packet is prefixed by its size as a 16-bit
|
|
||||||
integer.
|
|
||||||
|
|
||||||
2.9.3. HTTP Transmission
|
|
||||||
|
|
||||||
Anode packets may be submitted in HTTP POST transactions for transport over
|
|
||||||
networks where HTTP is the only available protocol.
|
|
||||||
|
|
||||||
Anode packets are simply prefixed with a 16-byte packet size and concatenated
|
|
||||||
together just as they are in a TCP stream. One or more packets may be sent
|
|
||||||
with each HTTP POST transaction for improved performance.
|
|
||||||
|
|
||||||
Since this method is intended for use in "hostile" or highly restricted
|
|
||||||
circumstances, no additional details such as special headers or MIME types
|
|
||||||
are specified to allow maximum flexibility. Peers should ignore anything
|
|
||||||
other than the payload.
|
|
||||||
|
|
||||||
2.10. Endpoints
|
|
||||||
|
|
||||||
An endpoint indicates a place where Anode packets may be sent. The following
|
|
||||||
endpoint types are specified:
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Endpoint Type | Description | Address Format |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| 0x00 | Unspecified | (none) |
|
|
||||||
| 0x01 | Ethernet | <mac[6]> |
|
|
||||||
| 0x02 | UDP/IPv4 | <ip[4]><port[2]> |
|
|
||||||
| 0x03 | TCP/IPv4 | <ip[4]><port[2]> |
|
|
||||||
| 0x04 | UDP/IPv6 | <ip[16]><port[2]> |
|
|
||||||
| 0x05 | TCP/IPv6 | <ip[16]><port[2]> |
|
|
||||||
| 0x06 | HTTP | <null-terminated full URI> |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Endpoints are encoded by beginning with a single byte indicating the endpoint
|
|
||||||
type followed by the address information required for the given type.
|
|
||||||
|
|
||||||
Note that IP ports bear no relationship to Anode protocol ports.
|
|
||||||
|
|
||||||
2.11. Notes
|
|
||||||
|
|
||||||
All integers in the protocol are transmitted in network (big endian) byte
|
|
||||||
order.
|
|
||||||
|
|
||||||
*****************************************************************************
|
|
||||||
|
|
||||||
3. Common Packet Format
|
|
||||||
|
|
||||||
A common header is used for all Anode packets:
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Hop Count | 1 | 8-bit hop count (not included in MAC) |
|
|
||||||
| Flags | 1 | 8-bit flags |
|
|
||||||
| MAC | 8 | 8 byte shortened CMAC-AES of packet |
|
|
||||||
| Sender Address | ? | Full address or short ID of sender |
|
|
||||||
| Recipient Address | ? | Full address or short ID of recipient |
|
|
||||||
| Peer IDs | 1 | Two 4-bit peer IDs: sender, recipient |
|
|
||||||
| Message Type | 1 | 8-bit message type |
|
|
||||||
| Message | ? | Message payload |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
3.1. Hop Count
|
|
||||||
|
|
||||||
The hop count begins at zero and must be incremented by each peer that relays
|
|
||||||
the packet to another peer. The hop count must not wrap to zero at 255.
|
|
||||||
|
|
||||||
Because the hop count is modified in transit, it is not included in MAC
|
|
||||||
calculation or authentication.
|
|
||||||
|
|
||||||
The hop count is used to prioritize endpoints that are direct over endpoints
|
|
||||||
that involve relaying, or to prioritize closer routes over more distant
|
|
||||||
ones.
|
|
||||||
|
|
||||||
3.2. Flags and Flag Behavior
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Flag | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| 0x01 | Sender address fully specified |
|
|
||||||
| 0x02 | Recipient address fully specified |
|
|
||||||
| 0x04 | Authentication error response |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
If flag 0x01 is set, then the sender address will be the full address rather
|
|
||||||
than a short address identifier. The length of the address can be determined
|
|
||||||
from the first byte of the address, which always specifies the address type.
|
|
||||||
Flag 0x02 has the same meaning for the recipient address.
|
|
||||||
|
|
||||||
A peer must send fully specified sender addresses until it receives a response
|
|
||||||
from the recipient. At this point the sender may assume that the recipient
|
|
||||||
knows its address and use short a short sender address instead. This
|
|
||||||
assumption should time out, with a recommended timeout of 60 seconds.
|
|
||||||
|
|
||||||
There is presently no need to send fully specified recipient addresses, but
|
|
||||||
the flag is present in case it is needed and must be honored.
|
|
||||||
|
|
||||||
Flag 0x04 indicates that this is an error response containing a failed
|
|
||||||
authentication error. Since authentication failed, this packet may not have
|
|
||||||
a valid MAC. Packets with this flag must never have any effect other than
|
|
||||||
to inform of an error. This error, since it is unauthenticated, must never
|
|
||||||
have any side effects such as terminating a connection.
|
|
||||||
|
|
||||||
3.3. MAC
|
|
||||||
|
|
||||||
The MAC is calculated as follows:
|
|
||||||
|
|
||||||
1) Temporarily set the 64-bit/8-byte MAC field in the packet to the packet's
|
|
||||||
size as a 64-bit big-endian integer.
|
|
||||||
2) Calculate the MAC for the entire packet (excluding the first byte) using
|
|
||||||
the key agreed upon between the sender and the recipient, resulting in a
|
|
||||||
16 byte full CMAC-AES MAC.
|
|
||||||
3) Derive the 8 byte packet MAC by XORing the first 8 bytes of the full 16
|
|
||||||
byte CMAC-AES MAC with the last 8 bytes. Place this into the packet's MAC
|
|
||||||
field.
|
|
||||||
|
|
||||||
3.4. Peer IDs
|
|
||||||
|
|
||||||
Peer IDs provide a method for up to 15 different peers to share an address,
|
|
||||||
each with a unique ID allowing packets to be routed to them individually.
|
|
||||||
|
|
||||||
A peer ID of zero indicates "any" or "unspecified." Real peers must have a
|
|
||||||
nonzero peer ID. In the normal single peer per address case, any peer ID may
|
|
||||||
be used. If multiple peers are to share an address, some implementation-
|
|
||||||
dependent method must be used to ensure that each peer has a unique peer ID.
|
|
||||||
|
|
||||||
Relaying peers must follow these rules based on the recipient peer ID when
|
|
||||||
relaying messages:
|
|
||||||
|
|
||||||
- IF the peer ID is zero or if the peer ID is not known, the message must
|
|
||||||
be forwarded to a random endpoint for the given recipient address.
|
|
||||||
- IF the peer ID is nonzero and matches one or more known endpoints for the
|
|
||||||
given recipient address and peer ID, the message must only be sent to
|
|
||||||
a matching endpoint.
|
|
||||||
|
|
||||||
A receiving peer should process any message that it receives regardless of
|
|
||||||
whether its recipient peer ID is correct. The peer ID is primarily for relays.
|
|
||||||
|
|
||||||
Peers should typically send messages with a nonzero recipient peer ID when
|
|
||||||
responding to or involved in a conversation with a specific peer (e.g. a
|
|
||||||
streaming connection), and send zero recipient peer IDs otherwise.
|
|
||||||
|
|
||||||
3.5. Short Address Conflict Disambiguation
|
|
||||||
|
|
||||||
In the unlikely event of two Anode addresses with the same short identifier,
|
|
||||||
the recipient should use MAC validation to disambiguate. The peer ID must not
|
|
||||||
be relied upon for this purpose.
|
|
||||||
|
|
||||||
*****************************************************************************
|
|
||||||
|
|
||||||
4. Basic Signaling and Transport Protocol
|
|
||||||
|
|
||||||
4.1. Message Types
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Type | ID | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| ERROR | 0x00 | Error response |
|
|
||||||
| PING | 0x01 | Echo request |
|
|
||||||
| PONG | 0x02 | Echo response |
|
|
||||||
| EPC_REQ | 0x03 | Endpoint check request |
|
|
||||||
| EPC | 0x04 | Endpoint check response |
|
|
||||||
| EPI | 0x05 | Endpoint information |
|
|
||||||
| NAT_T | 0x06 | NAT traversal message |
|
|
||||||
| NETID_REQ | 0x07 | Request network address identification and/or test |
|
|
||||||
| NETID | 0x08 | Response to network address identification request |
|
|
||||||
| DGRAM | 0x09 | Simple UDP-like datagram |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
4.2. Message Details
|
|
||||||
|
|
||||||
4.2.1. ERROR
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Error Code | 2 | 16-bit error code |
|
|
||||||
| Error Arguments | ? | Error arguments, depending on error type |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Error arguments are empty unless otherwise stated below.
|
|
||||||
|
|
||||||
Error codes:
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Error Code | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| 0x01 | Message not valid |
|
|
||||||
| 0x02 | Message authentication or decryption failed |
|
|
||||||
| 0x03 | Relaying and related features not authorized |
|
|
||||||
| 0x04 | Relay recipient not reachable |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Generation of errors is optional. A peer may choose to ignore invalid
|
|
||||||
messages or to throttle the sending of errors.
|
|
||||||
|
|
||||||
4.2.2. PING
|
|
||||||
|
|
||||||
(Payload unspecified.)
|
|
||||||
|
|
||||||
Request echo of payload as PONG message.
|
|
||||||
|
|
||||||
4.2.3. PONG
|
|
||||||
|
|
||||||
(Payload unspecified.)
|
|
||||||
|
|
||||||
Echoed payload of received PING message.
|
|
||||||
|
|
||||||
4.2.4. EPC_REQ
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Request ID | 4 | 32-bit request ID |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Request echo of request ID in EPC message, used to check and learn endpoints.
|
|
||||||
|
|
||||||
To learn a network endpoint for a peer, CHECK_REQ is sent. If CHECK is
|
|
||||||
returned with a valid request ID, the endpoint is considered valid.
|
|
||||||
|
|
||||||
4.2.5. EPC
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Request ID | 4 | 32-bit request ID echoed back |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Response to EPC_REQ containing request ID.
|
|
||||||
|
|
||||||
4.2.6. EPI
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Flags | 1 | 8-bit flags |
|
|
||||||
| Endpoint | ? | Endpoint type and address |
|
|
||||||
| NAT-T mode | 1 | 8-bit NAT traversal mode |
|
|
||||||
| NAT-T options | ? | Options related to specified NAT-T mode |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
EPI stands for EndPoint Identification, and is sent to notify another peer of
|
|
||||||
a network endpoint where the sending peer is reachable.
|
|
||||||
|
|
||||||
If the receiving peer is interested in communicating with the sending peer,
|
|
||||||
the receiving peer must send EPC_REQ to the sending peer at the specified
|
|
||||||
endpoint to check the validity of that endpoint. The endpoint is learned if a
|
|
||||||
valid EPC is returned.
|
|
||||||
|
|
||||||
If the endpoint in EPI is unspecified, the actual source of the EPI message
|
|
||||||
is the endpoint. This allows EPI messages to be broadcast on a local LAN
|
|
||||||
segment to advertise the presence of an address on a local network. EPI
|
|
||||||
broadcasts on local IP networks must be made to UDP port 8737.
|
|
||||||
|
|
||||||
Usually EPI is sent via relays (usually zone relays) to inform a peer of an
|
|
||||||
endpoint for direct communication.
|
|
||||||
|
|
||||||
There are presently no flags, so flags must be zero.
|
|
||||||
|
|
||||||
4.2.7. NAT_T
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| NAT-T mode | 1 | 8-bit NAT traversal mode |
|
|
||||||
| NAT-T options | ? | Options related to specified NAT-T mode |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
NAT_T is used to send messages specific to certain NAT traversal modes.
|
|
||||||
|
|
||||||
4.2.8. NETID_REQ
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Request ID | 4 | 32-bit request ID |
|
|
||||||
| Endpoint | ? | Endpoint type and address information |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
When a NETID_REQ message is received, the recipient attempts to echo it back
|
|
||||||
as a NETID message to the specified endpoint address. If the endpoint is
|
|
||||||
unspecified, the recipient must fill it in with the actual origin of the
|
|
||||||
NETID_REQ message. This allows a peer to cooperate with another peer (usually
|
|
||||||
a zone relay) to empirically determine its externally visible network
|
|
||||||
address information.
|
|
||||||
|
|
||||||
A peer may ignore NETID_REQ or respond with an error if it does not allow
|
|
||||||
relaying.
|
|
||||||
|
|
||||||
4.2.9. NETID
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Request ID | 4 | 32-bit request ID echoed back |
|
|
||||||
| Endpoint Type | 1 | 8-bit endpoint type |
|
|
||||||
| Endpoint Address | ? | Endpoint Address (size depends on type) |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
NETID is sent in response to NETID_REQ to the specified endpoint address. It
|
|
||||||
always contains the endpoint address to which it was sent.
|
|
||||||
|
|
||||||
4.2.10. DGRAM
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Source Port | 2 | 16-bit source port |
|
|
||||||
| Destination Port | 2 | 16-bit destination port |
|
|
||||||
| Payload | ? | Datagram packet payload |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
A datagram is a UDP-like message without flow control or delivery assurance.
|
|
||||||
|
|
||||||
*****************************************************************************
|
|
||||||
|
|
||||||
5. Stream Protocol
|
|
||||||
|
|
||||||
The stream protocol is very similar to TCP, though it omits some features
|
|
||||||
that are not required since they are taken care of by the encapsulating
|
|
||||||
protocol. SCTP was also an inspiration in the design.
|
|
||||||
|
|
||||||
5.1. Message Types
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Type | ID | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| S_OPEN | 20 | Initiate a streaming connection (like TCP SYN) |
|
|
||||||
| S_CLOSE | 21 | Terminate a streaming connection (like TCP RST/FIN) |
|
|
||||||
| S_DATA | 22 | Data packet |
|
|
||||||
| S_ACK | 23 | Acknowedge receipt of one or more data packets |
|
|
||||||
| S_DACK | 24 | Combination of DATA and ACK |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
5.2. Message Details
|
|
||||||
|
|
||||||
5.2.1. S_OPEN
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Sender Link ID | 2 | 16-bit sender link ID |
|
|
||||||
| Destination Port | 2 | 16-bit destination port |
|
|
||||||
| Window Size | 2 | 16-bit window size in 1024-byte increments |
|
|
||||||
| Init. Seq. Number | 4 | 32-bit initial sequence number |
|
|
||||||
| Flags | 1 | 8-bit flags |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
The OPEN message corresponds to TCP SYN, and initiates a connection. It
|
|
||||||
specifies the initial window size for the sender and the sender's initial
|
|
||||||
sequence number, which should be randomly chosen to prevent replay attacks.
|
|
||||||
|
|
||||||
If OPEN is successful, the recipient sends its own OPEN to establish the
|
|
||||||
connetion. If OPEN is unsuccessful, CLOSE is sent with its initial and current
|
|
||||||
sequence numbers equal and an appropriate reason such as "connection refused."
|
|
||||||
|
|
||||||
The sender link ID must be unique for a given recipient.
|
|
||||||
|
|
||||||
If flag 01 is set, the sender link ID is actually a source port where the
|
|
||||||
sender might be listening for connections as well. This exactly duplicates
|
|
||||||
the behavior of standard TCP. Otherwise, the sender link ID is simply an
|
|
||||||
arbitrary number that the sender uses to identify the connection with this
|
|
||||||
recipient and there is no port of origin. Ports of origin are optional for
|
|
||||||
Anode streaming connections to permit greater scalability.
|
|
||||||
|
|
||||||
5.2.2. S_CLOSE
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Sender Link ID | 2 | 16-bit sender link ID |
|
|
||||||
| Destination Port | 2 | 16-bit destination port |
|
|
||||||
| Flags | 1 | 8-bit flags |
|
|
||||||
| Reason | 1 | 8-bit close reason |
|
|
||||||
| Init. Seq. Number | 4 | 32-bit initial sequence number |
|
|
||||||
| Sequence Number | 4 | 32-bit current sequence number |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
The CLOSE message serves a function similar to TCP FIN. The initial sequence
|
|
||||||
number is the original starting sequence number sent with S_OPEN, while the
|
|
||||||
current sequence number is the sequence number corresponding to the close
|
|
||||||
and must be ACKed to complete the close operation. The use of the initial
|
|
||||||
sequence number helps to serve as a key to prevent replay attacks.
|
|
||||||
|
|
||||||
CLOSE is also used to indicate a failed OPEN attempt. In this case the current
|
|
||||||
sequence number will be equal to the initial sequence number and no ACK will
|
|
||||||
be expected.
|
|
||||||
|
|
||||||
There are currently no flags, so flags must be zero.
|
|
||||||
|
|
||||||
The reason field describes the reason for the close:
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Reason Code | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| 00 | Application closed connection |
|
|
||||||
| 01 | Connection refused |
|
|
||||||
| 02 | Protocol error |
|
|
||||||
| 03 | Timed out |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Established connections will usually be closed with reason 00, while reason
|
|
||||||
01 is usually provided if an OPEN is received but the port is not bound.
|
|
||||||
|
|
||||||
5.2.3. S_DATA
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Sender Link ID | 2 | 16-bit sender link ID |
|
|
||||||
| Destination Port | 2 | 16-bit destination port |
|
|
||||||
| Sequence Number | 4 | 32-bit sequence number |
|
|
||||||
| Payload | ? | Data payload |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
The DATA message carries a packet of data, with the sequence number
|
|
||||||
determining order. The sequence number is monotonically incremented with
|
|
||||||
each data packet, and wraps at the maximum value of an unsigned 32-bit
|
|
||||||
integer.
|
|
||||||
|
|
||||||
5.2.4. S_ACK
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Sender Link ID | 2 | 16-bit sender link ID |
|
|
||||||
| Destination Port | 2 | 16-bit destination port |
|
|
||||||
| Window Size | 2 | 16-bit window size in 1024-byte increments |
|
|
||||||
| Acknowledgements | ? | One or more acknowledgements (see below) |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
Each acknowledgement is a 32-bit integer followed by an 8-bit integer (5 bytes
|
|
||||||
total). The 32-bit integer is the first sequence number to acknowledge, and
|
|
||||||
the 8-bit integer is the number of sequential following sequence numbers to
|
|
||||||
acknowledge. For example "1, 4" would acknowledge sequence numbers 1, 2, 3,
|
|
||||||
and 4.
|
|
||||||
|
|
||||||
5.2.5. S_DACK
|
|
||||||
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Field | Length | Description |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
| Sender Link ID | 2 | 16-bit sender link ID |
|
|
||||||
| Destination Port | 2 | 16-bit destination port |
|
|
||||||
| Window Size | 2 | 16-bit window size in 1024-byte increments |
|
|
||||||
| Num. Acks | 1 | 8-bit number of acknowledgements |
|
|
||||||
| Acknowledgements | ? | One or more acknowledgements |
|
|
||||||
| Payload | ? | Data payload |
|
|
||||||
|---------------------------------------------------------------------------|
|
|
||||||
|
|
||||||
The DACK message combines ACK and DATA, allowing two peers that are both
|
|
||||||
transmitting data to efficiently ACK without a separate packet.
|
|
|
@ -1,33 +0,0 @@
|
||||||
SYSNAME:=${shell uname}
|
|
||||||
SYSNAME!=uname
|
|
||||||
include ../config.mk.${SYSNAME}
|
|
||||||
|
|
||||||
LIBANODE_OBJS= \
|
|
||||||
impl/aes.o \
|
|
||||||
impl/dictionary.o \
|
|
||||||
impl/dns_txt.o \
|
|
||||||
impl/ec.o \
|
|
||||||
impl/environment.o \
|
|
||||||
impl/misc.o \
|
|
||||||
impl/thread.o \
|
|
||||||
address.o \
|
|
||||||
aes_digest.o \
|
|
||||||
errors.o \
|
|
||||||
identity.o \
|
|
||||||
network_address.o \
|
|
||||||
secure_random.o \
|
|
||||||
system_transport.o \
|
|
||||||
uri.o
|
|
||||||
# zone.o
|
|
||||||
|
|
||||||
all: $(LIBANODE_OBJS)
|
|
||||||
ar rcs libanode.a $(LIBANODE_OBJS)
|
|
||||||
ranlib libanode.a
|
|
||||||
$(CC) $(CFLAGS) -o utils/anode-make-identity utils/anode-make-identity.c $(LIBANODE_OBJS) $(LIBANODE_LIBS)
|
|
||||||
|
|
||||||
clean: force
|
|
||||||
rm -f $(LIBANODE_OBJS)
|
|
||||||
rm -f libanode.$(DLLEXT) libanode.a
|
|
||||||
rm -f utils/anode-make-identity
|
|
||||||
|
|
||||||
force: ;
|
|
|
@ -1,98 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include "impl/aes.h"
|
|
||||||
#include "impl/ec.h"
|
|
||||||
#include "impl/misc.h"
|
|
||||||
#include "impl/types.h"
|
|
||||||
#include "anode.h"
|
|
||||||
|
|
||||||
int AnodeAddress_calc_short_id(
|
|
||||||
const AnodeAddress *address,
|
|
||||||
AnodeAddressId *short_address_id)
|
|
||||||
{
|
|
||||||
unsigned char digest[16];
|
|
||||||
|
|
||||||
switch(AnodeAddress_get_type(address)) {
|
|
||||||
case ANODE_ADDRESS_ANODE_256_40:
|
|
||||||
Anode_aes_digest(address->bits,ANODE_ADDRESS_LENGTH_ANODE_256_40,digest);
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return ANODE_ERR_ADDRESS_INVALID;
|
|
||||||
}
|
|
||||||
|
|
||||||
*((uint64_t *)short_address_id->bits) = ((uint64_t *)digest)[0] ^ ((uint64_t *)digest)[1];
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeAddress_get_zone(const AnodeAddress *address,AnodeZone *zone)
|
|
||||||
{
|
|
||||||
switch(AnodeAddress_get_type(address)) {
|
|
||||||
case ANODE_ADDRESS_ANODE_256_40:
|
|
||||||
*((uint32_t *)&(zone->bits[0])) = *((uint32_t *)&(address->bits[1]));
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
return ANODE_ERR_ADDRESS_INVALID;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeAddress_to_string(const AnodeAddress *address,char *buf,int len)
|
|
||||||
{
|
|
||||||
const unsigned char *inptr;
|
|
||||||
char *outptr;
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
switch(AnodeAddress_get_type(address)) {
|
|
||||||
case ANODE_ADDRESS_ANODE_256_40:
|
|
||||||
if (len < (((ANODE_ADDRESS_LENGTH_ANODE_256_40 / 5) * 8) + 1))
|
|
||||||
return ANODE_ERR_BUFFER_TOO_SMALL;
|
|
||||||
inptr = (const unsigned char *)address->bits;
|
|
||||||
outptr = buf;
|
|
||||||
for(i=0;i<(ANODE_ADDRESS_LENGTH_ANODE_256_40 / 5);++i) {
|
|
||||||
Anode_base32_5_to_8(inptr,outptr);
|
|
||||||
inptr += 5;
|
|
||||||
outptr += 8;
|
|
||||||
}
|
|
||||||
*outptr = (char)0;
|
|
||||||
return ((ANODE_ADDRESS_LENGTH_ANODE_256_40 / 5) * 8);
|
|
||||||
}
|
|
||||||
return ANODE_ERR_ADDRESS_INVALID;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeAddress_from_string(const char *str,AnodeAddress *address)
|
|
||||||
{
|
|
||||||
const char *blk_start = str;
|
|
||||||
const char *ptr = str;
|
|
||||||
unsigned int address_len = 0;
|
|
||||||
|
|
||||||
while (*ptr) {
|
|
||||||
if ((unsigned long)(ptr - blk_start) == 8) {
|
|
||||||
if ((address_len + 5) > sizeof(address->bits))
|
|
||||||
return ANODE_ERR_ADDRESS_INVALID;
|
|
||||||
Anode_base32_8_to_5(blk_start,(unsigned char *)&(address->bits[address_len]));
|
|
||||||
address_len += 5;
|
|
||||||
blk_start = ptr;
|
|
||||||
}
|
|
||||||
++ptr;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (ptr != blk_start)
|
|
||||||
return ANODE_ERR_ADDRESS_INVALID;
|
|
||||||
if (AnodeAddress_get_type(address) != ANODE_ADDRESS_ANODE_256_40)
|
|
||||||
return ANODE_ERR_ADDRESS_INVALID;
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
|
@ -1,85 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include "anode.h"
|
|
||||||
#include "impl/aes.h"
|
|
||||||
#include "impl/misc.h"
|
|
||||||
#include "impl/types.h"
|
|
||||||
|
|
||||||
void Anode_aes_digest(const void *const message,unsigned long message_len,void *const hash)
|
|
||||||
{
|
|
||||||
unsigned char previous_digest[16];
|
|
||||||
unsigned char digest[16];
|
|
||||||
unsigned char block[32];
|
|
||||||
const unsigned char *in = (const unsigned char *)message;
|
|
||||||
const unsigned char *end = in + message_len;
|
|
||||||
unsigned long block_counter;
|
|
||||||
AnodeAesExpandedKey expkey;
|
|
||||||
|
|
||||||
((uint64_t *)digest)[0] = 0ULL;
|
|
||||||
((uint64_t *)digest)[1] = 0ULL;
|
|
||||||
((uint64_t *)block)[0] = 0ULL;
|
|
||||||
((uint64_t *)block)[1] = 0ULL;
|
|
||||||
((uint64_t *)block)[2] = 0ULL;
|
|
||||||
((uint64_t *)block)[3] = 0ULL;
|
|
||||||
|
|
||||||
/* Davis-Meyer hash function built from block cipher */
|
|
||||||
block_counter = 0;
|
|
||||||
while (in != end) {
|
|
||||||
block[block_counter++] = *(in++);
|
|
||||||
if (block_counter == 32) {
|
|
||||||
block_counter = 0;
|
|
||||||
((uint64_t *)previous_digest)[0] = ((uint64_t *)digest)[0];
|
|
||||||
((uint64_t *)previous_digest)[1] = ((uint64_t *)digest)[1];
|
|
||||||
Anode_aes256_expand_key(block,&expkey);
|
|
||||||
Anode_aes256_encrypt(&expkey,digest,digest);
|
|
||||||
((uint64_t *)digest)[0] ^= ((uint64_t *)previous_digest)[0];
|
|
||||||
((uint64_t *)digest)[1] ^= ((uint64_t *)previous_digest)[1];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Davis-Meyer end marker */
|
|
||||||
block[block_counter++] = 0x80;
|
|
||||||
while (block_counter != 32) block[block_counter++] = 0;
|
|
||||||
((uint64_t *)previous_digest)[0] = ((uint64_t *)digest)[0];
|
|
||||||
((uint64_t *)previous_digest)[1] = ((uint64_t *)digest)[1];
|
|
||||||
Anode_aes256_expand_key(block,&expkey);
|
|
||||||
Anode_aes256_encrypt(&expkey,digest,digest);
|
|
||||||
((uint64_t *)digest)[0] ^= ((uint64_t *)previous_digest)[0];
|
|
||||||
((uint64_t *)digest)[1] ^= ((uint64_t *)previous_digest)[1];
|
|
||||||
|
|
||||||
/* Merkle-Damgård length padding */
|
|
||||||
((uint64_t *)block)[0] = 0ULL;
|
|
||||||
if (sizeof(message_len) >= 8) { /* 32/64 bit? this will get optimized out */
|
|
||||||
block[8] = (uint8_t)((uint64_t)message_len >> 56);
|
|
||||||
block[9] = (uint8_t)((uint64_t)message_len >> 48);
|
|
||||||
block[10] = (uint8_t)((uint64_t)message_len >> 40);
|
|
||||||
block[11] = (uint8_t)((uint64_t)message_len >> 32);
|
|
||||||
} else ((uint32_t *)block)[2] = 0;
|
|
||||||
block[12] = (uint8_t)(message_len >> 24);
|
|
||||||
block[13] = (uint8_t)(message_len >> 16);
|
|
||||||
block[14] = (uint8_t)(message_len >> 8);
|
|
||||||
block[15] = (uint8_t)message_len;
|
|
||||||
((uint64_t *)previous_digest)[0] = ((uint64_t *)digest)[0];
|
|
||||||
((uint64_t *)previous_digest)[1] = ((uint64_t *)digest)[1];
|
|
||||||
Anode_aes256_expand_key(block,&expkey);
|
|
||||||
Anode_aes256_encrypt(&expkey,digest,digest);
|
|
||||||
((uint64_t *)digest)[0] ^= ((uint64_t *)previous_digest)[0];
|
|
||||||
((uint64_t *)digest)[1] ^= ((uint64_t *)previous_digest)[1];
|
|
||||||
|
|
||||||
((uint64_t *)hash)[0] = ((uint64_t *)digest)[0];
|
|
||||||
((uint64_t *)hash)[1] = ((uint64_t *)digest)[1];
|
|
||||||
}
|
|
|
@ -1,795 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#ifndef _ANODE_ANODE_H
|
|
||||||
#define _ANODE_ANODE_H
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef NULL
|
|
||||||
#define NULL ((void *)0)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ANODE_ADDRESS_LENGTH_ANODE_256_40 40
|
|
||||||
#define ANODE_ADDRESS_MAX_LENGTH 40
|
|
||||||
#define ANODE_ADDRESS_SECRET_LENGTH_ANODE_256_40 32
|
|
||||||
#define ANODE_ADDRESS_MAX_SECRET_LENGTH 32
|
|
||||||
|
|
||||||
#define ANODE_ADDRESS_ID_LENGTH 8
|
|
||||||
#define ANODE_ZONE_LENGTH 4
|
|
||||||
|
|
||||||
#define ANODE_ERR_NONE 0
|
|
||||||
#define ANODE_ERR_INVALID_ARGUMENT (-10000)
|
|
||||||
#define ANODE_ERR_OUT_OF_MEMORY (-10001)
|
|
||||||
#define ANODE_ERR_INVALID_URI (-10002)
|
|
||||||
#define ANODE_ERR_BUFFER_TOO_SMALL (-10003)
|
|
||||||
#define ANODE_ERR_ADDRESS_INVALID (-10010)
|
|
||||||
#define ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED (-10011)
|
|
||||||
#define ANODE_ERR_CONNECTION_CLOSED (-10012)
|
|
||||||
#define ANODE_ERR_CONNECTION_CLOSED_BY_REMOTE (-10013)
|
|
||||||
#define ANODE_ERR_CONNECT_FAILED (-10014)
|
|
||||||
#define ANODE_ERR_UNABLE_TO_BIND (-10015)
|
|
||||||
#define ANODE_ERR_TOO_MANY_OPEN_SOCKETS (-10016)
|
|
||||||
#define ANODE_ERR_DNS_NAME_NOT_FOUND_OR_TIMED_OUT (-10017)
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get a human-readable error description for an error code
|
|
||||||
*
|
|
||||||
* The value of 'err' can be either negative or positive.
|
|
||||||
*
|
|
||||||
* @param err Error code
|
|
||||||
* @return Human-readable description
|
|
||||||
*/
|
|
||||||
extern const char *Anode_strerror(int err);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* Secure random source */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Opaque secure random instance
|
|
||||||
*/
|
|
||||||
typedef void AnodeSecureRandom;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initialize a secure random source
|
|
||||||
*
|
|
||||||
* No cleanup/destructor is necessary.
|
|
||||||
*
|
|
||||||
* @param srng Random structure to initialize
|
|
||||||
*/
|
|
||||||
extern AnodeSecureRandom *AnodeSecureRandom_new();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate random bytes
|
|
||||||
*
|
|
||||||
* @param srng Secure random source
|
|
||||||
* @param buf Buffer to fill
|
|
||||||
* @param count Number of bytes to generate
|
|
||||||
*/
|
|
||||||
extern void AnodeSecureRandom_gen_bytes(AnodeSecureRandom *srng,void *buf,long count);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Destroy and free a secure random instance
|
|
||||||
*
|
|
||||||
* @param srng Secure random source
|
|
||||||
*/
|
|
||||||
extern void AnodeSecureRandom_delete(AnodeSecureRandom *srng);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* AES-256 derived Davis-Meyer hash function */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Digest a message using AES-DIGEST to yield a 16-byte hash code
|
|
||||||
*
|
|
||||||
* @param message Message to digest
|
|
||||||
* @param message_len Length of message in bytes
|
|
||||||
* @param hash Buffer to store 16 byte hash code
|
|
||||||
*/
|
|
||||||
extern void Anode_aes_digest(
|
|
||||||
const void *const message,
|
|
||||||
unsigned long message_len,
|
|
||||||
void *const hash);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* Address Types and Components */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Anode address
|
|
||||||
*
|
|
||||||
* The first byte always identifies the address type, which right now can
|
|
||||||
* only be type 1 (ANODE-256-40).
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char bits[ANODE_ADDRESS_MAX_LENGTH];
|
|
||||||
} AnodeAddress;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 8-byte short Anode address ID
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char bits[ANODE_ADDRESS_ID_LENGTH];
|
|
||||||
} AnodeAddressId;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 4-byte Anode zone ID
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char bits[ANODE_ZONE_LENGTH];
|
|
||||||
} AnodeZone;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Anode address types
|
|
||||||
*/
|
|
||||||
enum AnodeAddressType
|
|
||||||
{
|
|
||||||
ANODE_ADDRESS_ANODE_256_40 = 1
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the type of an Anode address
|
|
||||||
*
|
|
||||||
* This is a shortcut macro for just looking at the first byte and casting
|
|
||||||
* it to the AnodeAddressType enum.
|
|
||||||
*
|
|
||||||
* @param a Pointer to address
|
|
||||||
* @return Type as enum AnodeAddressType
|
|
||||||
*/
|
|
||||||
#define AnodeAddress_get_type(a) ((enum AnodeAddressType)((a)->bits[0]))
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculate the short 8 byte address ID from an address
|
|
||||||
*
|
|
||||||
* @param address Binary address
|
|
||||||
* @param short_address_id Buffer to store 8-byte short address ID
|
|
||||||
* @return 0 on success or error code on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeAddress_calc_short_id(
|
|
||||||
const AnodeAddress *address,
|
|
||||||
AnodeAddressId *short_address_id);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extract the zone from an anode address
|
|
||||||
*
|
|
||||||
* @param address Binary address
|
|
||||||
* @param zone Zone value-result parameter to fill on success
|
|
||||||
* @return 0 on success or error code on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeAddress_get_zone(const AnodeAddress *address,AnodeZone *zone);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert an address to an ASCII string
|
|
||||||
*
|
|
||||||
* Anode addresses are 64 characters in ASCII form, so the buffer should
|
|
||||||
* have 65 bytes of space.
|
|
||||||
*
|
|
||||||
* @param address Address to convert
|
|
||||||
* @param buf Buffer to receive address in string form (should have 65 bytes of space)
|
|
||||||
* @param len Length of buffer
|
|
||||||
* @return Length of resulting string or a negative error code on error
|
|
||||||
*/
|
|
||||||
extern int AnodeAddress_to_string(const AnodeAddress *address,char *buf,int len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert a string into an address
|
|
||||||
*
|
|
||||||
* @param str Address in string form
|
|
||||||
* @param address Address buffer to receive result
|
|
||||||
* @return Zero on sucess or error code on error
|
|
||||||
*/
|
|
||||||
extern int AnodeAddress_from_string(const char *str,AnodeAddress *address);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Supported network address types
|
|
||||||
*/
|
|
||||||
enum AnodeNetworkAddressType
|
|
||||||
{
|
|
||||||
ANODE_NETWORK_ADDRESS_IPV4 = 0,
|
|
||||||
ANODE_NETWORK_ADDRESS_IPV6 = 1,
|
|
||||||
ANODE_NETWORK_ADDRESS_ETHERNET = 2, /* reserved but unused */
|
|
||||||
ANODE_NETWORK_ADDRESS_USB = 3, /* reserved but unused */
|
|
||||||
ANODE_NETWORK_ADDRESS_BLUETOOTH = 4, /* reserved but unused */
|
|
||||||
ANODE_NETWORK_ADDRESS_IPC = 5, /* reserved but unused */
|
|
||||||
ANODE_NETWORK_ADDRESS_80211S = 6, /* reserved but unused */
|
|
||||||
ANODE_NETWORK_ADDRESS_SERIAL = 7, /* reserved but unused */
|
|
||||||
ANODE_NETWORK_ADDRESS_ANODE_256_40 = 8
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Anode network address
|
|
||||||
*
|
|
||||||
* This can contain an address of any type: IPv4, IPv6, or Anode, and is used
|
|
||||||
* with the common transport API.
|
|
||||||
*
|
|
||||||
* The length of the address stored in bits[] is determined by the type.
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
enum AnodeNetworkAddressType type;
|
|
||||||
char bits[ANODE_ADDRESS_MAX_LENGTH];
|
|
||||||
} AnodeNetworkAddress;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* An endpoint with an address and a port
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
AnodeNetworkAddress address;
|
|
||||||
int port;
|
|
||||||
} AnodeNetworkEndpoint;
|
|
||||||
|
|
||||||
/* Constants for binding to any address (v4 or v6) */
|
|
||||||
extern const AnodeNetworkAddress AnodeNetworkAddress_IP_ANY_V4;
|
|
||||||
extern const AnodeNetworkAddress AnodeNetworkAddress_IP_ANY_V6;
|
|
||||||
|
|
||||||
/* Local host address in v4 and v6 */
|
|
||||||
extern const AnodeNetworkAddress AnodeNetworkAddress_IP_LOCAL_V4;
|
|
||||||
extern const AnodeNetworkAddress AnodeNetworkAddress_IP_LOCAL_V6;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert a network address to an ASCII string
|
|
||||||
*
|
|
||||||
* The buffer must have room for a 15 character string for IPv4, a 40 byte
|
|
||||||
* string for IPv6, and a 64 byte string for Anode addresses. This does not
|
|
||||||
* include the trailing null.
|
|
||||||
*
|
|
||||||
* @param address Address to convert
|
|
||||||
* @param buf Buffer to receive address in string form
|
|
||||||
* @param len Length of buffer
|
|
||||||
* @return Length of resulting string or a negative error code on error
|
|
||||||
*/
|
|
||||||
extern int AnodeNetworkAddress_to_string(const AnodeNetworkAddress *address,char *buf,int len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert a string into a network address of the correct type
|
|
||||||
*
|
|
||||||
* @param str Address in string form
|
|
||||||
* @param address Address buffer to receive result
|
|
||||||
* @return Zero on sucess or error code on error
|
|
||||||
*/
|
|
||||||
extern int AnodeNetworkAddress_from_string(const char *str,AnodeNetworkAddress *address);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fill a network endpoint from a C-API sockaddr structure
|
|
||||||
*
|
|
||||||
* The argument must be struct sockaddr_in for IPv4 or sockaddr_in6 for IPv6.
|
|
||||||
* The common sin_family field will be used to differentiate.
|
|
||||||
*
|
|
||||||
* @param sockaddr Pointer to proper sockaddr structure
|
|
||||||
* @param endpoint Endpoint structure to fill
|
|
||||||
* @return Zero on success or error on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeNetworkEndpoint_from_sockaddr(const void *sockaddr,AnodeNetworkEndpoint *endpoint);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Fill a sockaddr from a network endpoint
|
|
||||||
*
|
|
||||||
* To support either IPv4 or IPv6 addresses, there is a sockaddr_storage
|
|
||||||
* structure in most C APIs. If you supply anything other than an IP address
|
|
||||||
* such as an Anode address, this will return an error.
|
|
||||||
*
|
|
||||||
* @param endpoint Endpoint structure to convert
|
|
||||||
* @param sockaddr Sockaddr structure storage
|
|
||||||
* @param sockaddr_len Length of sockaddr structure storage in bytes
|
|
||||||
* @return Zero on success or error on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeNetworkEndpoint_to_sockaddr(const AnodeNetworkEndpoint *endpoint,void *sockaddr,int sockaddr_len);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* Identity Generation and Management */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Anode identity structure containing address and secret key
|
|
||||||
*
|
|
||||||
* This structure is memcpy-safe, and its members are accessible.
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
/* The public Anode address */
|
|
||||||
AnodeAddress address;
|
|
||||||
|
|
||||||
/* Short address ID */
|
|
||||||
AnodeAddressId address_id;
|
|
||||||
|
|
||||||
/* The secret key corresponding with the public address */
|
|
||||||
/* Secret length is determined by address type */
|
|
||||||
char secret[ANODE_ADDRESS_MAX_SECRET_LENGTH];
|
|
||||||
} AnodeIdentity;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Generate a new identity
|
|
||||||
*
|
|
||||||
* This generates a public/private key pair and from that generates an
|
|
||||||
* identity containing an address and a secret key.
|
|
||||||
*
|
|
||||||
* @param identity Destination structure to store new identity
|
|
||||||
* @param zone Zone ID
|
|
||||||
* @param type Type of identity to generate
|
|
||||||
* @return Zero on success, error on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeIdentity_generate(
|
|
||||||
AnodeIdentity *identity,
|
|
||||||
const AnodeZone *zone,
|
|
||||||
enum AnodeAddressType type);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert an Anode identity to a string representation
|
|
||||||
*
|
|
||||||
* @param identity Identity to convert
|
|
||||||
* @param dest String buffer
|
|
||||||
* @param dest_len Length of string buffer
|
|
||||||
* @return Length of string created or negative error code on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeIdentity_to_string(
|
|
||||||
const AnodeIdentity *identity,
|
|
||||||
char *dest,
|
|
||||||
int dest_len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Convert a string representation to an Anode identity structure
|
|
||||||
*
|
|
||||||
* @param identity Destination structure to fill
|
|
||||||
* @param str C-string containing string representation
|
|
||||||
* @return Zero on success or negative error code on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeIdentity_from_string(
|
|
||||||
AnodeIdentity *identity,
|
|
||||||
const char *str);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* Transport API */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
struct _AnodeTransport;
|
|
||||||
typedef struct _AnodeTransport AnodeTransport;
|
|
||||||
struct _AnodeEvent;
|
|
||||||
typedef struct _AnodeEvent AnodeEvent;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Anode socket
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
/* Type of socket (read-only) */
|
|
||||||
enum {
|
|
||||||
ANODE_SOCKET_DATAGRAM = 1,
|
|
||||||
ANODE_SOCKET_STREAM_LISTEN = 2,
|
|
||||||
ANODE_SOCKET_STREAM_CONNECTION = 3
|
|
||||||
} type;
|
|
||||||
|
|
||||||
/* Socket state */
|
|
||||||
enum {
|
|
||||||
ANODE_SOCKET_CLOSED = 0,
|
|
||||||
ANODE_SOCKET_OPEN = 1,
|
|
||||||
ANODE_SOCKET_CONNECTING = 2,
|
|
||||||
} state;
|
|
||||||
|
|
||||||
/* Local address or remote address for stream connections (read-only) */
|
|
||||||
AnodeNetworkEndpoint endpoint;
|
|
||||||
|
|
||||||
/* Name of owning class (read-only) */
|
|
||||||
const char *class_name;
|
|
||||||
|
|
||||||
/* Pointers for end user use (writable) */
|
|
||||||
void *user_ptr[2];
|
|
||||||
|
|
||||||
/* Special handler to receive events or null for default (writable) */
|
|
||||||
void (*event_handler)(const AnodeEvent *event);
|
|
||||||
} AnodeSocket;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Anode transport I/O event
|
|
||||||
*/
|
|
||||||
struct _AnodeEvent
|
|
||||||
{
|
|
||||||
enum {
|
|
||||||
ANODE_TRANSPORT_EVENT_DATAGRAM_RECEIVED = 1,
|
|
||||||
ANODE_TRANSPORT_EVENT_STREAM_INCOMING_CONNECT = 2,
|
|
||||||
ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_ESTABLISHED = 3,
|
|
||||||
ANODE_TRANSPORT_EVENT_STREAM_OUTGOING_CONNECT_FAILED = 4,
|
|
||||||
ANODE_TRANSPORT_EVENT_STREAM_CLOSED = 5,
|
|
||||||
ANODE_TRANSPORT_EVENT_STREAM_DATA_RECEIVED = 6,
|
|
||||||
ANODE_TRANSPORT_EVENT_STREAM_AVAILABLE_FOR_WRITE = 7,
|
|
||||||
ANODE_TRANSPORT_EVENT_DNS_RESULT = 8
|
|
||||||
} type;
|
|
||||||
|
|
||||||
AnodeTransport *transport;
|
|
||||||
|
|
||||||
/* Anode socket corresponding to this event */
|
|
||||||
AnodeSocket *sock;
|
|
||||||
|
|
||||||
/* Originating endpoint for incoming datagrams */
|
|
||||||
AnodeNetworkEndpoint *datagram_from;
|
|
||||||
|
|
||||||
/* DNS lookup results */
|
|
||||||
const char *dns_name;
|
|
||||||
AnodeNetworkAddress *dns_addresses;
|
|
||||||
int dns_address_count;
|
|
||||||
|
|
||||||
/* Error code or 0 for none */
|
|
||||||
int error_code;
|
|
||||||
|
|
||||||
/* Data for incoming datagrams and stream received events */
|
|
||||||
int data_length;
|
|
||||||
char *data;
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enum used for dns_resolve method in transport to specify query rules
|
|
||||||
*
|
|
||||||
* This can be specified for ipv4, ipv6, and Anode address types to tell the
|
|
||||||
* DNS resolver when to bother querying for addresses of the given type.
|
|
||||||
* NEVER means to never query for this type, and ALWAYS means to always
|
|
||||||
* query. IF_NO_PREVIOUS means to query for this type if no addresses were
|
|
||||||
* found in previous queries. Addresses are queried in the order of ipv4,
|
|
||||||
* ipv6, then Anode, so if you specify IF_NO_PREVIOUS for all three you will
|
|
||||||
* get addresses in that order of priority.
|
|
||||||
*/
|
|
||||||
enum AnodeTransportDnsIncludeMode
|
|
||||||
{
|
|
||||||
ANODE_TRANSPORT_DNS_QUERY_NEVER = 0,
|
|
||||||
ANODE_TRANSPORT_DNS_QUERY_ALWAYS = 1,
|
|
||||||
ANODE_TRANSPORT_DNS_QUERY_IF_NO_PREVIOUS = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
struct _AnodeTransport
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Set the default event handler
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @param event_handler Default event handler
|
|
||||||
*/
|
|
||||||
void (*set_default_event_handler)(AnodeTransport *transport,
|
|
||||||
void (*event_handler)(const AnodeEvent *event));
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Enqueue a function to be executed during a subsequent call to poll()
|
|
||||||
*
|
|
||||||
* This can be called from other threads, so it can be used to pass a
|
|
||||||
* message to the I/O thread in multithreaded applications.
|
|
||||||
*
|
|
||||||
* If it is called from the same thread, the function is still queued to be
|
|
||||||
* run later rather than being run instantly.
|
|
||||||
*
|
|
||||||
* The order in which invoked functions are called is undefined.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @param ptr Arbitrary pointer to pass to function to be called
|
|
||||||
* @param func Function to be called
|
|
||||||
*/
|
|
||||||
void (*invoke)(AnodeTransport *transport,
|
|
||||||
void *ptr,
|
|
||||||
void (*func)(void *));
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initiate a forward DNS query
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param name DNS name to query
|
|
||||||
* @param event_handler Event handler or null for default event path
|
|
||||||
* @param ipv4_include_mode Inclusion mode for IPv4 addresses
|
|
||||||
* @param ipv6_include_mode Inclusion mode for IPv6 addresses
|
|
||||||
* @param anode_include_mode Inclusion mode for Anode addresses
|
|
||||||
*/
|
|
||||||
void (*dns_resolve)(AnodeTransport *transport,
|
|
||||||
const char *name,
|
|
||||||
void (*event_handler)(const AnodeEvent *),
|
|
||||||
enum AnodeTransportDnsIncludeMode ipv4_include_mode,
|
|
||||||
enum AnodeTransportDnsIncludeMode ipv6_include_mode,
|
|
||||||
enum AnodeTransportDnsIncludeMode anode_include_mode);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open a datagram socket
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param local_address Local address to bind
|
|
||||||
* @param local_port Local port to bind
|
|
||||||
* @param error_code Value-result parameter to receive error code on error
|
|
||||||
* @return Listen socket or null if error (check error_code in error case)
|
|
||||||
*/
|
|
||||||
AnodeSocket *(*datagram_listen)(AnodeTransport *transport,
|
|
||||||
const AnodeNetworkAddress *local_address,
|
|
||||||
int local_port,
|
|
||||||
int *error_code);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Open a socket to listen for incoming stream connections
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param local_address Local address to bind
|
|
||||||
* @param local_port Local port to bind
|
|
||||||
* @param error_code Value-result parameter to receive error code on error
|
|
||||||
* @return Listen socket or null if error (check error_code in error case)
|
|
||||||
*/
|
|
||||||
AnodeSocket *(*stream_listen)(AnodeTransport *transport,
|
|
||||||
const AnodeNetworkAddress *local_address,
|
|
||||||
int local_port,
|
|
||||||
int *error_code);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send a datagram to a network endpoint
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param socket Originating datagram socket
|
|
||||||
* @param data Data to send
|
|
||||||
* @param data_len Length of data to send
|
|
||||||
* @param to_endpoint Destination endpoint
|
|
||||||
* @return Zero on success or error code on error
|
|
||||||
*/
|
|
||||||
int (*datagram_send)(AnodeTransport *transport,
|
|
||||||
AnodeSocket *sock,
|
|
||||||
const void *data,
|
|
||||||
int data_len,
|
|
||||||
const AnodeNetworkEndpoint *to_endpoint);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Initiate an outgoing stream connection attempt
|
|
||||||
*
|
|
||||||
* For IPv4 and IPv6 addresses, this will initiate a TCP connection. For
|
|
||||||
* Anode addresses, Anode's internal streaming protocol will be used.
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param to_endpoint Destination endpoint
|
|
||||||
* @param error_code Error code value-result parameter, filled on error
|
|
||||||
* @return Stream socket object or null on error (check error_code)
|
|
||||||
*/
|
|
||||||
AnodeSocket *(*stream_connect)(AnodeTransport *transport,
|
|
||||||
const AnodeNetworkEndpoint *to_endpoint,
|
|
||||||
int *error_code);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicate that you are interested in writing to a stream
|
|
||||||
*
|
|
||||||
* This does nothing if the socket is not a stream connection or is not
|
|
||||||
* connected.
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param sock Stream connection
|
|
||||||
*/
|
|
||||||
void (*stream_start_writing)(AnodeTransport *transport,
|
|
||||||
AnodeSocket *sock);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Indicate that you are no longer interested in writing to a stream
|
|
||||||
*
|
|
||||||
* This does nothing if the socket is not a stream connection or is not
|
|
||||||
* connected.
|
|
||||||
*
|
|
||||||
* @param transport Transport instance
|
|
||||||
* @param sock Stream connection
|
|
||||||
*/
|
|
||||||
void (*stream_stop_writing)(AnodeTransport *transport,
|
|
||||||
AnodeSocket *sock);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Send data to a stream connection
|
|
||||||
*
|
|
||||||
* This must be called after a stream is indicated to be ready for writing.
|
|
||||||
* It returns the number of bytes actually written, or a negative error
|
|
||||||
* code on failure.
|
|
||||||
*
|
|
||||||
* A return value of zero can occur here, and simply indicates that nothing
|
|
||||||
* was sent. This may occur with certain network stacks on certain
|
|
||||||
* platforms.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @param sock Stream socket
|
|
||||||
* @param data Data to send
|
|
||||||
* @param data_len Maximum data to send in bytes
|
|
||||||
* @return Actual data sent or negative error code on error
|
|
||||||
*/
|
|
||||||
int (*stream_send)(AnodeTransport *transport,
|
|
||||||
AnodeSocket *sock,
|
|
||||||
const void *data,
|
|
||||||
int data_len);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Close a socket
|
|
||||||
*
|
|
||||||
* If the socket is a stream connection in the connected state, this
|
|
||||||
* will generate a stream closed event with a zero error_code to indicate
|
|
||||||
* a normal close.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @param sock Socket object
|
|
||||||
*/
|
|
||||||
void (*close)(AnodeTransport *transport,
|
|
||||||
AnodeSocket *sock);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Run main polling loop
|
|
||||||
*
|
|
||||||
* This should be called repeatedly from the I/O thread of your main
|
|
||||||
* process. It blocks until one or more events occur, and then returns
|
|
||||||
* the number of events. Error returns here are fatal and indicate
|
|
||||||
* serious problems such as build or platform issues or a lack of any
|
|
||||||
* network interface.
|
|
||||||
*
|
|
||||||
* Functions queued with invoke() are also called inside here.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @return Number of events handled or negative on (fatal) error
|
|
||||||
*/
|
|
||||||
int (*poll)(AnodeTransport *transport);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check whether transport supports an address type
|
|
||||||
*
|
|
||||||
* Inheriting classes should call their base if they do not natively
|
|
||||||
* speak the specified type.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @param at Address type
|
|
||||||
* @return Nonzero if true
|
|
||||||
*/
|
|
||||||
int (*supports_address_type)(const AnodeTransport *transport,
|
|
||||||
enum AnodeNetworkAddressType at);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the instance of AnodeTransport under this one (if any)
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @return Base instance or null if none
|
|
||||||
*/
|
|
||||||
AnodeTransport *(*base_instance)(const AnodeTransport *transport);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @return Class name of this instance
|
|
||||||
*/
|
|
||||||
const char *(*class_name)(AnodeTransport *transport);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Delete this transport and its base transports
|
|
||||||
*
|
|
||||||
* The 'transport' pointer and any streams or sockets it owns are no longer
|
|
||||||
* valid after this call.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
*/
|
|
||||||
void (*delete)(AnodeTransport *transport);
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a new system transport
|
|
||||||
*
|
|
||||||
* This is the default base for AnodeTransport, and it is constructed
|
|
||||||
* automatically if 'base' is null in AnodeTransport_new(). However, it also
|
|
||||||
* exposed to the user so that specialized transports (such as those that use
|
|
||||||
* proxy servers) can be developed on top of it. These in turn can be supplied
|
|
||||||
* as 'base' to AnodeTransport_new() to talk Anode over these transports.
|
|
||||||
*
|
|
||||||
* The system transport supports IP protocols and possibly others.
|
|
||||||
*
|
|
||||||
* @param base Base class or null for none (usually null)
|
|
||||||
* @return Base transport engine instance
|
|
||||||
*/
|
|
||||||
extern AnodeTransport *AnodeSystemTransport_new(AnodeTransport *base);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Construct a new Anode core transport
|
|
||||||
*
|
|
||||||
* This is the transport that talks Anode using the specified base transport.
|
|
||||||
* Requests for other address types are passed through to the base. If the
|
|
||||||
* base is null, an instance of AnodeSystemTransport is used.
|
|
||||||
*
|
|
||||||
* Since transport engines inherit their functionality, this transport
|
|
||||||
* will also do standard IP and everything else that the system transport
|
|
||||||
* supports. Most users will just want to construct this with a null base.
|
|
||||||
*
|
|
||||||
* @param base Base transport to use, or null to use SystemTransport
|
|
||||||
* @return Anode transport engine or null on error
|
|
||||||
*/
|
|
||||||
extern AnodeTransport *AnodeCoreTransport_new(AnodeTransport *base);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* URI Parser */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* URI broken down by component
|
|
||||||
*/
|
|
||||||
typedef struct
|
|
||||||
{
|
|
||||||
char scheme[8];
|
|
||||||
char username[64];
|
|
||||||
char password[64];
|
|
||||||
char host[128];
|
|
||||||
char path[256];
|
|
||||||
char query[256];
|
|
||||||
char fragment[64];
|
|
||||||
int port;
|
|
||||||
} AnodeURI;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* URI parser
|
|
||||||
*
|
|
||||||
* A buffer too small error will occur if any field is too large for the
|
|
||||||
* AnodeURI structure.
|
|
||||||
*
|
|
||||||
* @param parsed_uri Structure to fill with parsed URI data
|
|
||||||
* @param uri_string URI in string format
|
|
||||||
* @return Zero on success or error on failure
|
|
||||||
*/
|
|
||||||
extern int AnodeURI_parse(AnodeURI *parsed_uri,const char *uri_string);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Output a URI in string format
|
|
||||||
*
|
|
||||||
* @param uri URI to output as string
|
|
||||||
* @param buf Buffer to store URI string
|
|
||||||
* @param len Length of buffer
|
|
||||||
* @return Buffer or null on error
|
|
||||||
*/
|
|
||||||
extern char *AnodeURI_to_string(const AnodeURI *uri,char *buf,int len);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
/* Zone File Lookup and Dictionary */
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Zone file dictionary
|
|
||||||
*/
|
|
||||||
typedef void AnodeZoneFile;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Start asynchronous zone fetch
|
|
||||||
*
|
|
||||||
* When the zone is retrieved, the lookup handler is called. If zone lookup
|
|
||||||
* failed, the zone file argument to the handler will be null.
|
|
||||||
*
|
|
||||||
* @param transport Transport engine
|
|
||||||
* @param zone Zone ID
|
|
||||||
* @param user_ptr User pointer
|
|
||||||
* @param zone_lookup_handler Handler for Anode zone lookup
|
|
||||||
*/
|
|
||||||
extern void AnodeZoneFile_lookup(
|
|
||||||
AnodeTransport *transport,
|
|
||||||
const AnodeZone *zone,
|
|
||||||
void *ptr,
|
|
||||||
void (*zone_lookup_handler)(const AnodeZone *,AnodeZoneFile *,void *));
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Look up a key in a zone file
|
|
||||||
*
|
|
||||||
* @param zone Zone file object
|
|
||||||
* @param key Key to get in zone file
|
|
||||||
*/
|
|
||||||
extern const char *AnodeZoneFile_get(const AnodeZoneFile *zone,const char *key);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Free a zone file
|
|
||||||
*
|
|
||||||
* @param zone Zone to free
|
|
||||||
*/
|
|
||||||
extern void AnodeZoneFile_free(AnodeZoneFile *zone);
|
|
||||||
|
|
||||||
/* ----------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,52 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include "anode.h"
|
|
||||||
|
|
||||||
struct AnodeErrDesc
|
|
||||||
{
|
|
||||||
int code;
|
|
||||||
const char *desc;
|
|
||||||
};
|
|
||||||
|
|
||||||
#define TOTAL_ERRORS 12
|
|
||||||
static const struct AnodeErrDesc ANODE_ERRORS[TOTAL_ERRORS] = {
|
|
||||||
{ ANODE_ERR_NONE, "No error (success)" },
|
|
||||||
{ ANODE_ERR_INVALID_ARGUMENT, "Invalid argument" },
|
|
||||||
{ ANODE_ERR_OUT_OF_MEMORY, "Out of memory" },
|
|
||||||
{ ANODE_ERR_INVALID_URI, "Invalid URI" },
|
|
||||||
{ ANODE_ERR_BUFFER_TOO_SMALL, "Supplied buffer too small" },
|
|
||||||
{ ANODE_ERR_ADDRESS_INVALID, "Address invalid" },
|
|
||||||
{ ANODE_ERR_ADDRESS_TYPE_NOT_SUPPORTED, "Address type not supported"},
|
|
||||||
{ ANODE_ERR_CONNECTION_CLOSED, "Connection closed"},
|
|
||||||
{ ANODE_ERR_CONNECT_FAILED, "Connect failed"},
|
|
||||||
{ ANODE_ERR_UNABLE_TO_BIND, "Unable to bind to address"},
|
|
||||||
{ ANODE_ERR_TOO_MANY_OPEN_SOCKETS, "Too many open sockets"},
|
|
||||||
{ ANODE_ERR_DNS_NAME_NOT_FOUND_OR_TIMED_OUT, "DNS name not found or timed out"}
|
|
||||||
};
|
|
||||||
|
|
||||||
extern const char *Anode_strerror(int err)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
int negerr = -err;
|
|
||||||
|
|
||||||
for(i=0;i<TOTAL_ERRORS;++i) {
|
|
||||||
if ((ANODE_ERRORS[i].code == err)||(ANODE_ERRORS[i].code == negerr))
|
|
||||||
return ANODE_ERRORS[i].desc;
|
|
||||||
}
|
|
||||||
|
|
||||||
return "Unknown error";
|
|
||||||
}
|
|
|
@ -1,110 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include "impl/types.h"
|
|
||||||
#include "impl/ec.h"
|
|
||||||
#include "impl/misc.h"
|
|
||||||
#include "anode.h"
|
|
||||||
|
|
||||||
int AnodeIdentity_generate(AnodeIdentity *identity,const AnodeZone *zone,enum AnodeAddressType type)
|
|
||||||
{
|
|
||||||
struct AnodeECKeyPair kp;
|
|
||||||
|
|
||||||
switch(type) {
|
|
||||||
case ANODE_ADDRESS_ANODE_256_40:
|
|
||||||
if (!AnodeECKeyPair_generate(&kp))
|
|
||||||
return ANODE_ERR_OUT_OF_MEMORY;
|
|
||||||
|
|
||||||
identity->address.bits[0] = (unsigned char)ANODE_ADDRESS_ANODE_256_40;
|
|
||||||
|
|
||||||
identity->address.bits[1] = zone->bits[0];
|
|
||||||
identity->address.bits[2] = zone->bits[1];
|
|
||||||
identity->address.bits[3] = zone->bits[2];
|
|
||||||
identity->address.bits[4] = zone->bits[3];
|
|
||||||
|
|
||||||
identity->address.bits[5] = 0;
|
|
||||||
identity->address.bits[6] = 0;
|
|
||||||
|
|
||||||
Anode_memcpy((void *)&(identity->address.bits[7]),(const void *)kp.pub.key,ANODE_EC_PUBLIC_KEY_BYTES);
|
|
||||||
Anode_memcpy((void *)identity->secret,(const void *)kp.priv.key,kp.priv.bytes);
|
|
||||||
|
|
||||||
AnodeAddress_calc_short_id(&identity->address,&identity->address_id);
|
|
||||||
|
|
||||||
AnodeECKeyPair_destroy(&kp);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ANODE_ERR_INVALID_ARGUMENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeIdentity_to_string(const AnodeIdentity *identity,char *dest,int dest_len)
|
|
||||||
{
|
|
||||||
char hexbuf[128];
|
|
||||||
char strbuf[128];
|
|
||||||
int n;
|
|
||||||
|
|
||||||
if ((n = AnodeAddress_to_string(&identity->address,strbuf,sizeof(strbuf))) <= 0)
|
|
||||||
return n;
|
|
||||||
|
|
||||||
switch(AnodeAddress_get_type(&identity->address)) {
|
|
||||||
case ANODE_ADDRESS_ANODE_256_40:
|
|
||||||
Anode_to_hex((const unsigned char *)identity->secret,ANODE_ADDRESS_SECRET_LENGTH_ANODE_256_40,hexbuf,sizeof(hexbuf));
|
|
||||||
n = snprintf(dest,dest_len,"ANODE-256-40:%s:%s",strbuf,hexbuf);
|
|
||||||
if (n >= dest_len)
|
|
||||||
return ANODE_ERR_BUFFER_TOO_SMALL;
|
|
||||||
return n;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ANODE_ERR_INVALID_ARGUMENT;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeIdentity_from_string(AnodeIdentity *identity,const char *str)
|
|
||||||
{
|
|
||||||
char buf[1024];
|
|
||||||
char *id_name;
|
|
||||||
char *address;
|
|
||||||
char *secret;
|
|
||||||
int ec;
|
|
||||||
|
|
||||||
Anode_str_copy(buf,str,sizeof(buf));
|
|
||||||
|
|
||||||
id_name = buf;
|
|
||||||
if (!id_name) return 0;
|
|
||||||
if (!*id_name) return 0;
|
|
||||||
address = (char *)Anode_strchr(id_name,':');
|
|
||||||
if (!address) return 0;
|
|
||||||
if (!*address) return 0;
|
|
||||||
*(address++) = (char)0;
|
|
||||||
secret = (char *)Anode_strchr(address,':');
|
|
||||||
if (!secret) return 0;
|
|
||||||
if (!*secret) return 0;
|
|
||||||
*(secret++) = (char)0;
|
|
||||||
|
|
||||||
if (Anode_strcaseeq("ANODE-256-40",id_name)) {
|
|
||||||
if ((ec = AnodeAddress_from_string(address,&identity->address)))
|
|
||||||
return ec;
|
|
||||||
if (Anode_strlen(secret) != (ANODE_ADDRESS_SECRET_LENGTH_ANODE_256_40 * 2))
|
|
||||||
return ANODE_ERR_INVALID_ARGUMENT;
|
|
||||||
Anode_from_hex(secret,(unsigned char *)identity->secret,sizeof(identity->secret));
|
|
||||||
AnodeAddress_calc_short_id(&identity->address,&identity->address_id);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ANODE_ERR_INVALID_ARGUMENT;
|
|
||||||
}
|
|
|
@ -1,72 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include "aes.h"
|
|
||||||
|
|
||||||
void Anode_cmac_aes256(
|
|
||||||
const AnodeAesExpandedKey *expkey,
|
|
||||||
const unsigned char *restrict data,
|
|
||||||
unsigned long data_len,
|
|
||||||
unsigned char *restrict mac)
|
|
||||||
{
|
|
||||||
unsigned char cbc[16];
|
|
||||||
unsigned char pad[16];
|
|
||||||
const unsigned char *restrict pos = data;
|
|
||||||
unsigned long i;
|
|
||||||
unsigned long remaining = data_len;
|
|
||||||
unsigned char c;
|
|
||||||
|
|
||||||
((uint64_t *)((void *)cbc))[0] = 0ULL;
|
|
||||||
((uint64_t *)((void *)cbc))[1] = 0ULL;
|
|
||||||
|
|
||||||
while (remaining >= 16) {
|
|
||||||
((uint64_t *)((void *)cbc))[0] ^= ((uint64_t *)((void *)pos))[0];
|
|
||||||
((uint64_t *)((void *)cbc))[1] ^= ((uint64_t *)((void *)pos))[1];
|
|
||||||
pos += 16;
|
|
||||||
if (remaining > 16)
|
|
||||||
Anode_aes256_encrypt(expkey,cbc,cbc);
|
|
||||||
remaining -= 16;
|
|
||||||
}
|
|
||||||
|
|
||||||
((uint64_t *)((void *)pad))[0] = 0ULL;
|
|
||||||
((uint64_t *)((void *)pad))[1] = 0ULL;
|
|
||||||
Anode_aes256_encrypt(expkey,pad,pad);
|
|
||||||
|
|
||||||
c = pad[0] & 0x80;
|
|
||||||
for(i=0;i<15;++i)
|
|
||||||
pad[i] = (pad[i] << 1) | (pad[i + 1] >> 7);
|
|
||||||
pad[15] <<= 1;
|
|
||||||
if (c)
|
|
||||||
pad[15] ^= 0x87;
|
|
||||||
|
|
||||||
if (remaining||(!data_len)) {
|
|
||||||
for(i=0;i<remaining;++i)
|
|
||||||
cbc[i] ^= *(pos++);
|
|
||||||
cbc[remaining] ^= 0x80;
|
|
||||||
|
|
||||||
c = pad[0] & 0x80;
|
|
||||||
for(i=0;i<15;++i)
|
|
||||||
pad[i] = (pad[i] << 1) | (pad[i + 1] >> 7);
|
|
||||||
pad[15] <<= 1;
|
|
||||||
if (c)
|
|
||||||
pad[15] ^= 0x87;
|
|
||||||
}
|
|
||||||
|
|
||||||
((uint64_t *)((void *)mac))[0] = ((uint64_t *)((void *)pad))[0] ^ ((uint64_t *)((void *)cbc))[0];
|
|
||||||
((uint64_t *)((void *)mac))[1] = ((uint64_t *)((void *)pad))[1] ^ ((uint64_t *)((void *)cbc))[1];
|
|
||||||
|
|
||||||
Anode_aes256_encrypt(expkey,mac,mac);
|
|
||||||
}
|
|
|
@ -1,64 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#ifndef _ANODE_AES_H
|
|
||||||
#define _ANODE_AES_H
|
|
||||||
|
|
||||||
#include <openssl/aes.h>
|
|
||||||
#include "types.h"
|
|
||||||
|
|
||||||
/* This just glues us to OpenSSL's built-in AES-256 implementation */
|
|
||||||
|
|
||||||
#define ANODE_AES_BLOCK_SIZE 16
|
|
||||||
#define ANODE_AES_KEY_SIZE 32
|
|
||||||
|
|
||||||
typedef AES_KEY AnodeAesExpandedKey;
|
|
||||||
|
|
||||||
#define Anode_aes256_expand_key(k,ek) AES_set_encrypt_key((const unsigned char *)(k),256,(AES_KEY *)(ek))
|
|
||||||
|
|
||||||
/* Note: in and out can be the same thing */
|
|
||||||
#define Anode_aes256_encrypt(ek,in,out) AES_encrypt((const unsigned char *)(in),(unsigned char *)(out),(const AES_KEY *)(ek))
|
|
||||||
|
|
||||||
/* Note: iv is modified */
|
|
||||||
static inline void Anode_aes256_cfb_encrypt(
|
|
||||||
const AnodeAesExpandedKey *expkey,
|
|
||||||
const unsigned char *in,
|
|
||||||
unsigned char *out,
|
|
||||||
unsigned char *iv,
|
|
||||||
unsigned long len)
|
|
||||||
{
|
|
||||||
int tmp = 0;
|
|
||||||
AES_cfb128_encrypt(in,out,len,(const AES_KEY *)expkey,iv,&tmp,AES_ENCRYPT);
|
|
||||||
}
|
|
||||||
static inline void Anode_aes256_cfb_decrypt(
|
|
||||||
const AnodeAesExpandedKey *expkey,
|
|
||||||
const unsigned char *in,
|
|
||||||
unsigned char *out,
|
|
||||||
unsigned char *iv,
|
|
||||||
unsigned long len)
|
|
||||||
{
|
|
||||||
int tmp = 0;
|
|
||||||
AES_cfb128_encrypt(in,out,len,(const AES_KEY *)expkey,iv,&tmp,AES_DECRYPT);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* CMAC message authentication code */
|
|
||||||
void Anode_cmac_aes256(
|
|
||||||
const AnodeAesExpandedKey *expkey,
|
|
||||||
const unsigned char *restrict data,
|
|
||||||
unsigned long data_len,
|
|
||||||
unsigned char *restrict mac);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,239 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include "dictionary.h"
|
|
||||||
|
|
||||||
static const char *EMPTY_STR = "";
|
|
||||||
|
|
||||||
void AnodeDictionary_clear(struct AnodeDictionary *d)
|
|
||||||
{
|
|
||||||
struct AnodeDictionaryEntry *e,*ne;
|
|
||||||
int oldcs;
|
|
||||||
unsigned int i;
|
|
||||||
|
|
||||||
oldcs = d->case_sensitive;
|
|
||||||
|
|
||||||
for(i=0;i<ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE;++i) {
|
|
||||||
e = d->ht[i];
|
|
||||||
while (e) {
|
|
||||||
ne = e->next;
|
|
||||||
if ((e->key)&&(e->key != EMPTY_STR)) free((void *)e->key);
|
|
||||||
if ((e->value)&&(e->value != EMPTY_STR)) free((void *)e->value);
|
|
||||||
free((void *)e);
|
|
||||||
e = ne;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Anode_zero((void *)d,sizeof(struct AnodeDictionary));
|
|
||||||
|
|
||||||
d->case_sensitive = oldcs;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeDictionary_put(struct AnodeDictionary *d,const char *key,const char *value)
|
|
||||||
{
|
|
||||||
struct AnodeDictionaryEntry *e;
|
|
||||||
char *p1;
|
|
||||||
const char *p2;
|
|
||||||
unsigned int bucket = (d->case_sensitive) ? AnodeDictionary__get_bucket(key) : AnodeDictionary__get_bucket_ci(key);
|
|
||||||
unsigned int len,i;
|
|
||||||
|
|
||||||
e = d->ht[bucket];
|
|
||||||
while (e) {
|
|
||||||
if (((d->case_sensitive) ? Anode_streq(key,e->key) : Anode_strcaseeq(key,e->key))) {
|
|
||||||
if (!d->case_sensitive) {
|
|
||||||
p1 = e->key;
|
|
||||||
p2 = key;
|
|
||||||
while (*p2) *(p1++) = *(p2++);
|
|
||||||
}
|
|
||||||
|
|
||||||
len = 0;
|
|
||||||
while (value[len]) ++len;
|
|
||||||
if (len) {
|
|
||||||
if ((e->value)&&(e->value != EMPTY_STR))
|
|
||||||
e->value = (char *)realloc((void *)e->value,len + 1);
|
|
||||||
else e->value = (char *)malloc(len + 1);
|
|
||||||
for(i=0;i<len;++i) e->value[i] = value[i];
|
|
||||||
e->value[i] = (char)0;
|
|
||||||
} else {
|
|
||||||
if ((e->value)&&(e->value != EMPTY_STR)) free((void *)e->value);
|
|
||||||
e->value = (char *)EMPTY_STR;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
e = e->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
e = (struct AnodeDictionaryEntry *)malloc(sizeof(struct AnodeDictionaryEntry));
|
|
||||||
|
|
||||||
len = 0;
|
|
||||||
while (key[len]) ++len;
|
|
||||||
if (len) {
|
|
||||||
e->key = (char *)malloc(len + 1);
|
|
||||||
for(i=0;i<len;++i) e->key[i] = key[i];
|
|
||||||
e->key[i] = (char)0;
|
|
||||||
} else e->key = (char *)EMPTY_STR;
|
|
||||||
|
|
||||||
len = 0;
|
|
||||||
while (value[len]) ++len;
|
|
||||||
if (len) {
|
|
||||||
e->value = (char *)malloc(len + 1);
|
|
||||||
for(i=0;i<len;++i) e->value[i] = value[i];
|
|
||||||
e->value[i] = (char)0;
|
|
||||||
} else e->value = (char *)EMPTY_STR;
|
|
||||||
|
|
||||||
e->next = d->ht[bucket];
|
|
||||||
d->ht[bucket] = e;
|
|
||||||
|
|
||||||
++d->size;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeDictionary_read(
|
|
||||||
struct AnodeDictionary *d,
|
|
||||||
char *in,
|
|
||||||
const char *line_breaks,
|
|
||||||
const char *kv_breaks,
|
|
||||||
const char *comment_chars,
|
|
||||||
char escape_char,
|
|
||||||
int trim_whitespace_from_keys,
|
|
||||||
int trim_whitespace_from_values)
|
|
||||||
{
|
|
||||||
char *line = in;
|
|
||||||
char *key;
|
|
||||||
char *value;
|
|
||||||
char *p1,*p2,*p3;
|
|
||||||
char last = ~escape_char;
|
|
||||||
int eof_state = 0;
|
|
||||||
|
|
||||||
for(;;) {
|
|
||||||
if ((!*in)||((Anode_strchr(line_breaks,*in))&&((last != escape_char)||(!escape_char)))) {
|
|
||||||
if (!*in)
|
|
||||||
eof_state = 1;
|
|
||||||
else *in = (char)0;
|
|
||||||
|
|
||||||
if ((*line)&&((comment_chars)&&(!Anode_strchr(comment_chars,*line)))) {
|
|
||||||
key = line;
|
|
||||||
|
|
||||||
while (*line) {
|
|
||||||
if ((Anode_strchr(kv_breaks,*line))&&((last != escape_char)||(!escape_char))) {
|
|
||||||
*(line++) = (char)0;
|
|
||||||
break;
|
|
||||||
} else last = *(line++);
|
|
||||||
}
|
|
||||||
while ((*line)&&(Anode_strchr(kv_breaks,*line))&&((last != escape_char)||(!escape_char)))
|
|
||||||
last = *(line++);
|
|
||||||
value = line;
|
|
||||||
|
|
||||||
if (escape_char) {
|
|
||||||
p1 = key;
|
|
||||||
while (*p1) {
|
|
||||||
if (*p1 == escape_char) {
|
|
||||||
p2 = p1;
|
|
||||||
p3 = p1 + 1;
|
|
||||||
while (*p3)
|
|
||||||
*(p2++) = *(p3++);
|
|
||||||
*p2 = (char)0;
|
|
||||||
}
|
|
||||||
++p1;
|
|
||||||
}
|
|
||||||
p1 = value;
|
|
||||||
while (*p1) {
|
|
||||||
if (*p1 == escape_char) {
|
|
||||||
p2 = p1;
|
|
||||||
p3 = p1 + 1;
|
|
||||||
while (*p3)
|
|
||||||
*(p2++) = *(p3++);
|
|
||||||
*p2 = (char)0;
|
|
||||||
}
|
|
||||||
++p1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (trim_whitespace_from_keys)
|
|
||||||
Anode_trim(key);
|
|
||||||
if (trim_whitespace_from_values)
|
|
||||||
Anode_trim(value);
|
|
||||||
|
|
||||||
AnodeDictionary_put(d,key,value);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (eof_state)
|
|
||||||
break;
|
|
||||||
else line = in + 1;
|
|
||||||
}
|
|
||||||
last = *(in++);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
long AnodeDictionary_write(
|
|
||||||
struct AnodeDictionary *d,
|
|
||||||
char *out,
|
|
||||||
long out_size,
|
|
||||||
const char *line_break,
|
|
||||||
const char *kv_break)
|
|
||||||
{
|
|
||||||
struct AnodeDictionaryEntry *e;
|
|
||||||
const char *tmp;
|
|
||||||
long ptr = 0;
|
|
||||||
unsigned int bucket;
|
|
||||||
|
|
||||||
if (out_size <= 0)
|
|
||||||
return -1;
|
|
||||||
|
|
||||||
for(bucket=0;bucket<ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE;++bucket) {
|
|
||||||
e = d->ht[bucket];
|
|
||||||
while (e) {
|
|
||||||
tmp = e->key;
|
|
||||||
if (tmp) {
|
|
||||||
while (*tmp) {
|
|
||||||
out[ptr++] = *tmp++;
|
|
||||||
if (ptr >= (out_size - 1)) return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tmp = kv_break;
|
|
||||||
if (tmp) {
|
|
||||||
while (*tmp) {
|
|
||||||
out[ptr++] = *tmp++;
|
|
||||||
if (ptr >= (out_size - 1)) return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tmp = e->value;
|
|
||||||
if (tmp) {
|
|
||||||
while (*tmp) {
|
|
||||||
out[ptr++] = *tmp++;
|
|
||||||
if (ptr >= (out_size - 1)) return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tmp = line_break;
|
|
||||||
if (tmp) {
|
|
||||||
while (*tmp) {
|
|
||||||
out[ptr++] = *tmp++;
|
|
||||||
if (ptr >= (out_size - 1)) return -1;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
e = e->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
out[ptr] = (char)0;
|
|
||||||
|
|
||||||
return ptr;
|
|
||||||
}
|
|
|
@ -1,126 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
/* This is a simple string hash table suitable for small tables such as zone
|
|
||||||
* files or HTTP header lists. */
|
|
||||||
|
|
||||||
#ifndef _ANODE_DICTIONARY_H
|
|
||||||
#define _ANODE_DICTIONARY_H
|
|
||||||
|
|
||||||
#include "misc.h"
|
|
||||||
|
|
||||||
/* This is a fixed hash table and is designed for relatively small numbers
|
|
||||||
* of keys for things like zone files. */
|
|
||||||
#define ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE 16
|
|
||||||
#define ANODE_DICTIONARY_FIXED_HASH_TABLE_MASK 15
|
|
||||||
|
|
||||||
/* Computes a hash code for a string and returns the hash bucket */
|
|
||||||
static inline unsigned int AnodeDictionary__get_bucket(const char *s)
|
|
||||||
{
|
|
||||||
unsigned int hc = 3;
|
|
||||||
while (*s)
|
|
||||||
hc = ((hc << 4) + hc) + (unsigned int)*(s++);
|
|
||||||
return ((hc ^ (hc >> 4)) & ANODE_DICTIONARY_FIXED_HASH_TABLE_MASK);
|
|
||||||
}
|
|
||||||
/* Case insensitive version of get_bucket */
|
|
||||||
static inline unsigned int AnodeDictionary__get_bucket_ci(const char *s)
|
|
||||||
{
|
|
||||||
unsigned int hc = 3;
|
|
||||||
while (*s)
|
|
||||||
hc = ((hc << 4) + hc) + (unsigned int)Anode_tolower(*(s++));
|
|
||||||
return ((hc ^ (hc >> 4)) & ANODE_DICTIONARY_FIXED_HASH_TABLE_MASK);
|
|
||||||
}
|
|
||||||
|
|
||||||
struct AnodeDictionaryEntry
|
|
||||||
{
|
|
||||||
char *key;
|
|
||||||
char *value;
|
|
||||||
struct AnodeDictionaryEntry *next;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct AnodeDictionary
|
|
||||||
{
|
|
||||||
struct AnodeDictionaryEntry *ht[ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE];
|
|
||||||
unsigned int size;
|
|
||||||
int case_sensitive;
|
|
||||||
};
|
|
||||||
|
|
||||||
static inline void AnodeDictionary_init(struct AnodeDictionary *d,int case_sensitive)
|
|
||||||
{
|
|
||||||
Anode_zero((void *)d,sizeof(struct AnodeDictionary));
|
|
||||||
d->case_sensitive = case_sensitive;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeDictionary_clear(struct AnodeDictionary *d);
|
|
||||||
|
|
||||||
static inline void AnodeDictionary_destroy(struct AnodeDictionary *d)
|
|
||||||
{
|
|
||||||
AnodeDictionary_clear(d);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeDictionary_put(struct AnodeDictionary *d,const char *key,const char *value);
|
|
||||||
|
|
||||||
static inline const char *AnodeDictionary_get(struct AnodeDictionary *d,const char *key)
|
|
||||||
{
|
|
||||||
struct AnodeDictionaryEntry *e;
|
|
||||||
unsigned int bucket = (d->case_sensitive) ? AnodeDictionary__get_bucket(key) : AnodeDictionary__get_bucket_ci(key);
|
|
||||||
|
|
||||||
e = d->ht[bucket];
|
|
||||||
while (e) {
|
|
||||||
if ((d->case_sensitive ? Anode_streq(key,e->key) : Anode_strcaseeq(key,e->key)))
|
|
||||||
return e->value;
|
|
||||||
e = e->next;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (const char *)0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static inline void AnodeDictionary_iterate(
|
|
||||||
struct AnodeDictionary *d,
|
|
||||||
void *arg,
|
|
||||||
int (*func)(void *,const char *,const char *))
|
|
||||||
{
|
|
||||||
struct AnodeDictionaryEntry *e;
|
|
||||||
unsigned int bucket;
|
|
||||||
|
|
||||||
for(bucket=0;bucket<ANODE_DICTIONARY_FIXED_HASH_TABLE_SIZE;++bucket) {
|
|
||||||
e = d->ht[bucket];
|
|
||||||
while (e) {
|
|
||||||
if (!func(arg,e->key,e->value))
|
|
||||||
return;
|
|
||||||
e = e->next;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeDictionary_read(
|
|
||||||
struct AnodeDictionary *d,
|
|
||||||
char *in,
|
|
||||||
const char *line_breaks,
|
|
||||||
const char *kv_breaks,
|
|
||||||
const char *comment_chars,
|
|
||||||
char escape_char,
|
|
||||||
int trim_whitespace_from_keys,
|
|
||||||
int trim_whitespace_from_values);
|
|
||||||
|
|
||||||
long AnodeDictionary_write(
|
|
||||||
struct AnodeDictionary *d,
|
|
||||||
char *out,
|
|
||||||
long out_size,
|
|
||||||
const char *line_break,
|
|
||||||
const char *kv_break);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,93 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <arpa/nameser.h>
|
|
||||||
#include <resolv.h>
|
|
||||||
#include <netdb.h>
|
|
||||||
#include "dns_txt.h"
|
|
||||||
|
|
||||||
#ifndef C_IN
|
|
||||||
#define C_IN ns_c_in
|
|
||||||
#endif
|
|
||||||
#ifndef T_TXT
|
|
||||||
#define T_TXT ns_t_txt
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static volatile int Anode_resolver_initialized = 0;
|
|
||||||
|
|
||||||
int Anode_sync_resolve_txt(const char *host,char *txt,unsigned int txt_len)
|
|
||||||
{
|
|
||||||
unsigned char answer[16384],*pptr,*end;
|
|
||||||
char name[16384];
|
|
||||||
int len,explen,i;
|
|
||||||
|
|
||||||
if (!Anode_resolver_initialized) {
|
|
||||||
Anode_resolver_initialized = 1;
|
|
||||||
res_init();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Do not taunt happy fun ball. */
|
|
||||||
|
|
||||||
len = res_search(host,C_IN,T_TXT,answer,sizeof(answer));
|
|
||||||
if (len > 12) {
|
|
||||||
pptr = answer + 12;
|
|
||||||
end = answer + len;
|
|
||||||
|
|
||||||
explen = dn_expand(answer,end,pptr,name,sizeof(name));
|
|
||||||
if (explen > 0) {
|
|
||||||
pptr += explen;
|
|
||||||
|
|
||||||
if ((pptr + 2) >= end) return 2;
|
|
||||||
if (ntohs(*((uint16_t *)pptr)) == T_TXT) {
|
|
||||||
pptr += 4;
|
|
||||||
if (pptr >= end) return 2;
|
|
||||||
|
|
||||||
explen = dn_expand(answer,end,pptr,name,sizeof(name));
|
|
||||||
if (explen > 0) {
|
|
||||||
pptr += explen;
|
|
||||||
|
|
||||||
if ((pptr + 2) >= end) return 2;
|
|
||||||
if (ntohs(*((uint16_t *)pptr)) == T_TXT) {
|
|
||||||
pptr += 10;
|
|
||||||
if (pptr >= end) return 2;
|
|
||||||
|
|
||||||
len = *(pptr++);
|
|
||||||
if (len <= 0) return 2;
|
|
||||||
if ((pptr + len) > end) return 2;
|
|
||||||
|
|
||||||
if (txt_len < (len + 1))
|
|
||||||
return 4;
|
|
||||||
else {
|
|
||||||
for(i=0;i<len;++i)
|
|
||||||
txt[i] = pptr[i];
|
|
||||||
txt[len] = (char)0;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#ifndef _ANODE_DNS_TXT_H
|
|
||||||
#define _ANODE_DNS_TXT_H
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Synchronous TXT resolver routine
|
|
||||||
*
|
|
||||||
* Error codes:
|
|
||||||
* 1 - I/O error
|
|
||||||
* 2 - Invalid response
|
|
||||||
* 3 - TXT record not found
|
|
||||||
* 4 - Destination buffer too small for result
|
|
||||||
*
|
|
||||||
* @param host Host name
|
|
||||||
* @param txt Buffer to store TXT result
|
|
||||||
* @param txt_len Size of buffer
|
|
||||||
* @return Zero on success, special error code on failure
|
|
||||||
*/
|
|
||||||
int Anode_sync_resolve_txt(const char *host,char *txt,unsigned int txt_len);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,219 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
#include <openssl/bn.h>
|
|
||||||
#include <openssl/obj_mac.h>
|
|
||||||
#include <openssl/rand.h>
|
|
||||||
#include <openssl/ec.h>
|
|
||||||
#include <openssl/ecdh.h>
|
|
||||||
#include <openssl/ecdsa.h>
|
|
||||||
#include "types.h"
|
|
||||||
#include "misc.h"
|
|
||||||
#include "ec.h"
|
|
||||||
|
|
||||||
static EC_GROUP *AnodeEC_group = (EC_GROUP *)0;
|
|
||||||
|
|
||||||
static void *AnodeEC_KDF(const void *in,size_t inlen,void *out,size_t *outlen)
|
|
||||||
{
|
|
||||||
unsigned long i,longest_length;
|
|
||||||
|
|
||||||
if (!*outlen)
|
|
||||||
return out;
|
|
||||||
|
|
||||||
for(i=0;i<(unsigned long)*outlen;++i)
|
|
||||||
((unsigned char *)out)[i] = (unsigned char)0;
|
|
||||||
|
|
||||||
longest_length = inlen;
|
|
||||||
if (longest_length < *outlen)
|
|
||||||
longest_length = *outlen;
|
|
||||||
for(i=0;i<longest_length;++i)
|
|
||||||
((unsigned char *)out)[i % (unsigned long)*outlen] ^= ((const unsigned char *)in)[i % (unsigned long)inlen];
|
|
||||||
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeECKeyPair_generate(struct AnodeECKeyPair *pair)
|
|
||||||
{
|
|
||||||
EC_KEY *key;
|
|
||||||
int len;
|
|
||||||
|
|
||||||
#ifdef HAS_DEV_URANDOM
|
|
||||||
char buf[128];
|
|
||||||
FILE *f = fopen("/dev/urandom","r");
|
|
||||||
if (f) {
|
|
||||||
if (fread(buf,1,sizeof(buf),f) == sizeof(buf))
|
|
||||||
RAND_add(buf,sizeof(buf),sizeof(buf)/2);
|
|
||||||
fclose(f);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
if (!AnodeEC_group) {
|
|
||||||
AnodeEC_group = EC_GROUP_new_by_curve_name(ANODE_EC_GROUP);
|
|
||||||
if (!AnodeEC_group) return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
key = EC_KEY_new();
|
|
||||||
if (!key) return 0;
|
|
||||||
|
|
||||||
if (!EC_KEY_set_group(key,AnodeEC_group)) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!EC_KEY_generate_key(key)) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
Anode_zero(pair,sizeof(struct AnodeECKeyPair));
|
|
||||||
|
|
||||||
/* Stuff the private key into priv.key */
|
|
||||||
len = BN_num_bytes(EC_KEY_get0_private_key(key));
|
|
||||||
if ((len > ANODE_EC_PRIME_BYTES)||(len < 0)) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
BN_bn2bin(EC_KEY_get0_private_key(key),&(pair->priv.key[ANODE_EC_PRIME_BYTES - len]));
|
|
||||||
pair->priv.bytes = ANODE_EC_PRIME_BYTES;
|
|
||||||
|
|
||||||
len = EC_POINT_point2oct(AnodeEC_group,EC_KEY_get0_public_key(key),POINT_CONVERSION_COMPRESSED,pair->pub.key,sizeof(pair->pub.key),0);
|
|
||||||
if (len != ANODE_EC_PUBLIC_KEY_BYTES) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
pair->pub.bytes = ANODE_EC_PUBLIC_KEY_BYTES;
|
|
||||||
|
|
||||||
/* Keep a copy of OpenSSL's structure around so we don't have to re-init
|
|
||||||
* it every time we use our key pair structure. */
|
|
||||||
pair->internal_key = key;
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeECKeyPair_init(struct AnodeECKeyPair *pair,const struct AnodeECKey *pub,const struct AnodeECKey *priv)
|
|
||||||
{
|
|
||||||
EC_KEY *key;
|
|
||||||
EC_POINT *kxy;
|
|
||||||
BIGNUM *pn;
|
|
||||||
|
|
||||||
if (!AnodeEC_group) {
|
|
||||||
AnodeEC_group = EC_GROUP_new_by_curve_name(ANODE_EC_GROUP);
|
|
||||||
if (!AnodeEC_group) return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
key = EC_KEY_new();
|
|
||||||
if (!key)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (!EC_KEY_set_group(key,AnodeEC_group)) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Grab the private key */
|
|
||||||
if (priv->bytes != ANODE_EC_PRIME_BYTES) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
pn = BN_new();
|
|
||||||
if (!pn) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (!BN_bin2bn(priv->key,ANODE_EC_PRIME_BYTES,pn)) {
|
|
||||||
BN_free(pn);
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
if (!EC_KEY_set_private_key(key,pn)) {
|
|
||||||
BN_free(pn);
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
BN_free(pn);
|
|
||||||
|
|
||||||
/* Set the public key */
|
|
||||||
if (pub->bytes != ANODE_EC_PUBLIC_KEY_BYTES) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
kxy = EC_POINT_new(AnodeEC_group);
|
|
||||||
if (!kxy) {
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EC_POINT_oct2point(AnodeEC_group,kxy,pub->key,ANODE_EC_PUBLIC_KEY_BYTES,0);
|
|
||||||
if (!EC_KEY_set_public_key(key,kxy)) {
|
|
||||||
EC_POINT_free(kxy);
|
|
||||||
EC_KEY_free(key);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
EC_POINT_free(kxy);
|
|
||||||
|
|
||||||
Anode_zero(pair,sizeof(struct AnodeECKeyPair));
|
|
||||||
Anode_memcpy((void *)&(pair->pub),(const void *)pub,sizeof(struct AnodeECKey));
|
|
||||||
Anode_memcpy((void *)&(pair->priv),(const void *)priv,sizeof(struct AnodeECKey));
|
|
||||||
pair->internal_key = key;
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeECKeyPair_destroy(struct AnodeECKeyPair *pair)
|
|
||||||
{
|
|
||||||
if (pair) {
|
|
||||||
if (pair->internal_key)
|
|
||||||
EC_KEY_free((EC_KEY *)pair->internal_key);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int AnodeECKeyPair_agree(const struct AnodeECKeyPair *my_key_pair,const struct AnodeECKey *their_pub_key,unsigned char *key_buf,unsigned int key_len)
|
|
||||||
{
|
|
||||||
EC_POINT *pub;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if (!AnodeEC_group) {
|
|
||||||
AnodeEC_group = EC_GROUP_new_by_curve_name(ANODE_EC_GROUP);
|
|
||||||
if (!AnodeEC_group) return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!my_key_pair->internal_key)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (their_pub_key->bytes != ANODE_EC_PUBLIC_KEY_BYTES)
|
|
||||||
return 0;
|
|
||||||
pub = EC_POINT_new(AnodeEC_group);
|
|
||||||
if (!pub)
|
|
||||||
return 0;
|
|
||||||
EC_POINT_oct2point(AnodeEC_group,pub,their_pub_key->key,ANODE_EC_PUBLIC_KEY_BYTES,0);
|
|
||||||
|
|
||||||
i = ECDH_compute_key(key_buf,key_len,pub,(EC_KEY *)my_key_pair->internal_key,&AnodeEC_KDF);
|
|
||||||
if (i != (int)key_len) {
|
|
||||||
EC_POINT_free(pub);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
EC_POINT_free(pub);
|
|
||||||
|
|
||||||
return 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeEC_random(unsigned char *buf,unsigned int len)
|
|
||||||
{
|
|
||||||
RAND_pseudo_bytes(buf,len);
|
|
||||||
}
|
|
|
@ -1,61 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
/* Elliptic curve glue -- hides OpenSSL code behind this source module */
|
|
||||||
|
|
||||||
#ifndef _ANODE_EC_H
|
|
||||||
#define _ANODE_EC_H
|
|
||||||
|
|
||||||
#include "misc.h"
|
|
||||||
|
|
||||||
/* Right now, only one mode is supported: NIST-P-256. This is the only mode
|
|
||||||
* supported in the spec as well, and should be good for quite some time.
|
|
||||||
* If other modes are needed this code will need to be refactored. */
|
|
||||||
|
|
||||||
/* NIST-P-256 prime size in bytes */
|
|
||||||
#define ANODE_EC_PRIME_BYTES 32
|
|
||||||
|
|
||||||
/* Sizes of key fields */
|
|
||||||
#define ANODE_EC_GROUP NID_X9_62_prime256v1
|
|
||||||
#define ANODE_EC_PUBLIC_KEY_BYTES (ANODE_EC_PRIME_BYTES + 1)
|
|
||||||
#define ANODE_EC_PRIVATE_KEY_BYTES ANODE_EC_PRIME_BYTES
|
|
||||||
|
|
||||||
/* Larger of public or private key bytes, used for buffers */
|
|
||||||
#define ANODE_EC_MAX_BYTES ANODE_EC_PUBLIC_KEY_BYTES
|
|
||||||
|
|
||||||
struct AnodeECKey
|
|
||||||
{
|
|
||||||
unsigned char key[ANODE_EC_MAX_BYTES];
|
|
||||||
unsigned int bytes;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct AnodeECKeyPair
|
|
||||||
{
|
|
||||||
struct AnodeECKey pub;
|
|
||||||
struct AnodeECKey priv;
|
|
||||||
void *internal_key;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Key management functions */
|
|
||||||
int AnodeECKeyPair_generate(struct AnodeECKeyPair *pair);
|
|
||||||
int AnodeECKeyPair_init(struct AnodeECKeyPair *pair,const struct AnodeECKey *pub,const struct AnodeECKey *priv);
|
|
||||||
void AnodeECKeyPair_destroy(struct AnodeECKeyPair *pair);
|
|
||||||
int AnodeECKeyPair_agree(const struct AnodeECKeyPair *my_key_pair,const struct AnodeECKey *their_pub_key,unsigned char *key_buf,unsigned int key_len);
|
|
||||||
|
|
||||||
/* Provides access to the secure PRNG used to generate keys */
|
|
||||||
void AnodeEC_random(unsigned char *buf,unsigned int len);
|
|
||||||
|
|
||||||
#endif
|
|
|
@ -1,118 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include "environment.h"
|
|
||||||
|
|
||||||
#ifdef WINDOWS
|
|
||||||
#include <windows.h>
|
|
||||||
#else
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <string.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
static char Anode_cache_base[1024] = { 0 };
|
|
||||||
|
|
||||||
const char *Anode_get_cache()
|
|
||||||
{
|
|
||||||
if (Anode_cache_base[0])
|
|
||||||
return Anode_cache_base;
|
|
||||||
|
|
||||||
#ifdef WINDOWS
|
|
||||||
#else
|
|
||||||
char tmp[1024];
|
|
||||||
char home[1024];
|
|
||||||
unsigned int i;
|
|
||||||
struct stat st;
|
|
||||||
const char *_home = getenv("HOME");
|
|
||||||
|
|
||||||
if (!_home)
|
|
||||||
return (const char *)0;
|
|
||||||
for(i=0;i<sizeof(home);++i) {
|
|
||||||
home[i] = _home[i];
|
|
||||||
if (!home[i]) {
|
|
||||||
if (i == 0)
|
|
||||||
return (const char *)0;
|
|
||||||
else if (home[i-1] == ANODE_PATH_SEPARATOR)
|
|
||||||
home[i-1] = (char)0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (i == sizeof(home))
|
|
||||||
return (const char *)0;
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
|
||||||
snprintf(tmp,sizeof(tmp),"%s%cLibrary",home,ANODE_PATH_SEPARATOR);
|
|
||||||
tmp[sizeof(tmp)-1] = (char)0;
|
|
||||||
if (!stat(tmp,&st)) {
|
|
||||||
sprintf(tmp,"%s%cLibrary%cCaches",home,ANODE_PATH_SEPARATOR,ANODE_PATH_SEPARATOR);
|
|
||||||
if (stat(tmp,&st)) {
|
|
||||||
if (mkdir(tmp,0700))
|
|
||||||
return (const char *)0;
|
|
||||||
}
|
|
||||||
snprintf(Anode_cache_base,sizeof(Anode_cache_base),"%s%ccom.zerotier.anode",tmp,ANODE_PATH_SEPARATOR);
|
|
||||||
Anode_cache_base[sizeof(Anode_cache_base)-1] = (char)0;
|
|
||||||
if (stat(Anode_cache_base,&st)) {
|
|
||||||
if (mkdir(Anode_cache_base,0700)) {
|
|
||||||
Anode_cache_base[0] = (char)0;
|
|
||||||
return (const char *)0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Anode_cache_base;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
snprintf(tmp,sizeof(tmp),"%s%c.anode",home,ANODE_PATH_SEPARATOR);
|
|
||||||
tmp[sizeof(tmp)-1] = (char)0;
|
|
||||||
if (stat(tmp,&st)) {
|
|
||||||
if (mkdir(tmp,0700)) {
|
|
||||||
Anode_cache_base[0] = (char)0;
|
|
||||||
return (const char *)0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
snprintf(Anode_cache_base,sizeof(Anode_cache_base),"%s%ccaches",tmp,ANODE_PATH_SEPARATOR);
|
|
||||||
Anode_cache_base[sizeof(Anode_cache_base)-1] = (char)0;
|
|
||||||
if (stat(Anode_cache_base,&st)) {
|
|
||||||
if (mkdir(Anode_cache_base,0700)) {
|
|
||||||
Anode_cache_base[0] = (char)0;
|
|
||||||
return (const char *)0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return Anode_cache_base;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
char *Anode_get_cache_sub(const char *cache_subdir,char *buf,unsigned int len)
|
|
||||||
{
|
|
||||||
struct stat st;
|
|
||||||
const char *cache_base = Anode_get_cache();
|
|
||||||
|
|
||||||
if (!len)
|
|
||||||
return (char *)0;
|
|
||||||
if (!cache_base)
|
|
||||||
return (char *)0;
|
|
||||||
|
|
||||||
snprintf(buf,len,"%s%c%s",cache_base,ANODE_PATH_SEPARATOR,cache_subdir);
|
|
||||||
buf[len-1] = (char)0;
|
|
||||||
if (stat(buf,&st)) {
|
|
||||||
if (mkdir(buf,0700))
|
|
||||||
return (char *)0;
|
|
||||||
}
|
|
||||||
|
|
||||||
return buf;
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#ifndef _ANODE_ENVIRONMENT_H
|
|
||||||
#define _ANODE_ENVIRONMENT_H
|
|
||||||
|
|
||||||
#ifdef WINDOWS
|
|
||||||
#define ANODE_PATH_SEPARATOR '\\'
|
|
||||||
#else
|
|
||||||
#define ANODE_PATH_SEPARATOR '/'
|
|
||||||
#endif
|
|
||||||
|
|
||||||
const char *Anode_get_cache();
|
|
||||||
char *Anode_get_cache_sub(const char *cache_subdir,char *buf,unsigned int len);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -1,558 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <netinet/in.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include "http_client.h"
|
|
||||||
#include "misc.h"
|
|
||||||
#include "types.h"
|
|
||||||
|
|
||||||
/* How much to increment read buffer at each capacity top? */
|
|
||||||
#define ANODE_HTTP_CAPACITY_INCREMENT 4096
|
|
||||||
|
|
||||||
static void AnodeHttpClient_close_and_fail(struct AnodeHttpClient *client)
|
|
||||||
{
|
|
||||||
if (client->impl.tcp_connection) {
|
|
||||||
client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
}
|
|
||||||
|
|
||||||
client->response.data_length = 0;
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
|
|
||||||
if (client->handler)
|
|
||||||
client->handler(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void AnodeHttpClient_do_initiate_client(struct AnodeHttpClient *client)
|
|
||||||
{
|
|
||||||
const char *method = "";
|
|
||||||
long l,i;
|
|
||||||
|
|
||||||
switch(client->method) {
|
|
||||||
case ANODE_HTTP_GET: method = "GET"; break;
|
|
||||||
case ANODE_HTTP_HEAD: method = "HEAD"; break;
|
|
||||||
case ANODE_HTTP_POST: method = "POST"; break;
|
|
||||||
}
|
|
||||||
client->impl.outbuf_len = snprintf((char *)client->impl.outbuf,sizeof(client->impl.outbuf),
|
|
||||||
"%s %s%s%s HTTP/1.1\r\nHost: %s:%d\r\n%s",
|
|
||||||
method,
|
|
||||||
client->uri.path,
|
|
||||||
((client->uri.query[0]) ? "?" : ""),
|
|
||||||
client->uri.query,
|
|
||||||
client->uri.host,
|
|
||||||
((client->uri.port > 0) ? client->uri.port : 80),
|
|
||||||
((client->keepalive) ? "" : "Connection: close\r\n")
|
|
||||||
);
|
|
||||||
if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->method == ANODE_HTTP_POST) {
|
|
||||||
if ((client->data)&&(client->data_length)) {
|
|
||||||
client->impl.outbuf_len += snprintf((char *)client->impl.outbuf + client->impl.outbuf_len,sizeof(client->impl.outbuf) - client->impl.outbuf_len,
|
|
||||||
"Content-Type: %s\r\n",
|
|
||||||
(client->data_content_type ? client->data_content_type : "application/x-www-form-urlencoded")
|
|
||||||
);
|
|
||||||
if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
client->impl.outbuf_len += snprintf((char *)client->impl.outbuf + client->impl.outbuf_len,sizeof(client->impl.outbuf) - client->impl.outbuf_len,
|
|
||||||
"Content-Length: %u\r\n",
|
|
||||||
client->data_length
|
|
||||||
);
|
|
||||||
if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
client->impl.outbuf_len += snprintf((char *)client->impl.outbuf + client->impl.outbuf_len,sizeof(client->impl.outbuf) - client->impl.outbuf_len,
|
|
||||||
"Content-Length: 0\r\n"
|
|
||||||
);
|
|
||||||
if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
l = AnodeDictionary_write(&(client->headers),(char *)client->impl.outbuf + client->impl.outbuf_len,(long)(sizeof(client->impl.outbuf) - client->impl.outbuf_len - 2),"\r\n",": ");
|
|
||||||
if (l < 0) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
client->impl.outbuf_len += (unsigned int)l;
|
|
||||||
if (client->impl.outbuf_len >= (sizeof(client->impl.outbuf) - 2)) { /* sanity check */
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
client->impl.outbuf[client->impl.outbuf_len++] = '\r';
|
|
||||||
client->impl.outbuf[client->impl.outbuf_len++] = '\n';
|
|
||||||
|
|
||||||
if ((client->method == ANODE_HTTP_POST)&&(client->data)&&(client->data_length)) {
|
|
||||||
i = sizeof(client->impl.outbuf) - client->impl.outbuf_len;
|
|
||||||
if (i > client->data_length)
|
|
||||||
i = client->data_length;
|
|
||||||
Anode_memcpy((client->impl.outbuf + client->impl.outbuf_len),client->data,i);
|
|
||||||
client->impl.request_data_ptr += i;
|
|
||||||
client->impl.outbuf_len += i;
|
|
||||||
}
|
|
||||||
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_SEND;
|
|
||||||
client->impl.transport_engine->tcp_start_writing(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void AnodeHttpClient_tcp_outgoing_connect_handler(
|
|
||||||
AnodeTransportEngine *transport,
|
|
||||||
AnodeTransportTcpConnection *connection,
|
|
||||||
int error_code)
|
|
||||||
{
|
|
||||||
struct AnodeHttpClient *client;
|
|
||||||
|
|
||||||
if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
|
|
||||||
return;
|
|
||||||
|
|
||||||
if ((client->impl.phase == ANODE_HTTP_REQUEST_PHASE_CONNECT)&&(!client->impl.freed)) {
|
|
||||||
if (error_code) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_CONNECT_FAILED;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
} else {
|
|
||||||
client->impl.tcp_connection = connection;
|
|
||||||
AnodeHttpClient_do_initiate_client(client);
|
|
||||||
}
|
|
||||||
} else transport->tcp_close(transport,connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void AnodeHttpClient_tcp_connection_terminated_handler(
|
|
||||||
AnodeTransportEngine *transport,
|
|
||||||
AnodeTransportTcpConnection *connection,
|
|
||||||
int error_code)
|
|
||||||
{
|
|
||||||
struct AnodeHttpClient *client;
|
|
||||||
|
|
||||||
if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
|
|
||||||
return;
|
|
||||||
if (client->impl.freed)
|
|
||||||
return;
|
|
||||||
|
|
||||||
client->response.data_length = 0;
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
if ((client->impl.phase != ANODE_HTTP_REQUEST_PHASE_KEEPALIVE)&&(client->impl.phase != ANODE_HTTP_REQUEST_PHASE_CLOSED)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_SERVER_CLOSED_CONNECTION;
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
} else client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void AnodeHttpClient_tcp_receive_handler(
|
|
||||||
AnodeTransportEngine *transport,
|
|
||||||
AnodeTransportTcpConnection *connection,
|
|
||||||
void *data,
|
|
||||||
unsigned int data_length)
|
|
||||||
{
|
|
||||||
struct AnodeHttpClient *client;
|
|
||||||
char *p1,*p2;
|
|
||||||
unsigned int i;
|
|
||||||
long l;
|
|
||||||
|
|
||||||
if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
|
|
||||||
return;
|
|
||||||
if (client->impl.freed) {
|
|
||||||
transport->tcp_close(transport,connection);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!client->response.data)
|
|
||||||
client->response.data = malloc(client->impl.response_data_capacity = ANODE_HTTP_CAPACITY_INCREMENT);
|
|
||||||
|
|
||||||
i = 0;
|
|
||||||
while (i < data_length) {
|
|
||||||
switch(client->impl.read_mode) {
|
|
||||||
case ANODE_HTTP_READ_MODE_WAITING:
|
|
||||||
for(;i<data_length;++i) {
|
|
||||||
if (((const char *)data)[i] == '\n') {
|
|
||||||
((char *)client->response.data)[client->response.data_length] = (char)0;
|
|
||||||
client->response.data_length = 0;
|
|
||||||
|
|
||||||
p1 = (char *)Anode_strchr((char *)client->response.data,' ');
|
|
||||||
if (!p1)
|
|
||||||
p1 = (char *)Anode_strchr((char *)client->response.data,'\t');
|
|
||||||
if (p1) {
|
|
||||||
while ((*p1 == ' ')||(*p1 == '\t')) ++p1;
|
|
||||||
if (!*p1) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
p2 = p1 + 1;
|
|
||||||
while (*p2) {
|
|
||||||
if ((*p2 == ' ')||(*p2 == '\t')||(*p2 == '\r')||(*p2 == '\n')) {
|
|
||||||
*p2 = (char)0;
|
|
||||||
break;
|
|
||||||
} else ++p2;
|
|
||||||
}
|
|
||||||
client->response.code = (int)strtol(p1,(char **)0,10);
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_HEADERS;
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
((char *)client->response.data)[client->response.data_length++] = ((const char *)data)[i];
|
|
||||||
if (client->response.data_length >= client->impl.response_data_capacity)
|
|
||||||
client->response.data = realloc(client->response.data,client->impl.response_data_capacity += ANODE_HTTP_CAPACITY_INCREMENT);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ANODE_HTTP_READ_MODE_HEADERS:
|
|
||||||
case ANODE_HTTP_READ_MODE_CHUNKED_FOOTER:
|
|
||||||
for(;i<data_length;++i) {
|
|
||||||
if (((const char *)data)[i] == '\n') {
|
|
||||||
client->impl.header_line_buf[client->impl.header_line_buf_ptr] = (char)0;
|
|
||||||
client->impl.header_line_buf_ptr = 0;
|
|
||||||
|
|
||||||
if ((!client->impl.header_line_buf[0])||((client->impl.header_line_buf[0] == '\r')&&(!client->impl.header_line_buf[1]))) {
|
|
||||||
/* If the line is empty (or is empty with \r\n as the
|
|
||||||
* line terminator), we're at the end. */
|
|
||||||
if (client->impl.read_mode == ANODE_HTTP_READ_MODE_CHUNKED_FOOTER) {
|
|
||||||
/* If this is a chunked footer, we finally end the
|
|
||||||
* chunked response. */
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
|
|
||||||
if (client->keepalive)
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
|
|
||||||
else {
|
|
||||||
client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
}
|
|
||||||
if (client->handler)
|
|
||||||
client->handler(client);
|
|
||||||
if (client->impl.freed)
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
/* Otherwise, this is a regular header block */
|
|
||||||
if (client->response.code == 100) {
|
|
||||||
/* Ignore 100 Continue messages */
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
} else if ((client->response.code == 200)&&(client->method != ANODE_HTTP_HEAD)) {
|
|
||||||
/* Other messages get their headers parsed to determine
|
|
||||||
* how to read them. */
|
|
||||||
p1 = (char *)AnodeDictionary_get(&(client->response.headers),"transfer-encoding");
|
|
||||||
if ((p1)&&(Anode_strcaseeq(p1,"chunked"))) {
|
|
||||||
/* Chunked encoding enters chunked mode */
|
|
||||||
client->impl.header_line_buf_ptr = 0;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE;
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
} else {
|
|
||||||
/* Else we must have a Content-Length header */
|
|
||||||
p1 = (char *)AnodeDictionary_get(&(client->response.headers),"content-length");
|
|
||||||
if (!p1) {
|
|
||||||
/* No chunked or content length is not supported */
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
/* Enter block read mode with content length */
|
|
||||||
l = strtol(p1,(char **)0,10);
|
|
||||||
if (l <= 0) {
|
|
||||||
/* Zero length data is all done... */
|
|
||||||
client->impl.expecting_response_length = 0;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
|
|
||||||
if (client->keepalive)
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
|
|
||||||
else {
|
|
||||||
client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->handler)
|
|
||||||
client->handler(client);
|
|
||||||
if (client->impl.freed)
|
|
||||||
return;
|
|
||||||
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
} else {
|
|
||||||
/* Else start reading... */
|
|
||||||
client->impl.expecting_response_length = (unsigned int)l;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_BLOCK;
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/* HEAD clients or non-200 codes get headers only */
|
|
||||||
client->impl.expecting_response_length = 0;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
|
|
||||||
if (client->keepalive)
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
|
|
||||||
else {
|
|
||||||
client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->handler)
|
|
||||||
client->handler(client);
|
|
||||||
if (client->impl.freed)
|
|
||||||
return;
|
|
||||||
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
/* Otherwise this is another header, add to dictionary */
|
|
||||||
AnodeDictionary_read(
|
|
||||||
&(client->response.headers),
|
|
||||||
client->impl.header_line_buf,
|
|
||||||
"\r\n",
|
|
||||||
": \t",
|
|
||||||
"",
|
|
||||||
(char)0,
|
|
||||||
1,
|
|
||||||
1
|
|
||||||
);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
client->impl.header_line_buf[client->impl.header_line_buf_ptr++] = ((const char *)data)[i];
|
|
||||||
if (client->impl.header_line_buf_ptr >= sizeof(client->impl.header_line_buf)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ANODE_HTTP_READ_MODE_BLOCK:
|
|
||||||
if ((client->response.data_length + client->impl.expecting_response_length) > client->impl.response_data_capacity)
|
|
||||||
client->response.data = realloc(client->response.data,client->impl.response_data_capacity = (client->response.data_length + client->impl.expecting_response_length));
|
|
||||||
|
|
||||||
for(;((i<data_length)&&(client->impl.expecting_response_length));++i) {
|
|
||||||
((char *)client->response.data)[client->response.data_length++] = ((const char *)data)[i];
|
|
||||||
--client->impl.expecting_response_length;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!client->impl.expecting_response_length) {
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
|
|
||||||
if (client->keepalive)
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_KEEPALIVE;
|
|
||||||
else {
|
|
||||||
client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CLOSED;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->handler)
|
|
||||||
client->handler(client);
|
|
||||||
if (client->impl.freed)
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE:
|
|
||||||
for(;i<data_length;++i) {
|
|
||||||
if (((const char *)data)[i] == '\n') {
|
|
||||||
client->impl.header_line_buf[client->impl.header_line_buf_ptr] = (char)0;
|
|
||||||
client->impl.header_line_buf_ptr = 0;
|
|
||||||
|
|
||||||
p1 = client->impl.header_line_buf;
|
|
||||||
while (*p1) {
|
|
||||||
if ((*p1 == ';')||(*p1 == ' ')||(*p1 == '\r')||(*p1 == '\n')||(*p1 == '\t')) {
|
|
||||||
*p1 = (char)0;
|
|
||||||
break;
|
|
||||||
} else ++p1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->impl.header_line_buf[0]) {
|
|
||||||
l = strtol(client->impl.header_line_buf,(char **)0,16);
|
|
||||||
if (l <= 0) {
|
|
||||||
/* Zero length ends chunked and enters footer mode */
|
|
||||||
client->impl.expecting_response_length = 0;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_FOOTER;
|
|
||||||
} else {
|
|
||||||
/* Otherwise the next chunk is to be read */
|
|
||||||
client->impl.expecting_response_length = (unsigned int)l;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_DATA;
|
|
||||||
}
|
|
||||||
++i; break; /* Exit inner for() */
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
client->impl.header_line_buf[client->impl.header_line_buf_ptr++] = ((const char *)data)[i];
|
|
||||||
if (client->impl.header_line_buf_ptr >= sizeof(client->impl.header_line_buf)) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case ANODE_HTTP_READ_MODE_CHUNKED_DATA:
|
|
||||||
if ((client->response.data_length + client->impl.expecting_response_length) > client->impl.response_data_capacity)
|
|
||||||
client->response.data = realloc(client->response.data,client->impl.response_data_capacity = (client->response.data_length + client->impl.expecting_response_length));
|
|
||||||
|
|
||||||
for(;((i<data_length)&&(client->impl.expecting_response_length));++i) {
|
|
||||||
((char *)client->response.data)[client->response.data_length++] = ((const char *)data)[i];
|
|
||||||
--client->impl.expecting_response_length;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!client->impl.expecting_response_length)
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void AnodeHttpClient_tcp_available_for_write_handler(
|
|
||||||
AnodeTransportEngine *transport,
|
|
||||||
AnodeTransportTcpConnection *connection)
|
|
||||||
{
|
|
||||||
struct AnodeHttpClient *client;
|
|
||||||
unsigned int i,j;
|
|
||||||
int n;
|
|
||||||
|
|
||||||
if (!(client = (struct AnodeHttpClient *)(connection->ptr)))
|
|
||||||
return;
|
|
||||||
if (client->impl.freed) {
|
|
||||||
transport->tcp_close(transport,connection);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->impl.phase == ANODE_HTTP_REQUEST_PHASE_SEND) {
|
|
||||||
n = client->impl.transport_engine->tcp_send(client->impl.transport_engine,client->impl.tcp_connection,(const void *)client->impl.outbuf,(int)client->impl.outbuf_len);
|
|
||||||
if (n < 0) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_SERVER_CLOSED_CONNECTION;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
} else if (n > 0) {
|
|
||||||
for(i=0,j=(client->impl.outbuf_len - (unsigned int)n);i<j;++i)
|
|
||||||
client->impl.outbuf[i] = client->impl.outbuf[i + (unsigned int)n];
|
|
||||||
client->impl.outbuf_len -= (unsigned int)n;
|
|
||||||
|
|
||||||
if ((client->method == ANODE_HTTP_POST)&&(client->data)&&(client->data_length)) {
|
|
||||||
i = sizeof(client->impl.outbuf) - client->impl.outbuf_len;
|
|
||||||
j = client->data_length - client->impl.request_data_ptr;
|
|
||||||
if (i > j)
|
|
||||||
i = j;
|
|
||||||
Anode_memcpy((client->impl.outbuf + client->impl.outbuf_len),client->data,i);
|
|
||||||
client->impl.request_data_ptr += i;
|
|
||||||
client->impl.outbuf_len += i;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!client->impl.outbuf_len) {
|
|
||||||
client->impl.transport_engine->tcp_stop_writing(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_RECEIVE;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else client->impl.transport_engine->tcp_stop_writing(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void AnodeHttpClient_dns_result_handler(
|
|
||||||
AnodeTransportEngine *transport,
|
|
||||||
void *ptr,
|
|
||||||
int error_code,
|
|
||||||
const char *name,
|
|
||||||
const AnodeTransportIpAddress *ip_addresses,
|
|
||||||
unsigned int ip_address_count,
|
|
||||||
const AnodeAddress *anode_address)
|
|
||||||
{
|
|
||||||
struct AnodeHttpClient *client;
|
|
||||||
AnodeTransportIpEndpoint to_endpoint;
|
|
||||||
|
|
||||||
if (!(client = (struct AnodeHttpClient *)ptr))
|
|
||||||
return;
|
|
||||||
if (client->impl.freed)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if ((error_code)||(!ip_address_count)) {
|
|
||||||
if (client->impl.phase == ANODE_HTTP_REQUEST_PHASE_RESOLVE) {
|
|
||||||
client->response.code = ANODE_HTTP_SPECIAL_RESPONSE_DNS_RESOLVE_FAILED;
|
|
||||||
AnodeHttpClient_close_and_fail(client);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
client->impl.phase = ANODE_HTTP_REQUEST_PHASE_CONNECT;
|
|
||||||
Anode_memcpy(&to_endpoint.address,ip_addresses,sizeof(AnodeTransportIpAddress));
|
|
||||||
to_endpoint.port = (client->uri.port > 0) ? client->uri.port : 80;
|
|
||||||
client->impl.transport_engine->tcp_connect(
|
|
||||||
client->impl.transport_engine,
|
|
||||||
client,
|
|
||||||
&AnodeHttpClient_tcp_outgoing_connect_handler,
|
|
||||||
&AnodeHttpClient_tcp_connection_terminated_handler,
|
|
||||||
&AnodeHttpClient_tcp_receive_handler,
|
|
||||||
&AnodeHttpClient_tcp_available_for_write_handler,
|
|
||||||
&to_endpoint);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct AnodeHttpClient *AnodeHttpClient_new(AnodeTransportEngine *transport_engine)
|
|
||||||
{
|
|
||||||
struct AnodeHttpClient *req = malloc(sizeof(struct AnodeHttpClient));
|
|
||||||
Anode_zero(req,sizeof(struct AnodeHttpClient));
|
|
||||||
|
|
||||||
AnodeDictionary_init(&(req->headers),0);
|
|
||||||
AnodeDictionary_init(&(req->response.headers),0);
|
|
||||||
|
|
||||||
req->impl.transport_engine = transport_engine;
|
|
||||||
|
|
||||||
return req;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeHttpClient_send(struct AnodeHttpClient *client)
|
|
||||||
{
|
|
||||||
client->response.code = 0;
|
|
||||||
client->response.data_length = 0;
|
|
||||||
AnodeDictionary_clear(&(client->response.headers));
|
|
||||||
|
|
||||||
client->impl.request_data_ptr = 0;
|
|
||||||
client->impl.expecting_response_length = 0;
|
|
||||||
client->impl.read_mode = ANODE_HTTP_READ_MODE_WAITING;
|
|
||||||
client->impl.outbuf_len = 0;
|
|
||||||
|
|
||||||
if (!client->impl.tcp_connection) {
|
|
||||||
client->impl.transport_engine->dns_resolve(
|
|
||||||
client->impl.transport_engine,
|
|
||||||
&AnodeHttpClient_dns_result_handler,
|
|
||||||
client,
|
|
||||||
client->uri.host,
|
|
||||||
ANODE_TRANSPORT_DNS_QUERY_ALWAYS,
|
|
||||||
ANODE_TRANSPORT_DNS_QUERY_IF_NO_PREVIOUS,
|
|
||||||
ANODE_TRANSPORT_DNS_QUERY_NEVER);
|
|
||||||
} else AnodeHttpClient_do_initiate_client(client);
|
|
||||||
}
|
|
||||||
|
|
||||||
void AnodeHttpClient_free(struct AnodeHttpClient *client)
|
|
||||||
{
|
|
||||||
AnodeDictionary_destroy(&(client->headers));
|
|
||||||
AnodeDictionary_destroy(&(client->response.headers));
|
|
||||||
|
|
||||||
if (client->impl.tcp_connection) {
|
|
||||||
client->impl.transport_engine->tcp_close(client->impl.transport_engine,client->impl.tcp_connection);
|
|
||||||
client->impl.tcp_connection = (AnodeTransportTcpConnection *)0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (client->response.data)
|
|
||||||
free(client->response.data);
|
|
||||||
|
|
||||||
client->impl.freed = 1;
|
|
||||||
client->impl.transport_engine->run_later(client->impl.transport_engine,client,&free);
|
|
||||||
}
|
|
|
@ -1,200 +0,0 @@
|
||||||
/* libanode: the Anode C reference implementation
|
|
||||||
* Copyright (C) 2009-2010 Adam Ierymenko <adam.ierymenko@gmail.com>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published by
|
|
||||||
* the Free Software Foundation, either version 3 of the License, or
|
|
||||||
* (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
||||||
|
|
||||||
#ifndef _ANODE_HTTP_CLIENT_H
|
|
||||||
#define _ANODE_HTTP_CLIENT_H
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include "dictionary.h"
|
|
||||||
#include "../anode.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
|
||||||
* HTTP request type
|
|
||||||
*/
|
|
||||||
enum AnodeHttpClientRequestMethod
|
|
||||||
{
|
|
||||||
ANODE_HTTP_GET = 0,
|
|
||||||
ANODE_HTTP_HEAD = 1,
|
|
||||||
ANODE_HTTP_POST = 2
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Special response codes to indicate I/O errors
|
|
||||||
*/
|
|
||||||
#define ANODE_HTTP_SPECIAL_RESPONSE_DNS_RESOLVE_FAILED -1
|
|
||||||
#define ANODE_HTTP_SPECIAL_RESPONSE_CONNECT_FAILED -2
|
|
||||||
#define ANODE_HTTP_SPECIAL_RESPONSE_HEADERS_TOO_LARGE -3
|
|
||||||
#define ANODE_HTTP_SPECIAL_RESPONSE_SERVER_CLOSED_CONNECTION -4
|
|
||||||
#define ANODE_HTTP_SPECIAL_RESPONSE_INVALID_RESPONSE -5
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simple HTTP client
|
|
||||||
*/
|
|
||||||
struct AnodeHttpClient
|
|
||||||
{
|
|
||||||
/**
|
|
||||||
* Request URI
|
|
||||||
*/
|
|
||||||
AnodeURI uri;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request method: GET, PUT, HEAD, or POST
|
|
||||||
*/
|
|
||||||
enum AnodeHttpClientRequestMethod method;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Data for POST requests
|
|
||||||
*
|
|
||||||
* It is your responsibility to manage and/or free this pointer. The HTTP
|
|
||||||
* client only reads from it.
|
|
||||||
*/
|
|
||||||
const void *data;
|
|
||||||
unsigned int data_length;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Content type for data, or null for application/x-www-form-urlencoded
|
|
||||||
*/
|
|
||||||
const char *data_content_type;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set to non-zero to use HTTP connection keepalive
|
|
||||||
*
|
|
||||||
* If keepalive is enabled, this request can be modified and re-used and
|
|
||||||
* its associated connection will stay open (being reopened if needed)
|
|
||||||
* until it is freed.
|
|
||||||
*
|
|
||||||
* Note that this client is too dumb to pool connections and pick them on
|
|
||||||
* the basis of host. Keepalive mode should only be set if the next request
|
|
||||||
* will be from the same host and port, otherwise you will get a '404'.
|
|
||||||
*/
|
|
||||||
int keepalive;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function pointer to be called when request is complete (or fails)
|
|
||||||
*/
|
|
||||||
void (*handler)(struct AnodeHttpClient *);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Two arbitrary pointers that can be stored here for use by the handler.
|
|
||||||
* These are not accessed or modified by the client.
|
|
||||||
*/
|
|
||||||
void *ptr[2];
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Request headers
|
|
||||||
*/
|
|
||||||
struct AnodeDictionary headers;
|
|
||||||
|
|
||||||
struct {
|
|
||||||
/**
|
|
||||||
* Response code, set on completion or failure before handler is called
|
|
||||||
*
|
|
||||||
* Also check for the special response codes defined in http_client.h as
|
|
||||||
* these negative codes indicate network or other errors.
|
|
||||||
*/
|
|
||||||
int code;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Response data, for GET and POST requests
|
|
||||||
*/
|
|
||||||
void *data;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Length of response data
|
|
||||||
*/
|
|
||||||
unsigned int data_length;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Response headers
|
|
||||||
*/
|
|
||||||
struct AnodeDictionary headers;
|
|
||||||
} response;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal fields used by implementation
|
|
||||||
*/
|
|
||||||
struct {
|
|
||||||
/* Transport engine being used by request */
|
|
||||||
AnodeTransportEngine *transport_engine;
|
|
||||||
|
|
||||||
/* Connection to which request has been sent, or null if none */
|
|
||||||
struct AnodeHttpConnection *connection;
|
|
||||||
|
|
||||||
/* Buffer for reading chunked mode chunk lines (can't use data buf) */
|
|
||||||
char header_line_buf[256];
|
|
||||||
unsigned int header_line_buf_ptr;
|
|
||||||
|
|
||||||
/* Where are we in sending request data? */
|
|
||||||
unsigned int request_data_ptr;
|
|
||||||
|
|
||||||
/* Capacity of response_data buffer */
|
|
||||||
unsigned int response_data_capacity;
|
|
||||||
|
|
||||||
/* How much response data are we currently expecting? */
|
|
||||||
/* This is content-length in block mode or chunk length in chunked mode */
|
|
||||||
unsigned int expecting_response_length;
|
|
||||||
|
|
||||||
/* Read mode */
|
|
||||||
enum {
|
|
||||||
ANODE_HTTP_READ_MODE_WAITING = 0,
|
|
||||||
ANODE_HTTP_READ_MODE_HEADERS = 1,
|
|
||||||
ANODE_HTTP_READ_MODE_BLOCK = 2,
|
|
||||||
ANODE_HTTP_READ_MODE_CHUNKED_CHUNK_SIZE = 3,
|
|
||||||
ANODE_HTTP_READ_MODE_CHUNKED_DATA = 4,
|
|
||||||
ANODE_HTTP_READ_MODE_CHUNKED_FOOTER = 5
|
|
||||||
} read_mode;
|
|
||||||
|
|
||||||
/* Connection from transport engine */
|
|
||||||
AnodeTransportTcpConnection *tcp_connection;
|
|
||||||
|
|
||||||
/* Write buffer */
|
|
||||||
unsigned char outbuf[16384];
|
|
||||||
unsigned int outbuf_len;
|
|
||||||
|
|
||||||
/* Phase of request state machine */
|
|
||||||
enum {
|
|
||||||
ANODE_HTTP_REQUEST_PHASE_RESOLVE = 0,
|
|
||||||
ANODE_HTTP_REQUEST_PHASE_CONNECT = 1,
|
|
||||||
ANODE_HTTP_REQUEST_PHASE_SEND = 2,
|
|
||||||
ANODE_HTTP_REQUEST_PHASE_RECEIVE = 3,
|
|
||||||
ANODE_HTTP_REQUEST_PHASE_KEEPALIVE = 4,
|
|
||||||
ANODE_HTTP_REQUEST_PHASE_CLOSED = 5
|
|
||||||
} phase;
|
|
||||||
|
|
||||||
/* Has request object been freed? */
|
|
||||||
int freed;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Pointer used internally for putting requests into linked lists
|
|
||||||
*/
|
|
||||||
struct AnodeHttpClient *next;
|
|
||||||
} impl;
|
|
||||||
};
|
|
||||||
|
|
||||||
struct AnodeHttpClient *AnodeHttpClient_new(AnodeTransportEngine *transport_engine);
|
|
||||||
void AnodeHttpClient_send(struct AnodeHttpClient *client);
|
|
||||||
void AnodeHttpClient_free(struct AnodeHttpClient *client);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue