zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-28 19:11:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

freebsd working

Browse Source
This commit is contained in:
afeiszli
2021-11-15 11:42:52 -05:00
parent 05d27c8af3
commit 84c8299bb0
12 changed files with 119 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
netclient/functions/join.go
View File

@@ -25,7 +25,6 @@ import (
// JoinNetwork - helps a client join a network
func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
if cfg.Node.Network == "" {
return errors.New("no network provided")
}
@@ -102,9 +101,9 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
if ncutils.IsFreeBSD() {
cfg.Node.UDPHolePunch = "no"
cfg.Node.IsStatic = "yes"
}
// make sure name is appropriate, if not, give blank name
cfg.Node.Name = formatName(cfg.Node)
// differentiate between client/server here
var node models.Node // fill this node with appropriate calls
postnode := &models.Node{
@@ -233,3 +232,20 @@ func JoinNetwork(cfg config.ClientConfig, privateKey string) error {
return err
}
// format name appropriately. Set to blank on failure
func formatName(node models.Node) string {
// Logic to properly format name
if !node.NameInNodeCharSet() {
node.Name = ncutils.DNSFormatString(node.Name)
}
if len(node.Name) > models.MAX_NAME_LENGTH {
node.Name = ncutils.ShortenString(node.Name, models.MAX_NAME_LENGTH)
}
if !node.NameInNodeCharSet() || len(node.Name) > models.MAX_NAME_LENGTH {
ncutils.PrintLog("could not properly format name: "+node.Name, 1)
ncutils.PrintLog("setting name to blank", 1)
node.Name = ""
}
return node.Name
}