github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-21 13:54:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

.

Browse source
This commit is contained in:
Adam Ierymenko 2019-10-02 12:19:37 -07:00
commit 57ade250af
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
10 changed files with 25 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go/pkg/zerotier/api.go
View file

@ -126,7 +126,7 @@ type APIStatus struct {
VersionBuild int `json:"versionBuild"`
OS string `json:"os"`
Architecture string `json:"architecture"`
Concurrency int `json:"cpus"`
Concurrency int `json:"concurrency"`
Runtime string `json:"runtimeVersion"`
}

1
go/pkg/zerotier/identity.go
View file

@ -204,7 +204,6 @@ func (id *Identity) UnmarshalJSON(j []byte) error {
if err != nil {
return err
}
fmt.Println(s)
nid, err := NewIdentityFromString(s)
if err != nil {
return err

10
go/pkg/zerotier/node.go
View file

@ -327,12 +327,10 @@ func NewNode(basePath string) (*Node, error) {
m, _ := NewMACFromBytes(i.HardwareAddr)
if _, isZeroTier := n.networksByMAC[m]; !isZeroTier {
addrs, _ := i.Addrs()
if len(addrs) > 0 {
for _, a := range addrs {
ipn, _ := a.(*net.IPNet)
if ipn != nil {
interfaceAddresses[ipn.IP.String()] = ipn.IP
}
for _, a := range addrs {
ipn, _ := a.(*net.IPNet)
if ipn != nil && len(ipn.IP) > 0 && !ipn.IP.IsLinkLocalUnicast() && !ipn.IP.IsMulticast() {
interfaceAddresses[ipn.IP.String()] = ipn.IP
}
}
}