add fields to archival struct for handshake result

ooni · Mar 7, 2024 · dfcf24c · dfcf24c
1 parent 441ff85
commit dfcf24c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/internal/experiment/openvpn/archival.go b/internal/experiment/openvpn/archival.go
@@ -17,9 +17,10 @@ type ArchivalOpenVPNHandshakeResult struct {
 	BootstrapTime  float64                      `json:"bootstrap_time,omitempty"`
 	Endpoint       string                       `json:"endpoint"`
 	IP             string                       `json:"ip"`
-	OpenVPNOptions OpenVPNOptions               `json:"openvpn_options"`
 	Port           int                          `json:"port"`
+	Transport      string                       `json:"transport"`
 	Provider       string                       `json:"provider"`
+	OpenVPNOptions OpenVPNOptions               `json:"openvpn_options"`
 	Status         ArchivalOpenVPNConnectStatus `json:"status"`
 	StartTime      time.Time                    `json:"handshake_start_time"`
 

diff --git a/internal/experiment/openvpn/openvpn.go b/internal/experiment/openvpn/openvpn.go
@@ -200,13 +200,14 @@ func (m *Measurer) connectAndHandshake(ctx context.Context, index int64,
 			BootstrapTime: bootstrapTime,
 			Endpoint:      endpoint.String(),
 			IP:            endpoint.IPAddr,
+			Port:          port,
+			Transport:     endpoint.Transport,
+			Provider:      endpoint.Provider,
 			OpenVPNOptions: OpenVPNOptions{
 				Cipher:      openvpnConfig.OpenVPNOptions().Cipher,
 				Auth:        openvpnConfig.OpenVPNOptions().Auth,
 				Compression: string(openvpnConfig.OpenVPNOptions().Compress),
 			},
-			Port:     port,
-			Provider: endpoint.Provider,
 			Status: ArchivalOpenVPNConnectStatus{
 				Failure: &failure,
 				Success: err == nil,