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

.

Browse source
This commit is contained in:
Adam Ierymenko 2019-09-22 22:33:11 -07:00
parent 536bc59abb
commit b44bd19c53
No known key found for this signature in database
GPG key ID: C8877CF2D7A5D7F3
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
go/native/GoGlue.h
View file

@ -19,15 +19,7 @@
#include <string.h> #include <string.h>
#include "../../include/ZeroTierCore.h" #include "../../include/ZeroTierCore.h"
#include "../../node/Constants.hpp"
#if __has_include("../../version.h")
#include "../../version.h"
#else
#define ZEROTIER_ONE_VERSION_MAJOR 255
#define ZEROTIER_ONE_VERSION_MINOR 255
#define ZEROTIER_ONE_VERSION_REVISION 255
#define ZEROTIER_ONE_VERSION_BUILD 255
#endif
/****************************************************************************/ /****************************************************************************/

6
go/pkg/zerotier/network.go
View file

@ -141,14 +141,18 @@ type Network struct {
// newNetwork creates a new network with default settings // newNetwork creates a new network with default settings
func newNetwork(node *Node, id NetworkID, t Tap) (*Network, error) { func newNetwork(node *Node, id NetworkID, t Tap) (*Network, error) {
m := NewMACForNetworkMember(node.Identity().address, id)
n := &Network{ n := &Network{
node: node, node: node,
id: id, id: id,
mac: NewMACForNetworkMember(node.Identity().address, id), mac: m,
tap: t, tap: t,
config: NetworkConfig{ config: NetworkConfig{
ID: id, ID: id,
MAC: m,
Status: NetworkStatusRequestConfiguration, Status: NetworkStatusRequestConfiguration,
Type: NetworkTypePrivate,
MTU: int(defaultVirtualNetworkMTU),
}, },
settings: NetworkLocalSettings{ settings: NetworkLocalSettings{
AllowManagedIPs: true, AllowManagedIPs: true,

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

@ -63,6 +63,8 @@ const (
afInet = C.AF_INET afInet = C.AF_INET
afInet6 = C.AF_INET6 afInet6 = C.AF_INET6
defaultVirtualNetworkMTU = C.ZT_DEFAULT_MTU
) )
var ( var (