gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-09-11 15:44:52 +08:00
Code Issues Projects Releases Packages Wiki Activity

adding in ipv4

Browse source
This commit is contained in:
afeiszli 2022-04-25 20:50:09 -04:00
parent 13db6ced0c
commit b03b4cfcff
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
logic/wireguard.go
View file

@ -233,9 +233,13 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
_, _ = ncutils.RunCmd(ipExec+" -4 route add "+gateway+" dev "+ifacename, true) _, _ = ncutils.RunCmd(ipExec+" -4 route add "+gateway+" dev "+ifacename, true)
} }
} }
if node.Address != "" {
logger.Log(1, "adding address:", node.Address)
_, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address+"/32", true)
}
if node.Address6 != "" { if node.Address6 != "" {
logger.Log(1, "adding address:", node.Address6) logger.Log(1, "adding address6:", node.Address6)
_, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address6+"/64", true) _, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address6+"/128", true)
} }
wireguard.SetPeers(ifacename, node, peers) wireguard.SetPeers(ifacename, node, peers)
} }

2
netclient/functions/daemon.go
View file

@ -188,7 +188,7 @@ func NewTLSConfig(server string) *tls.Config {
if !ok { if !ok {
logger.Log(0, "failed to append cert") logger.Log(0, "failed to append cert")
} }
clientKeyPair, err := tls.LoadX509KeyPair(ncutils.GetNetclientServerPath(server)+ncutils.GetSeparator()+"client.pem", ncutils.GetNetclientPath()+"/client.key") clientKeyPair, err := tls.LoadX509KeyPair(ncutils.GetNetclientServerPath(server)+ncutils.GetSeparator()+"client.pem", ncutils.GetNetclientPath()+ncutils.GetSeparator()+"client.key")
if err != nil { if err != nil {
log.Fatalf("could not read client cert/key %v \n", err) log.Fatalf("could not read client cert/key %v \n", err)
} }

4
netclient/functions/register.go
View file

@ -50,6 +50,10 @@ func Register(cfg *config.ClientConfig, key string) error {
// RegisterWithServer calls the register endpoint with privatekey and commonname - api returns ca and client certificate // RegisterWithServer calls the register endpoint with privatekey and commonname - api returns ca and client certificate
func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) error { func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) error {
cfg, err := config.ReadConfig(cfg.Network)
if err != nil {
return err
}
data := config.RegisterRequest{ data := config.RegisterRequest{
Key: *private, Key: *private,
CommonName: tls.NewCName(cfg.Node.Name), CommonName: tls.NewCName(cfg.Node.Name),