Code

1.14.1 merge dev to main#2363

Code

Merged

adamierymenko merged 67 commits intomainzerotier/ZeroTierOne:mainfrom devzerotier/ZeroTierOne:devCopy head branch name to clipboardSep 12, 2024

+1,625-824

Commits

Commits on Oct 29, 2023

• Append noexecstack to linker flags instead of assembler flags

  Show description for e171384
  parona-source

  committed
  e171384

Commits on Nov 4, 2023

• Add ARM architectures to Synology DSM7

  ChrisCarini

  committed
  5533b82

Commits on Nov 15, 2023

• Fix how MAC addresses are handled by the rules parser

  Show description for 1aa31e0
  lel-amri

  committed
  1aa31e0

Commits on Feb 5, 2024

• Merge branch 'dev' into ChrisCarini/addArchToSynologyDSM7

  ChrisCarini

  authored
  8b44ac9

Commits on Feb 23, 2024

• Add multi-core concurrent packet processing

  joseph-henry

  committed
  683d332

Commits on Mar 5, 2024

• Merge branch 'dev' into fix-mac-handling-in-rules-parser

  joseph-henry

  authored
  43b1415

• Merge branch 'dev' into fix-mac-handling-in-rules-parser

  joseph-henry

  authored
  80cfc2b

• Don't pass result of void function to string constructor

  joseph-henry

  committed
  b9d0cf9

Commits on Mar 25, 2024

• Update README.md minimal compilers

  Show description for 280cc77
  fedepell

  authored
  280cc77

Commits on Mar 27, 2024

• fix rebuild for x64

  glimberg

  committed
  9de2b90

Commits on May 3, 2024

• Merge pull request #2282 from zerotier/main

  Show description for 0fb9d43
  glimberg

  authored
  0fb9d43

Commits on May 9, 2024

• also install x64 rust in github action

  glimberg

  committed
  28cf142

• Merge pull request #2287 from zerotier:actions

  Show description for ddb2759
  glimberg

  authored
  ddb2759

