Adam Ierymenko 5 years ago
parent
commit
b44bd19c53
3 changed files with 8 additions and 10 deletions
  1. 1 9
      go/native/GoGlue.h
  2. 5 1
      go/pkg/zerotier/network.go
  3. 2 0
      go/pkg/zerotier/node.go

+ 1 - 9
go/native/GoGlue.h

@@ -19,15 +19,7 @@
 #include <string.h>
 #include <string.h>
 
 
 #include "../../include/ZeroTierCore.h"
 #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"
 
 
 /****************************************************************************/
 /****************************************************************************/
 
 

+ 5 - 1
go/pkg/zerotier/network.go

@@ -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 - 0
go/pkg/zerotier/node.go

@@ -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 (