diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..cded91568 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,51 @@ +on: [ push ] + +jobs: + build_ubuntu: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3 + + - name: make + run: make + + build_macos: + runs-on: macos-latest + steps: + - name: checkout + uses: actions/checkout@v3 + + - name: make + run: make + + test_ubuntu: + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v3 + + - name: cargo test + run: cargo test -v + + test_macos: + runs-on: macos-latest + steps: + - name: checkout + uses: actions/checkout@v3 + + - name: cargo test + run: cargo test -v + + # build_windows: + # runs-on: windows-latest + # steps: + # - name: checkout + # uses: actions/checkout@v3 + + # - name: setup msbuild + # uses: microsoft/setup-msbuild@v1.1.3 + + # - name: msbuild + # run: | + # msbuild windows\ZeroTierOne.sln /m /p:Configuration=Release /property:Platform=x64 /t:ZeroTierOne:Rebuild diff --git a/network-hypervisor/src/vl1/node.rs b/network-hypervisor/src/vl1/node.rs index da51d81cb..3c96c889a 100644 --- a/network-hypervisor/src/vl1/node.rs +++ b/network-hypervisor/src/vl1/node.rs @@ -202,7 +202,7 @@ pub trait InnerProtocol: Sync + Send { PacketHandlerResult::NotHandled } - /// Handle an OK, returing true if the OK was recognized. + /// Handle an OK, returning true if the OK was recognized. /// The default version returns NotHandled. fn handle_ok( &self, diff --git a/network-hypervisor/src/vl1/peer.rs b/network-hypervisor/src/vl1/peer.rs index 13f99c673..d74ac3851 100644 --- a/network-hypervisor/src/vl1/peer.rs +++ b/network-hypervisor/src/vl1/peer.rs @@ -502,7 +502,7 @@ impl Peer { // Decryption successful with static secret. message_id2 } else { - // Packet failed to decrypt using either ephemeral or permament key, reject. + // Packet failed to decrypt using either ephemeral or permanent key, reject. debug_event!( host_system, "[vl1] #{:0>16x} failed authentication", diff --git a/utils/src/arrayvec.rs b/utils/src/arrayvec.rs index b6ac68f5a..db76c5ebf 100644 --- a/utils/src/arrayvec.rs +++ b/utils/src/arrayvec.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::fmt::Debug; use std::io::Write; diff --git a/utils/src/blob.rs b/utils/src/blob.rs index 424b17add..0ad7b477e 100644 --- a/utils/src/blob.rs +++ b/utils/src/blob.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::fmt::Debug; diff --git a/utils/src/buffer.rs b/utils/src/buffer.rs index 30461aeda..d7dfbf96d 100644 --- a/utils/src/buffer.rs +++ b/utils/src/buffer.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::error::Error; use std::fmt::{Debug, Display}; diff --git a/utils/src/dictionary.rs b/utils/src/dictionary.rs index d0490647b..d54c809c8 100644 --- a/utils/src/dictionary.rs +++ b/utils/src/dictionary.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::collections::BTreeMap; use std::io::Write; diff --git a/utils/src/error.rs b/utils/src/error.rs index 221ac2433..1a23ea274 100644 --- a/utils/src/error.rs +++ b/utils/src/error.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::error::Error; use std::fmt::{Debug, Display}; diff --git a/utils/src/exitcode.rs b/utils/src/exitcode.rs index 4024f0cc2..ad9c8e4ba 100644 --- a/utils/src/exitcode.rs +++ b/utils/src/exitcode.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. // These were taken from BSD sysexits.h to provide some standard for process exit codes. diff --git a/utils/src/gate.rs b/utils/src/gate.rs index 32c157e5e..f869507f0 100644 --- a/utils/src/gate.rs +++ b/utils/src/gate.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. //use std::sync::atomic::{AtomicI64, Ordering}; diff --git a/utils/src/gatherarray.rs b/utils/src/gatherarray.rs index 8a0c0e01e..4442322b8 100644 --- a/utils/src/gatherarray.rs +++ b/utils/src/gatherarray.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::mem::{size_of, MaybeUninit}; use std::ptr::copy_nonoverlapping; diff --git a/utils/src/hex.rs b/utils/src/hex.rs index 76cff074d..7c3ace132 100644 --- a/utils/src/hex.rs +++ b/utils/src/hex.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. pub const HEX_CHARS: [u8; 16] = [ b'0', b'1', b'2', b'3', b'4', b'5', b'6', b'7', b'8', b'9', b'a', b'b', b'c', b'd', b'e', b'f', diff --git a/utils/src/io.rs b/utils/src/io.rs index 7885f5c50..89520ccda 100644 --- a/utils/src/io.rs +++ b/utils/src/io.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::fs::File; use std::io::Read; diff --git a/utils/src/lib.rs b/utils/src/lib.rs index b3651a513..0ddab812b 100644 --- a/utils/src/lib.rs +++ b/utils/src/lib.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. pub mod arrayvec; pub mod blob; diff --git a/utils/src/marshalable.rs b/utils/src/marshalable.rs index 57743cfb5..520ee1ec2 100644 --- a/utils/src/marshalable.rs +++ b/utils/src/marshalable.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::error::Error; use std::fmt::{Debug, Display}; diff --git a/utils/src/memory.rs b/utils/src/memory.rs index 166d1204e..5440d1e87 100644 --- a/utils/src/memory.rs +++ b/utils/src/memory.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. #[allow(unused_imports)] use std::mem::{needs_drop, size_of, MaybeUninit}; diff --git a/utils/src/pool.rs b/utils/src/pool.rs index 532d6f3b3..2ed8df323 100644 --- a/utils/src/pool.rs +++ b/utils/src/pool.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::ops::{Deref, DerefMut}; use std::ptr::NonNull; diff --git a/utils/src/ringbuffer.rs b/utils/src/ringbuffer.rs index 95b1d0e4b..27c3d1a2d 100644 --- a/utils/src/ringbuffer.rs +++ b/utils/src/ringbuffer.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::mem::MaybeUninit; diff --git a/utils/src/ringbuffermap.rs b/utils/src/ringbuffermap.rs index 681358f76..aa1b2482d 100644 --- a/utils/src/ringbuffermap.rs +++ b/utils/src/ringbuffermap.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::hash::{Hash, Hasher}; use std::mem::MaybeUninit; diff --git a/utils/src/thing.rs b/utils/src/thing.rs index 61f8d2819..7415b96e1 100644 --- a/utils/src/thing.rs +++ b/utils/src/thing.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::any::TypeId; use std::mem::{forget, size_of, MaybeUninit}; diff --git a/utils/src/varint.rs b/utils/src/varint.rs index 2d40e993e..e1f91f5a6 100644 --- a/utils/src/varint.rs +++ b/utils/src/varint.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::io::{Read, Write}; diff --git a/vl1-service/src/constants.rs b/vl1-service/src/constants.rs index 69592b0d0..436708eee 100644 --- a/vl1-service/src/constants.rs +++ b/vl1-service/src/constants.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. /// A list of unassigned or obsolete ports under 1024 that could possibly be squatted. pub const UNASSIGNED_PRIVILEGED_PORTS: [u16; 299] = [ diff --git a/vl1-service/src/datadir.rs b/vl1-service/src/datadir.rs index d7a066e4a..27fc0cc33 100644 --- a/vl1-service/src/datadir.rs +++ b/vl1-service/src/datadir.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::path::{Path, PathBuf}; use std::str::FromStr; diff --git a/vl1-service/src/lib.rs b/vl1-service/src/lib.rs index 8b36d1291..4dbd223a0 100644 --- a/vl1-service/src/lib.rs +++ b/vl1-service/src/lib.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. mod localinterface; mod localsocket; diff --git a/vl1-service/src/localinterface.rs b/vl1-service/src/localinterface.rs index 249e56521..758f1bd57 100644 --- a/vl1-service/src/localinterface.rs +++ b/vl1-service/src/localinterface.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::hash::Hash; diff --git a/vl1-service/src/localsocket.rs b/vl1-service/src/localsocket.rs index 9b6b514af..0b17fe8b0 100644 --- a/vl1-service/src/localsocket.rs +++ b/vl1-service/src/localsocket.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::hash::Hash; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/vl1-service/src/sys/getifaddrs.rs b/vl1-service/src/sys/getifaddrs.rs index 01e9310ae..1163f717d 100644 --- a/vl1-service/src/sys/getifaddrs.rs +++ b/vl1-service/src/sys/getifaddrs.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::mem::size_of; use std::ptr::{copy_nonoverlapping, null_mut}; diff --git a/vl1-service/src/sys/ipv6.rs b/vl1-service/src/sys/ipv6.rs index ddf3ba64b..210dbb86c 100644 --- a/vl1-service/src/sys/ipv6.rs +++ b/vl1-service/src/sys/ipv6.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. #[allow(unused_imports)] use zerotier_network_hypervisor::vl1::InetAddress; diff --git a/vl1-service/src/sys/mod.rs b/vl1-service/src/sys/mod.rs index 8c5d381ff..f00311104 100644 --- a/vl1-service/src/sys/mod.rs +++ b/vl1-service/src/sys/mod.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. pub mod getifaddrs; pub mod ipv6; diff --git a/vl1-service/src/sys/udp.rs b/vl1-service/src/sys/udp.rs index 4d7517d86..5543af64a 100644 --- a/vl1-service/src/sys/udp.rs +++ b/vl1-service/src/sys/udp.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::collections::{HashMap, HashSet}; #[allow(unused_imports)] diff --git a/vl1-service/src/vl1service.rs b/vl1-service/src/vl1service.rs index 335e8b1e3..cca43e675 100644 --- a/vl1-service/src/vl1service.rs +++ b/vl1-service/src/vl1service.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::collections::{HashMap, HashSet}; use std::error::Error; diff --git a/vl1-service/src/vl1settings.rs b/vl1-service/src/vl1settings.rs index ec3a52d46..1e928ea14 100644 --- a/vl1-service/src/vl1settings.rs +++ b/vl1-service/src/vl1settings.rs @@ -1,4 +1,4 @@ -// (c) 2020-2022 ZeroTier, Inc. -- currently propritery pending actual release and licensing. See LICENSE.md. +// (c) 2020-2022 ZeroTier, Inc. -- currently proprietary pending actual release and licensing. See LICENSE.md. use std::collections::HashSet;