• cargo update rustybits (#2286)

  someara

  authored
  e915d10

Commits on May 18, 2024

• Respect user LDFLAGS

  Show description for 9ec6c29
  parona-source

  committed
  9ec6c29

Commits on May 21, 2024

• expand GETENV macro that needs to be modified

  bostick

  committed
  dca77cb

• Thread might actually be detached, so need to handle that

  bostick

  committed
  e32fecd

Commits on Jun 1, 2024

• Merge branch 'dev' into ChrisCarini/addArchToSynologyDSM7

  ChrisCarini

  authored
  2f3ea88

Commits on Jun 17, 2024

• Add Rust tcp-proxy base, add .clangd

  adamierymenko

  committed
  f79af92

• fix log line

  glimberg

  committed
  ad60d70

• deauth all members upon network delete

  glimberg

  committed
  9d57ccd

Commits on Jun 18, 2024

• Merge pull request #2312 from zerotier/delete

  glimberg

  authored
  41a4690

• Merge branch 'dev' into winbuild

  glimberg

  authored
  f5cc774

Commits on Jun 21, 2024

• macos: use more portable pwd instead of PWD

  Show description for f9c6ee0
  Mic92

  committed
  f9c6ee0

Commits on Jun 24, 2024

• Add OS_ARCH to network config metadata.

  adamierymenko

  committed
  8caede3

• Merge branch 'dev' into rusty-tcp-relay

  adamierymenko

  committed
  f4edb09

• undo stuff from other branch

  adamierymenko

  committed
  e2840b0

Commits on Jun 28, 2024

• Merge pull request #2266 from zerotier/winbuild

  Show description for 34cc261
  glimberg

  authored
  34cc261

Commits on Jul 3, 2024

• Fix build for macOS, tune to prevent packet re-ordering

  joseph-henry

  committed
  64634c9

Commits on Jul 8, 2024

• break up redis tx inserts into smaller chunks

  glimberg

  committed
  508527f

• Merge pull request #2330 from zerotier/controller-redis

  Show description for 93fd93d
  glimberg

  authored
  93fd93d

Commits on Jul 13, 2024

• Merge branch 'dev' into ChrisCarini/addArchToSynologyDSM7

  ChrisCarini

  authored
  979bca5

Commits on Jul 16, 2024

• Merge pull request #2314 from Mic92/pwd

  Show description for 82b8a4f
  joseph-henry

  authored
  82b8a4f

Commits on Jul 25, 2024

• Merge pull request #2169 from ChrisCarini/ChrisCarini/addArchToSynologyDSM7

  Show description for 24fb1ce
  joseph-henry

  authored
  24fb1ce

Commits on Jul 31, 2024

• Merge branch 'dev' into respect-ldflags

  joseph-henry

  authored
  d6bfb88

• Merge pull request #2162 from parona-source/respect-ldflags

  Show description for f176e25
  joseph-henry

  authored
  f176e25

Commits on Aug 18, 2024

• Add packet multiplexer

  joseph-henry

  committed
  36adae3

• Merge branch 'dev' into jh-zerotier-multithreaded

  joseph-henry

  committed
  8283a6d

Commits on Aug 20, 2024

• Switch to local.conf-based config of multithreading

  joseph-henry

  committed
  b1a30ae

Commits on Aug 21, 2024

• Fix build issue on macOS

  joseph-henry

  committed
  b7d9290

• More platform-related build fixes

  joseph-henry

  committed
  e734019

Commits on Aug 22, 2024

• Simplify packet critical path. Plus more platform fixes

  joseph-henry

  committed
  b813ea7

• Add packet mux source file to Windows project

  joseph-henry

  committed
  c97943d

Commits on Aug 26, 2024

• Build fix for FreeBSD

  joseph-henry

  committed
  95983ba

Commits on Aug 29, 2024

• Fix issues that prevent user multipath preferences from being respected

  joseph-henry

  committed
  bf7dddb

Commits on Sep 4, 2024

• Fix bug for when no multithreaded config is given

  joseph-henry

  committed
  e42848d

• Fix condition where settings may be applied with multithreading is disabled

  joseph-henry

  committed
  c86b91c

Commits on Sep 6, 2024

• Comment out vestigial test code (improves mt performance)

  

  Joseph Henry

  committed
  059d05f

• Completely remove vestigial RX code

  

  Joseph Henry

  committed
  8f5cc4e

Commits on Sep 9, 2024

• Merge branch 'dev' into report-os-arch

  adamierymenko

  authored
  52e3d9b

• Add ios differentiation, and .clangd that works w/Zed and clangd.

  adamierymenko

  committed
  8d474e1

• Merge branch 'report-os-arch' of github.com:/zerotier/ZeroTierOne into report-os-arch

  adamierymenko

  committed
  9a8d715

• Merge branch 'dev' into patch-1

  adamierymenko

  authored
  c9234ee

• Merge pull request #2263 from fedepell/patch-1

  Show description for 31d2dce
  adamierymenko

  authored
  31d2dce

• Merge pull request #2320 from zerotier/report-os-arch

  Show description for 46c0d1a
  adamierymenko

  authored
  46c0d1a

• Merge branch 'dev' into jh-zerotier-multithreaded

  adamierymenko

  committed
  2762593

• Merge pull request #2161 from parona-source/execstack

  Show description for 763caae
  adamierymenko

  authored
  763caae

• Merge branch 'dev' into jh-zerotier-multithreaded

  adamierymenko

  committed
  861147b

Commits on Sep 10, 2024

• Merge pull request #2354 from zerotier/jh-misc-multipath-patches

  Show description for fb8cbb6
  adamierymenko

  authored
  fb8cbb6

• Merge branch 'dev' into jh-zerotier-multithreaded

  adamierymenko

  committed
  6bc785e

• retain build artifacts

  Show description for 223ec0c
  laduke

  committed
  223ec0c

• tar mac and linux binary

  Show description for 560d6fb
  laduke

  committed
  560d6fb

• Merge pull request #2360 from laduke/dev

  Show description for 2522d29
  laduke

  authored
  2522d29

Commits on Sep 11, 2024

• Merge pull request #2234 from zerotier/jh-zerotier-multithreaded

  Show description for 4a485df
  adamierymenko

  authored
  4a485df

• Merge branch 'dev' into lel-amri-fix-mac-handling-in-rules-parser

  adamierymenko

  authored
  e1ee3eb

• Merge pull request #2244 from zerotier/lel-amri-fix-mac-handling-in-rules-parser

  Show description for 98e532d
  adamierymenko

  authored
  98e532d

Commits on Sep 12, 2024

• 1.14.1 (#2362)

  Show description for a0acc82
  adamierymenko

  authored
  a0acc82