From 0d00fec9154bfd3f4dffb3d017d7c3eb795e4332 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 6 Sep 2022 12:53:56 +0200 Subject: State + Discovery: Save the discovery data in the config JSON --- internal/types/server.go | 8 ++++---- state.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/types/server.go b/internal/types/server.go index 18d242a..a9c46b2 100644 --- a/internal/types/server.go +++ b/internal/types/server.go @@ -12,8 +12,8 @@ import ( type DiscoveryOrganizations struct { Version uint64 `json:"v"` List []DiscoveryOrganization `json:"organization_list"` - Timestamp time.Time `json:"-"` - RawString string `json:"-"` + Timestamp time.Time `json:"go_timestamp"` + RawString string `json:"go_raw_string"` } type DiscoveryOrganization struct { @@ -30,8 +30,8 @@ type DiscoveryOrganization struct { type DiscoveryServers struct { Version uint64 `json:"v"` List []DiscoveryServer `json:"server_list"` - Timestamp time.Time `json:"-"` - RawString string `json:"-"` + Timestamp time.Time `json:"go_timestamp"` + RawString string `json:"go_raw_string"` } type DNMapOrString map[string]string diff --git a/state.go b/state.go index 53324c4..55c3ec1 100644 --- a/state.go +++ b/state.go @@ -21,7 +21,7 @@ type VPNState struct { Servers server.Servers `json:"servers"` // The list of servers and organizations from disco - Discovery discovery.Discovery `json:"-"` + Discovery discovery.Discovery `json:"discovery"` // The fsm FSM fsm.FSM `json:"-"` -- cgit v1.2.3