github/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/ZeroTier/ZeroTierOne synced 2025-08-20 21:33:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Build fixes

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-30 09:48:44 -07:00
commit f680924585
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
5 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
go/pkg/zerotier/locator.go
View file

@ -90,14 +90,14 @@ func NewLocator(id *Identity, virtualAddresses []*Identity, physicalAddresses []
var buf [65536]byte
var pPhy *C.struct_sockaddr_storage
var pVirt *C.char
var pVirt **C.char
if len(phy) > 0 {
pPhy = &phy[0]
}
if len(virt) > 0 {
pVirt = &virt[0]
}
locSize := C.ZT_GoLocator_makeLocator((*C.uint8_t)(unsafe.Pointer(&buf[0])), 65536, idCstr, pPhy, C.uint(len(phy)), pVirt, C.uint(len(virt)))
locSize := C.ZT_GoLocator_makeLocator((*C.uint8_t)(unsafe.Pointer(&buf[0])), 65536, C.int64_t(TimeMs()), idCstr, pPhy, C.uint(len(phy)), pVirt, C.uint(len(virt)))
if locSize <= 0 {
return nil, ErrInvalidParameter
}
@ -128,7 +128,7 @@ func NewLocatorFromBytes(b []byte) (*Locator, error) {
var loc Locator
var err error
loc.Identity, err = NewIdentityFromString(C.GoString(info.id))
loc.Identity, err = NewIdentityFromString(C.GoString(&info.id[0]))
if err != nil {
return nil, err
}
@ -139,7 +139,7 @@ func NewLocatorFromBytes(b []byte) (*Locator, error) {
}
}
for i := 0; i < int(info.virtCount); i++ {
id, err := NewIdentityFromString(C.GoString(info.virt[i]))
id, err := NewIdentityFromString(C.GoString(&info.virt[i][0]))
if err == nil {
loc.Virtual = append(loc.Virtual, id)
}