mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-20 15:26:04 +08:00
adding in ipv4
This commit is contained in:
parent
13db6ced0c
commit
b03b4cfcff
|
@ -233,9 +233,13 @@ func initWireguard(node *models.Node, privkey string, peers []wgtypes.PeerConfig
|
|||
_, _ = 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 != "" {
|
||||
logger.Log(1, "adding address:", node.Address6)
|
||||
_, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address6+"/64", true)
|
||||
logger.Log(1, "adding address6:", node.Address6)
|
||||
_, _ = ncutils.RunCmd(ipExec+" address add dev "+ifacename+" "+node.Address6+"/128", true)
|
||||
}
|
||||
wireguard.SetPeers(ifacename, node, peers)
|
||||
}
|
||||
|
|
|
@ -188,7 +188,7 @@ func NewTLSConfig(server string) *tls.Config {
|
|||
if !ok {
|
||||
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 {
|
||||
log.Fatalf("could not read client cert/key %v \n", err)
|
||||
}
|
||||
|
|
|
@ -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
|
||||
func RegisterWithServer(private *ed25519.PrivateKey, cfg *config.ClientConfig) error {
|
||||
cfg, err := config.ReadConfig(cfg.Network)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
data := config.RegisterRequest{
|
||||
Key: *private,
|
||||
CommonName: tls.NewCName(cfg.Node.Name),
|
||||
|
|
Loading…
Reference in a new issue