From b44bd19c536993616c96e0dfad26cb3c39a65dd0 Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Sun, 22 Sep 2019 22:33:11 -0700 Subject: [PATCH] . --- go/native/GoGlue.h | 10 +--------- go/pkg/zerotier/network.go | 6 +++++- go/pkg/zerotier/node.go | 2 ++ 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/go/native/GoGlue.h b/go/native/GoGlue.h index 2a16873b3..da7d88936 100644 --- a/go/native/GoGlue.h +++ b/go/native/GoGlue.h @@ -19,15 +19,7 @@ #include #include "../../include/ZeroTierCore.h" - -#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 +#include "../../node/Constants.hpp" /****************************************************************************/ diff --git a/go/pkg/zerotier/network.go b/go/pkg/zerotier/network.go index 1533e1b2f..5db7afe82 100644 --- a/go/pkg/zerotier/network.go +++ b/go/pkg/zerotier/network.go @@ -141,14 +141,18 @@ type Network struct { // newNetwork creates a new network with default settings func newNetwork(node *Node, id NetworkID, t Tap) (*Network, error) { + m := NewMACForNetworkMember(node.Identity().address, id) n := &Network{ node: node, id: id, - mac: NewMACForNetworkMember(node.Identity().address, id), + mac: m, tap: t, config: NetworkConfig{ ID: id, + MAC: m, Status: NetworkStatusRequestConfiguration, + Type: NetworkTypePrivate, + MTU: int(defaultVirtualNetworkMTU), }, settings: NetworkLocalSettings{ AllowManagedIPs: true, diff --git a/go/pkg/zerotier/node.go b/go/pkg/zerotier/node.go index 9a4f806dd..849578a1d 100644 --- a/go/pkg/zerotier/node.go +++ b/go/pkg/zerotier/node.go @@ -63,6 +63,8 @@ const ( afInet = C.AF_INET afInet6 = C.AF_INET6 + + defaultVirtualNetworkMTU = C.ZT_DEFAULT_MTU ) var (