void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-06 20:43:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into gh-2056

Browse source
This commit is contained in:
Grant Limberg 2023-07-18 13:39:21 -04:00 • committed by GitHub
commit d8c215b252
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 8277 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
.drone.jsonnet
View file

@ -38,6 +38,11 @@ local less_targets = [
{ "os": "linux", distro: "ubuntu", "name": "focal", "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 = [ local master_targets = [
// //
// copypasta from here // copypasta from here
@ -239,13 +244,13 @@ std.flattenArrays([
[ [
Index(p) Index(p)
] ]
for p in targets for p in native_targets
]) + ]) +
std.flattenArrays([ std.flattenArrays([
[ [
Test(p.os, p.distro, p.name, isa, p.events) Test(p.os, p.distro, p.name, isa, p.events)
for isa in p.isas for isa in p.isas
] ]
for p in targets for p in native_targets
]) ])

8277
.drone.yml
View file

File diff suppressed because it is too large Load diff

2
osdep/Binder.hpp
View file

@ -320,7 +320,7 @@ class Binder {
// //
(void)gotViaProc; (void)gotViaProc;
#if ! (defined(ZT_SDK) || defined(__ANDROID__)) // getifaddrs() freeifaddrs() not available on Android #if ! defined(__ANDROID__) // getifaddrs() freeifaddrs() not available on Android
if (! gotViaProc) { if (! gotViaProc) {
struct ifaddrs* ifatbl = (struct ifaddrs*)0; struct ifaddrs* ifatbl = (struct ifaddrs*)0;
struct ifaddrs* ifa; struct ifaddrs* ifa;