2
0
Эх сурвалжийг харах

add old peer update fields for backwards compatibility

abhishek9686 7 сар өмнө
parent
commit
d42b811e29

+ 1 - 0
models/metrics.go

@@ -48,6 +48,7 @@ type HostNetworkInfo struct {
 	ListenPort   int     `json:"listen_port" yaml:"listen_port"`
 	IsStaticPort bool    `json:"is_static_port"`
 	IsStatic     bool    `json:"is_static"`
+	Version      string  `json:"version"`
 }
 
 // PeerMap - peer map for ids and addresses in metrics

+ 8 - 1
models/mqtt.go

@@ -17,13 +17,20 @@ type HostPeerUpdate struct {
 	ServerVersion   string                `json:"serverversion"`
 	ServerAddrs     []ServerAddr          `json:"serveraddrs"`
 	NodePeers       []wgtypes.PeerConfig  `json:"node_peers"`
-	Peers           []wgtypes.PeerConfig  `json:"peers"`
+	Peers           []wgtypes.PeerConfig  `json:"host_peers"`
 	PeerIDs         PeerMap               `json:"peerids"`
 	HostNetworkInfo HostInfoMap           `json:"host_network_info,omitempty"`
 	EgressRoutes    []EgressNetworkRoutes `json:"egress_network_routes"`
 	FwUpdate        FwUpdate              `json:"fw_update"`
 	ReplacePeers    bool                  `json:"replace_peers"`
 	ServerConfig
+	OldPeerUpdateFields
+}
+
+type OldPeerUpdateFields struct {
+	NodePeers         []wgtypes.PeerConfig `json:"peers" bson:"peers" yaml:"peers"`
+	OldPeers          []wgtypes.PeerConfig
+	EndpointDetection bool `json:"endpoint_detection"`
 }
 
 type FwRule struct {

+ 5 - 0
mq/publishers.go

@@ -113,6 +113,11 @@ func PublishSingleHostPeerUpdate(host *models.Host, allNodes []models.Node, dele
 	if err != nil {
 		return err
 	}
+	peerUpdate.OldPeerUpdateFields = models.OldPeerUpdateFields{
+		NodePeers:         peerUpdate.NodePeers,
+		OldPeers:          peerUpdate.Peers,
+		EndpointDetection: peerUpdate.ServerConfig.EndpointDetection,
+	}
 	peerUpdate.ReplacePeers = replacePeers
 	data, err := json.Marshal(&peerUpdate)
 	if err != nil {