Commit Graph

6393 Commits

Author SHA1 Message Date
763caaebab Merge pull request #2161 from parona-source/execstack
Append noexecstack to linker flags instead of assembler flags
2024-09-09 16:22:14 -04:00
276259394a Merge branch 'dev' into jh-zerotier-multithreaded 2024-09-09 16:19:37 -04:00
46c0d1a732 Merge pull request #2320 from zerotier/report-os-arch
Report os arch
2024-09-09 16:13:47 -04:00
31d2dcec17 Merge pull request #2263 from fedepell/patch-1
Update README.md minimal compilers
2024-09-09 16:04:35 -04:00
c9234ee027 Merge branch 'dev' into patch-1 2024-09-09 16:03:41 -04:00
9a8d715666 Merge branch 'report-os-arch' of github.com:/zerotier/ZeroTierOne into report-os-arch 2024-09-09 14:36:43 -04:00
8d474e1395 Add ios differentiation, and .clangd that works w/Zed and clangd. 2024-09-09 14:36:22 -04:00
52e3d9b804 Merge branch 'dev' into report-os-arch 2024-09-09 14:26:53 -04:00
8f5cc4ed33 Completely remove vestigial RX code 2024-09-06 15:19:06 -07:00
059d05f41f Comment out vestigial test code (improves mt performance) 2024-09-06 09:52:39 -07:00
c86b91c5f0 Fix condition where settings may be applied with multithreading is disabled 2024-09-04 12:14:20 -07:00
e42848d37d Fix bug for when no multithreaded config is given 2024-09-04 11:00:23 -07:00
bf7dddbd84 Fix issues that prevent user multipath preferences from being respected 2024-08-29 10:09:19 -07:00
95983ba168 Build fix for FreeBSD 2024-08-26 12:54:36 -07:00
c97943d69d Add packet mux source file to Windows project 2024-08-22 15:28:25 -07:00
b813ea70a5 Simplify packet critical path. Plus more platform fixes 2024-08-22 12:59:06 -07:00
e734019216 More platform-related build fixes 2024-08-21 14:06:25 -07:00
b7d9290de9 Fix build issue on macOS 2024-08-21 11:22:07 -07:00
b1a30ae4ff Switch to local.conf-based config of multithreading 2024-08-20 13:39:15 -07:00
8283a6d6d4 Merge branch 'dev' into jh-zerotier-multithreaded 2024-08-18 15:08:42 -07:00
36adae3d82 Add packet multiplexer 2024-08-18 15:07:18 -07:00
f176e2539e Merge pull request #2162 from parona-source/respect-ldflags
Respect user LDFLAGS
2024-07-31 09:54:19 -07:00
d6bfb8889a Merge branch 'dev' into respect-ldflags 2024-07-31 09:52:50 -07:00
24fb1ced3c Merge pull request #2169 from ChrisCarini/ChrisCarini/addArchToSynologyDSM7
Add ARM architectures to Synology DSM7
2024-07-25 15:01:33 -07:00
82b8a4f584 Merge pull request #2314 from Mic92/pwd
macos: use more portable pwd instead of PWD
2024-07-16 11:21:24 -07:00
979bca57d5 Merge branch 'dev' into ChrisCarini/addArchToSynologyDSM7 2024-07-13 04:24:04 -07:00
93fd93da5c Merge pull request #2330 from zerotier/controller-redis
break up redis tx inserts into smaller chunks
2024-07-08 14:30:14 -07:00
508527f7cd break up redis tx inserts into smaller chunks 2024-07-08 14:08:54 -07:00
64634c916c Fix build for macOS, tune to prevent packet re-ordering 2024-07-03 08:49:07 -07:00
34cc26176c Merge pull request #2266 from zerotier/winbuild
fix rebuild for x64
2024-06-28 08:07:25 -07:00
e2840b0eb8 undo stuff from other branch 2024-06-24 18:54:05 -04:00
f4edb092b7 Merge branch 'dev' into rusty-tcp-relay 2024-06-24 18:53:25 -04:00
8caede300c Add OS_ARCH to network config metadata. 2024-06-24 18:02:58 -04:00
f9c6ee0181 macos: use more portable pwd instead of PWD
In nixpkgs we use coreutils and do not have PWD available.
This change have any downsides on normal macOS systems, but helps
nixpkgs packaging a bit.

Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
2024-06-21 15:05:02 +02:00
f5cc7746b6 Merge branch 'dev' into winbuild 2024-06-18 16:57:47 -07:00
41a4690372 Merge pull request #2312 from zerotier/delete 2024-06-18 15:05:06 -07:00
9d57ccd7b1 deauth all members upon network delete 2024-06-17 16:38:41 -07:00
ad60d708e1 fix log line 2024-06-17 16:38:31 -07:00
f79af92599 Add Rust tcp-proxy base, add .clangd 2024-06-17 11:02:13 -04:00
2f3ea8882b Merge branch 'dev' into ChrisCarini/addArchToSynologyDSM7 2024-06-01 03:22:38 -07:00
e32fecd16d Thread might actually be detached, so need to handle that 2024-05-21 13:12:22 -04:00
dca77cb0d2 expand GETENV macro that needs to be modified 2024-05-21 13:12:22 -04:00
9ec6c2901c Respect user LDFLAGS
* Respect user LDFLAGS instead of replacing them.

Signed-off-by: Alfred Wingate <parona@protonmail.com>
2024-05-18 16:01:32 +03:00
e915d10953 cargo update rustybits (#2286) 2024-05-09 18:57:48 +02:00
ddb2759a52 Merge pull request #2287 from zerotier:actions
Fix macOS GitHub Action
2024-05-09 09:47:48 -07:00
28cf1423c9 also install x64 rust in github action 2024-05-09 09:35:54 -07:00
0fb9d43998 Merge pull request #2282 from zerotier/main
Main -> dev
2024-05-02 17:15:57 -07:00
91e7ce87f0 Merge pull request #2281 from zerotier/1.14.0
1.14.0
1.14.0
2024-05-02 19:48:52 -04:00
e59790b401 Update security readme. 2024-05-02 19:45:07 -04:00
d0b8f76ecb release notes 2024-05-02 19:31:57 -04:00