zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-04 16:33:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed localaddress

Browse Source
This commit is contained in:
0xdcarns
2022-12-23 14:06:39 -05:00
parent df614d6d4f
commit 368d01ff10
5 changed files with 15 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
models/api_node.go
View File

@@ -13,6 +13,7 @@ type ApiNode struct {
HostID string `json:"hostid,omitempty" validate:"required,min=5,id_unique"`
Address string `json:"address" validate:"omitempty,ipv4"`
Address6 string `json:"address6" validate:"omitempty,ipv6"`
LocalAddress string `json:"localaddress" validate:"omitempty,ipv4"`
PostUp string `json:"postup"`
PostDown string `json:"postdown"`
AllowedIPs []string `json:"allowedips"`
@@ -50,7 +51,6 @@ func (a *ApiNode) ConvertToServerNode(currentNode *Node) *Node {
convertedNode.Server = a.Server
convertedNode.Action = currentNode.Action
convertedNode.Connected = a.Connected
convertedNode.AllowedIPs = a.AllowedIPs
convertedNode.ID, _ = uuid.Parse(a.ID)
convertedNode.HostID, _ = uuid.Parse(a.HostID)
convertedNode.PostUp = a.PostUp
@@ -81,6 +81,14 @@ func (a *ApiNode) ConvertToServerNode(currentNode *Node) *Node {
if err == nil {
convertedNode.NetworkRange6 = *networkRange6
}
if len(a.LocalAddress) > 0 {
_, localAddr, err := net.ParseCIDR(a.LocalAddress)
if err == nil {
convertedNode.LocalAddress = *localAddr
}
} else if !isEmptyAddr(currentNode.LocalAddress.String()) {
convertedNode.LocalAddress = currentNode.LocalAddress
}
udpAddr, err := net.ResolveUDPAddr("udp", a.InternetGateway)
if err == nil {
convertedNode.InternetGateway = udpAddr
@@ -114,9 +122,12 @@ func (nm *Node) ConvertToAPINode() *ApiNode {
if isEmptyAddr(apiNode.Address6) {
apiNode.Address6 = ""
}
apiNode.LocalAddress = nm.LocalAddress.String()
if isEmptyAddr(apiNode.LocalAddress) {
apiNode.LocalAddress = ""
}
apiNode.PostDown = nm.PostDown
apiNode.PostUp = nm.PostUp
apiNode.AllowedIPs = nm.AllowedIPs
apiNode.PersistentKeepalive = int32(nm.PersistentKeepalive)
apiNode.LastModified = nm.LastModified.Unix()
apiNode.LastCheckIn = nm.LastCheckIn.Unix()