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

Minor stuff...

Browse source
This commit is contained in:
Adam Ierymenko 2020-07-06 15:15:21 -07:00
parent 451e6be180
commit b027a83789
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
6 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/zerotier.h
View file

@ -629,15 +629,15 @@ enum ZT_CredentialType
*/ */
enum ZT_EndpointType enum ZT_EndpointType
{ {
ZT_ENDPOINT_TYPE_NIL = 0, // Nil/empty endpoint ZT_ENDPOINT_TYPE_NIL = 0, /* Nil/empty endpoint */
ZT_ENDPOINT_TYPE_ZEROTIER = 1, // ZeroTier relaying (address+fingerprint) ZT_ENDPOINT_TYPE_ZEROTIER = 1, /* ZeroTier relaying (address+fingerprint) */
ZT_ENDPOINT_TYPE_ETHERNET = 2, // Ethernet with ethertype 0x9993 ZT_ENDPOINT_TYPE_ETHERNET = 2, /* Ethernet with ethertype 0x9993 */
ZT_ENDPOINT_TYPE_WIFI_DIRECT = 3, // Ethernet using WiFi direct ZT_ENDPOINT_TYPE_WIFI_DIRECT = 3, /* Ethernet using WiFi direct */
ZT_ENDPOINT_TYPE_BLUETOOTH = 4, // Bluetooth (same address type as Ethernet) ZT_ENDPOINT_TYPE_BLUETOOTH = 4, /* Bluetooth (same address type as Ethernet) */
ZT_ENDPOINT_TYPE_IP = 5, // Naked IP (protocol 193) ZT_ENDPOINT_TYPE_IP = 5, /* Naked IP (protocol 193) */
ZT_ENDPOINT_TYPE_IP_UDP = 6, // IP/UDP ZT_ENDPOINT_TYPE_IP_UDP = 6, /* IP/UDP */
ZT_ENDPOINT_TYPE_IP_TCP = 7, // IP/TCP ZT_ENDPOINT_TYPE_IP_TCP = 7, /* IP/TCP */
ZT_ENDPOINT_TYPE_IP_HTTP = 8 // IP/HTTP encapsulation ZT_ENDPOINT_TYPE_IP_HTTP = 8 /* IP/HTTP encapsulation */
}; };
/** /**
@ -877,7 +877,7 @@ enum ZT_Event
*/ */
ZT_EVENT_DOWN = 3, ZT_EVENT_DOWN = 3,
// 4 once signaled identity collision but this is no longer an error /* 4 once signaled identity collision but this is no longer an error */
/** /**
* Trace (debugging) message * Trace (debugging) message
@ -1030,7 +1030,7 @@ enum ZT_VirtualNetworkType
*/ */
enum ZT_VirtualNetworkRuleType enum ZT_VirtualNetworkRuleType
{ {
// 0 to 15 reserved for actions /* 0 to 15 reserved for actions */
/** /**
* Drop frame * Drop frame
@ -1163,10 +1163,10 @@ typedef struct
* bytes and doesn't enlarge the overall size of this union. * bytes and doesn't enlarge the overall size of this union.
*/ */
struct { struct {
uint64_t start; // integer range start uint64_t start; /* integer range start */
uint32_t end; // end of integer range (relative to start, inclusive, 0 for equality w/start) uint32_t end; /* end of integer range (relative to start, inclusive, 0 for equality w/start) */
uint16_t idx; // index in packet of integer uint16_t idx; /* index in packet of integer */
uint8_t format; // bits in integer (range 1-64, ((format&63)+1)) and endianness (MSB 1 for little, 0 for big) uint8_t format; /* bits in integer (range 1-64, ((format&63)+1)) and endianness (MSB 1 for little, 0 for big) */
} intRange; } intRange;
/** /**
@ -1236,9 +1236,9 @@ typedef struct
* ICMP type and code * ICMP type and code
*/ */
struct { struct {
uint8_t type; // ICMP type, always matched uint8_t type; /* ICMP type, always matched */
uint8_t code; // ICMP code if matched uint8_t code; /* ICMP code if matched */
uint8_t flags; // flag 0x01 means also match code, otherwise only match type uint8_t flags; /* flag 0x01 means also match code, otherwise only match type */
} icmp; } icmp;
/** /**

2
pkg/zerotier/certificate.go
View file

@ -122,7 +122,7 @@ func NewCertificateFromCCertificate(ccptr unsafe.Pointer) *Certificate {
} }
var loc *Locator var loc *Locator
if cid.locator != nil { if cid.locator != nil {
loc, err = newLocatorFromCLocator(cid.locator) loc, err = newLocatorFromCLocator(cid.locator, false)
if err != nil { if err != nil {
return nil return nil
} }

4
pkg/zerotier/fingerprint.go
View file

@ -29,8 +29,8 @@ const FingerprintHashSize = 48
// Fingerprint bundles an address with an optional SHA384 full hash of the identity's key(s). // Fingerprint bundles an address with an optional SHA384 full hash of the identity's key(s).
type Fingerprint struct { type Fingerprint struct {
Address Address Address Address `json:"address"`
Hash []byte Hash []byte `json:"hash"`
} }
// NewFingerprintFromString decodes a string-format fingerprint. // NewFingerprintFromString decodes a string-format fingerprint.

3
pkg/zerotier/inetaddress.go
View file

@ -20,7 +20,6 @@ import (
"bytes" "bytes"
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"errors"
"net" "net"
"strconv" "strconv"
"strings" "strings"
@ -97,8 +96,6 @@ func makeSockaddrStorage(ip net.IP, port int, ss *C.struct_sockaddr_storage) boo
return false return false
} }
var ErrInvalidInetAddress = errors.New("invalid marshaled InetAddress object")
// InetAddress implements net.Addr but has a ZeroTier-like string representation // InetAddress implements net.Addr but has a ZeroTier-like string representation
type InetAddress struct { type InetAddress struct {
IP net.IP IP net.IP

4
pkg/zerotier/locator.go
View file

@ -30,10 +30,10 @@ type Locator struct {
cl unsafe.Pointer cl unsafe.Pointer
} }
func newLocatorFromCLocator(cl unsafe.Pointer) (*Locator, error) { func newLocatorFromCLocator(cl unsafe.Pointer, requiresDeletion bool) (*Locator, error) {
loc := new(Locator) loc := new(Locator)
loc.cl = cl loc.cl = cl
err := loc.init(false) err := loc.init(requiresDeletion)
if err != nil { if err != nil {
return nil, err return nil, err
} }

1
pkg/zerotier/nativetap.go
View file

@ -15,7 +15,6 @@
package zerotier package zerotier
//#cgo CFLAGS: -O3
//#include "../../serviceiocore/GoGlue.h" //#include "../../serviceiocore/GoGlue.h"
import "C" import "C"