Merge pull request #2507 from zerotier/adam/1.16

V1.16 kitchen sink branch, 1.16 ready.
Fix JNI after ZT_Node_New function signature change
2026-09-22 15:29:03 -07:00 · 2025-09-11 13:52:09 -04:00 · 2025-09-11 07:36:25 -07:00 · 2025-09-08 16:17:36 -04:00 · 2025-09-08 16:17:24 -04:00 · 2025-09-08 13:05:25 -04:00
1864 changed files with 266400 additions and 36541 deletions
@@ -0,0 +1,11 @@
+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"
+    - "-I../ext/opentelemetry-cpp-1.21.0/api/include"
+    - "-I./ext"
+    - "-I./ext/prometheus-cpp-lite-1.0/core/include"
+    - "-I./ext/prometheus-cpp-lite-1.0/simpleapi/include"
+    - "-I./ext/opentelemetry-cpp-1.21.0/api/include"
@@ -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
- ])
- 
@@ -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
-
-...
@@ -1,4 +1,7 @@
-on: [ push ]
+on:
+  pull_request:
+  push:
+  workflow_dispatch:

 jobs:
  build_ubuntu:
@@ -9,13 +12,12 @@ jobs:
        git config --global core.autocrlf input
      #        git config --global core.eol lf
    - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
    - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@stable
      with:
        toolchain: stable
-        target: x86_64-unknown-linux-gnu
-        override: true
+        targets: x86_64-unknown-linux-gnu
        components: rustfmt, clippy

    - name: Set up cargo cache
@@ -33,6 +35,14 @@ jobs:
      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
@@ -42,13 +52,18 @@ jobs:
        git config --global core.autocrlf input
      #        git config --global core.eol lf
    - name: checkout
-      uses: actions/checkout@v3
-    - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: actions/checkout@v4
+    - name: Install Rust aarch64
+      uses: dtolnay/rust-toolchain@stable
      with:
        toolchain: stable
        target: aarch64-apple-darwin
-        override: true
+        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
@@ -58,13 +73,21 @@ jobs:
        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
@@ -74,13 +97,12 @@ jobs:
        git config --global core.autocrlf true
      #        git config --global core.eol lf
    - name: checkout
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
    - name: Install Rust
-      uses: actions-rs/toolchain@v1
+      uses: dtolnay/rust-toolchain@stable
      with:
        toolchain: stable
        target: aarch64-apple-darwin
-        override: true
        components: rustfmt, clippy
    - name: Set up cargo cache
      uses: Swatinem/rust-cache@v2
@@ -92,7 +114,13 @@ jobs:
          rustybits/

    - name: setup msbuild
-      uses: microsoft/setup-msbuild@v1.1.3
+      uses: microsoft/setup-msbuild@v2
    - name: msbuild
      run: |
-        msbuild windows\ZeroTierOne.sln /m /p:Configuration=Release  /property:Platform=x64 /t:ZeroTierOne        
+        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
@@ -1,4 +1,5 @@
 on:
+  pull_request:
  push:
  workflow_dispatch:

@@ -38,13 +39,13 @@ jobs:
        CXX: 'g++'
        BRANCH: ${{  github.ref_name }}
      run: |
-        sudo apt install -y valgrind xmlstarlet gcovr iperf3 tree
+        sudo apt update && 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@v3
+      uses: actions/upload-artifact@v4
      with:
        name: ${{github.sha}}-test-results
        path: "*test-results*"
@@ -6,16 +6,19 @@
 /zerotier
 /nltest

-# IDE stuff
+# IDE and dev tool stuff
 /.idea
 /.nova
 /compile_commands.json
+/.claude
+/.aider

 # OS-created garbage files from various platforms
 .DS_Store
 .Apple*
 Thumbs.db
@eaDir
+lost+found
 ._*

 # Windows build droppings
@@ -58,6 +61,9 @@ zt1-src.tar.gz
 /MacEthernetTapAgent

 # Miscellaneous temporaries, build files, etc.
