Rename meek stat

psiphon/notice.go

@@ -287,7 +287,7 @@ func NoticeLocalProxyError(proxyType string, err error) {
 func NoticeConnectedMeekStats(ipAddress string, meekStats *MeekStats) {
 	outputNotice("NoticeConnectedMeekStats", true, false,
 		"ipAddress", ipAddress,
-		"serverAddress", meekStats.ServerAddress,
+		"dialAddress", meekStats.DialAddress,
 		"resolvedIPAddress", meekStats.ResolvedIPAddress,
 		"sniServerName", meekStats.SNIServerName,
 		"hostHeader", meekStats.HostHeader,

psiphon/serverApi.go

@@ -53,7 +53,7 @@ type ServerContext struct {
 
 // MeekStats holds extra stats that are only gathered for meek tunnels.
 type MeekStats struct {
-	ServerAddress       string
+	DialAddress         string
 	ResolvedIPAddress   string
 	SNIServerName       string
 	HostHeader          string
@@ -624,9 +624,9 @@ func makeBaseRequestUrl(tunnel *Tunnel, port, sessionId string) string {
 		requestUrl.WriteString(tunnel.config.DeviceRegion)
 	}
 	if tunnel.meekStats != nil {
-		if tunnel.meekStats.ServerAddress != "" {
-			requestUrl.WriteString("&meek_server_address=")
-			requestUrl.WriteString(tunnel.meekStats.ServerAddress)
+		if tunnel.meekStats.DialAddress != "" {
+			requestUrl.WriteString("&meek_dial_address=")
+			requestUrl.WriteString(tunnel.meekStats.DialAddress)
 		}
 		if tunnel.meekStats.ResolvedIPAddress != "" {
 			requestUrl.WriteString("&meek_resolved_ip_address=")

psiphon/tunnel.go

@@ -616,7 +616,7 @@ func dialSsh(
 
 	if meekConfig != nil {
 		meekStats = &MeekStats{
-			ServerAddress:       meekConfig.DialAddress,
+			DialAddress:         meekConfig.DialAddress,
 			ResolvedIPAddress:   resolvedIPAddress.Load().(string),
 			SNIServerName:       meekConfig.SNIServerName,
 			HostHeader:          meekConfig.HostHeader,