+ext/installfiles/windows/*.back*.aip
+tcp-proxy/tcp-proxy
+rustybits/target
 *.log
 *.opensdf
 *.user
@@ -101,7 +107,6 @@ windows/ZeroTierOne/Debug/
 /ext/installfiles/windows/chocolatey/zerotier-one/*.nupkg

 # Miscellaneous mac/Xcode droppings
-.DS_Store
 .Trashes
 *.swp
 *~.nib
@@ -124,18 +129,15 @@ attic/world/mkworld
 workspace/
 workspace2/
 zeroidc/target/
+tcp-proxy/target

-#snapcraft specifics
+# Snapcraft Linux build stuff
 /parts/
 /stage/
 /prime/
-
 *.snap
-
 .snapcraft
 __pycache__
 *.pyc
 *_source.tar.bz2
 snap/.snapcraft
-tcp-proxy/tcp-proxy
-rustybits/target
@@ -1,14 +0,0 @@
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
-kick
@@ -1,75 +0,0 @@
-# Authors and Third Party Code Licensing Information
-
-## Primary Authors
-
- * ZeroTier Core and ZeroTier One virtual networking service<br>
-   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>
-   Grant Limberg / glimberg@gmail.com
-
- * ZeroTier SDK (formerly known as Network Containers)<br>
-   Joseph Henry / joseph.henry@zerotier.com
-
-## Third Party Contributors
-
- * A number of fixes and improvements to the new controller, other stuff.<br>
-   Kees Bos / https://github.com/keesbos/
-
- * Debugging and testing, OpenWRT support fixes.<br>
-   Moritz Warning / moritzwarning@web.de
-
- * Debian GNU/Linux packaging, manual pages, and license compliance edits.<br>
-   Ben Finney <ben+zerotier@benfinney.id.au>
-
- * Several others made smaller contributions, which GitHub tracks here:<br>
-   https://github.com/zerotier/ZeroTierOne/graphs/contributors/
-
-## 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
-
-   * Files: node/Packet.cpp (bundled within anonymous namespace)
-   * Home page: http://code.google.com/p/lz4/
-   * License grant: BSD 2-clause
-
- * http-parser by Joyent, Inc. (many authors)
-
-   * Files: ext/http-parser/*
-   * Home page: https://github.com/joyent/http-parser/
-   * License grant: MIT/Expat
-
- * C++11 json (nlohmann/json) by Niels Lohmann
-
-   * Files: ext/json/*
-   * Home page: https://github.com/nlohmann/json
-   * License grant: MIT
-
- * tap-windows6 by the OpenVPN project
-
-   * Files: windows/TapDriver6/*
-   * Home page: https://github.com/OpenVPN/tap-windows6/
-   * 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
-
- * cpp-httplib by yhirose
-
-   * Files: ext/cpp-httplib/*
-   * Home page: https://github.com/yhirose/cpp-httplib
-   * License grant: MIT
@@ -1,12 +0,0 @@
-ZeroTier One, an endpoint server for the ZeroTier virtual network layer.
-Copyright © 2011–2019 ZeroTier, Inc.
-
-ZeroTier is released under the terms of the BSL version 1.1. See the
-file LICENSE.txt for details.
-
-..
-    Local variables:
-    coding: utf-8
-    mode: text
-    End:
-    vim: fileencoding=utf-8 filetype=text :
@@ -1,6 +1,6 @@
 # vim: ft=dockerfile

-FROM debian:bullseye
+FROM debian:bookworm

 ARG VERSION

@@ -9,9 +9,9 @@ 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/bullseye bullseye main" > /etc/apt/sources.list.d/zerotier.list
+    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 libssl1.1 -y
+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
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
@@ -1,149 +1,5 @@
-----------------------------------------------------------------------------
+See LICENSE-MPL.txt for all code in node/, osdep/. service/, and everywhere else except ext/ and nonfree/.

-Business Source License 1.1
+See nonfree/LICENSE.md for all non-free ("source available") portions of this repository.

-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.
+Code in ext/ is external code included for build convenience or backward compatibility and retains its original license.
@@ -31,3 +31,6 @@ drone:
 	@echo "rendering .drone.yaml from .drone.jsonnet"
 	drone jsonnet --format --stream
 	drone sign zerotier/ZeroTierOne --save
+
+clang-format:
+	find node osdep service tcp-proxy nonfree/controller -iname '*.cpp' -o -iname '*.hpp' | xargs clang-format -i
@@ -14,6 +14,7 @@ The version must be incremented in all of the following files:
    /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.)

@@ -29,4 +30,4 @@ You will need [Packages](http://s.sudre.free.fr/Software/Packages/about.html) an

 ## 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.
+First load the Visual Studio solution and rebuild the UI and ZeroTier One in both x64, i386, and arm64 `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.
@@ -64,6 +64,7 @@ You can control a few settings including the identity used and the authtoken use
 - `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

@@ -58,7 +58,7 @@ To build on Mac and Linux just type `make`. On FreeBSD and OpenBSD `gmake` (GNU
   - 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++ 4.9.3 or CLANG/CLANG++ 3.4.2. (Install `clang` on CentOS 7 as G++ is too old.)
+   - 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**
@@ -1,7 +1,87 @@
 ZeroTier Release Notes
 ======

-# 2024-05-02 -- Version 1.14.0
+## 2025-08-21 -- Version 1.16.0
+
+  * License Changes
+    * The core (`node/` and `include/`) and the service (`service/` and `osdep/`) are now under the Mozilla Public License (MPL).
+    * The network controller (`controller/`) is now under a commercial source-available license.
+    * Use `make ZT_NONFREE=1` to build non-MPL components.
+    * Building with `ZT_NONFREE=1` changes the license of the resulting executable to a proprietary commercial license vs. MPL.
+  * Default binary builds no longer contain the controller.
+  * Network-Specific Relays (preview / beta)
+    * It is now possible to designate one or more nodes as network-specific relays to be used in preference to roots for relayed traffic between members of a network. These nodes need not necessarily be members of the network.
+    * "Moons" are now considered even more extra *deprecated* and should not be used in new deployments.
+    * We will announce support for network-specific relays once we have worked with some users to test and performed more internal validation.
+  * HELLO packet encryption is now available by enabling the `encryptedHelloEnabled` settting in `local.conf`.
+    * HELLO packets contain no data, only public keys and very basic meta-data like protocol version information.
+    * Most users won't care about this, but if you require this for e.g. compliance reasons you can enable. This adds a small amount of CPU and bandwidth overhead to the HELLO sign-on process.
+  * Small Fixes
+    * Code has been reformatted using `clang-format` with a `.clang-format` definition in the repo. Typing `make clang-format` executes this against all main core and service C++ files.
+    * Bridges are no longer counted toward multicast limits.
+    * A flow designation issue in bridged traffic under multipath scenarios has been fixed.
+    * Library version updates for OIDC and other features.
+    * Antiquated and unused software update code removed for precautionary reasons.
+    * Compiler warnings removed through removing use of deprecated functions on some platforms.
+    * Other minor bug fixes.
+
+  * Merged PRs:
+    * PR #2495: Hosted controller changes for cv1 os/arch reporting
+    * PR #2493: Add a warning about missing DNS functionality on Linux
+    * PR #2491: Fix: standardize bond link selection method JSON field naming
+    * PR #2489: Fix link select field in bond CLI
+    * PR #2487: Windows installer fixes
+    * PR #2486: Add 'apt update' to validation action
+    * PR #2482: Add OpenTelemetry support in Central Controllers
+    * PR #2481: Rust warning removal, clippy allows, update library versions
+    * PR #2477: Don't count bridges towards multicast limit. Send to all bridges
+    * PR #2475: clang-format
+    * PR #2474: Hello encryption
+    * PR #2452: CV2 db schema support
+    * PR #2451: Bump crossbeam-channel from 0.5.13 to 0.5.15 in /rustybits
+    * PR #2450: Bump tokio from 1.42.0 to 1.43.1 in /rustybits
+    * PR #2449: Bump openssl from 0.10.70 to 0.10.72 in /rustybits
+    * PR #2445: Allow setting local.conf content from Docker environment variable
+    * PR #2444: Temporal sdk fix
+    * PR #2443: Fix AuthInfo Provider not being set
+    * PR #2442: Bump ring from 0.17.8 to 0.17.13 in /rustybits
+    * PR #2441: Run CI on pull requests
+    * PR #2438: Add custom control plane for third-party device vendors
+    * PR #2432: Update upload-artifact action to use v4
+    * PR #2430: Bump openssl from 0.10.68 to 0.10.70 in /rustybits
+    * PR #2427: Fix active backup link selection
+    * PR #2417: Update rust dependencies
+    * PR #2409: Bump rustls from 0.23.15 to 0.23.18 in /rustybits
+    * PR #2405: Build fix for OpenBSD - See ticket #2397
+
+----
+
+# 1.14
+
+## 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
@@ -10,18 +90,22 @@ ZeroTier Release Notes
  * Controller API enhancements: node names and other node meta-data
  * Other bug fixes

-# 2023-09-12 -- Version 1.12.2
+----
+
+# 1.12 and Older
+
+## 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
+## 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
+## 2023-08-23 -- Version 1.12.0

  * Experimental Windows ARM64 support
  * Fix numerous sleep/wake issues on macOS and other platforms
@@ -31,17 +115,17 @@ ZeroTier Release Notes
  * Numerous macOS DNS fixes
  * 10-30% speed improvement on Linux

-# 2023-03-23 -- Version 1.10.6
+## 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
+## 2023-03-10 -- Version 1.10.5

 * Fix for high CPU usage bug on Windows

-# 2023-03-07 -- Version 1.10.4
+## 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
@@ -50,11 +134,10 @@ ZeroTier Release Notes
   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
+## 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.
@@ -66,7 +149,7 @@ ZeroTier Release Notes
 * Fix bug that prevented setting of custom TCP relay address.
 * Build script improvements and bug fixes.

-# 2022-11-01 -- Version 1.10.2
+## 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.
@@ -77,12 +160,12 @@ ZeroTier Release Notes

 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
+## 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
+## 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.
@@ -91,11 +174,11 @@ Note that releases are coming few and far between because most of our dev effort
 * 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
+## 2022-05-10 -- Version 1.8.10

 * Fixed a bug preventing SSO sign-on on Windows.

-# 2022-04-25 -- Version 1.8.9
+## 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.
@@ -104,26 +187,26 @@ Note that releases are coming few and far between because most of our dev effort
 * 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
+## 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
+## 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
+## 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
+## 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.
@@ -131,7 +214,7 @@ Note that releases are coming few and far between because most of our dev effort
 * 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
+## 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.
@@ -139,7 +222,7 @@ Note that releases are coming few and far between because most of our dev effort
 * 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
+## 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.
@@ -147,14 +230,14 @@ Note that releases are coming few and far between because most of our dev effort
 * 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
+## 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
+## 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.
@@ -164,7 +247,7 @@ Note that releases are coming few and far between because most of our dev effort

 * 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)
+## 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.
@@ -175,32 +258,32 @@ Note that releases are coming few and far between because most of our dev effort
 * 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
+## 2021-09-21 -- Version 1.6.6

 * Backport COM hash check mitigation against network member impersonation.

-# 2021-04-13 -- Version 1.6.5
+## 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
+## 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
+## 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
+## 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
+## 2020-11-24 -- Version 1.6.1

 This release fixes some minor bugs and other issues in 1.6.0.

@@ -210,7 +293,7 @@ This release fixes some minor bugs and other issues in 1.6.0.
 * 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
+## 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.

@@ -251,7 +334,7 @@ Known issues that are not yet fixed in this beta:

 We're trying to fix all these issues before the 1.6.0 release. Stay tuned.

-# 2019-08-30 -- Version 1.4.6
+## 2019-08-30 -- Version 1.4.6

 * Update default root list to latest
 * ARM32 platform build and flag fixes
@@ -260,19 +343,19 @@ We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
 * 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
+## 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
+## 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
+## 2019-07-29 -- Version 1.4.0

 ### Major Changes

@@ -290,20 +373,20 @@ We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
 * 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
+## 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
+## 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
+## 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
@@ -311,7 +394,7 @@ We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
 * Merged alpha NetBSD support (mostly untested, so YMMV)
 * Merged several minor typo and one-liner bug fixes

-# 2018-04-17 -- Version 1.2.6
+## 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.
@@ -346,7 +429,7 @@ We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
        * 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
+## 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.
@@ -356,128 +439,12 @@ We're trying to fix all these issues before the 1.6.0 release. Stay tuned.
 * 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
+## 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
+## 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.
@@ -1,6 +1,6 @@
 # Security

-ZeroTier takes the security of our software products and services seriously, which 
+ZeroTier takes the security of our software products and services seriously, which
 includes all source code repositories managed through our GitHub organization.

 ## Supported Versions
@@ -9,8 +9,9 @@ The following versions of ZeroTier One receive security updates

 | Version  | Supported          |
 | -------- | ------------------ |
+| 1.16.x   | :white_check_mark: |
 | 1.14.x   | :white_check_mark: |
-| 1.12.x   | :white_check_mark: |
+| 1.12.x   | :x:                |
 | < 1.12.0 | :x:                |

 ## Reporting a Vulnerability
@@ -20,7 +21,7 @@ The following versions of ZeroTier One receive security updates
 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 
+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.)
@@ -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 &quot;join&quot; and enter a network's 16-digit ID. Each network appears on your computer as a new network port."/>
-                </Paragraph>
-            </FlowDocument>
-        </RichTextBox>
-
-	</Grid>
-</Window>