Emit NoticeFrontedMeekStatss

psiphon/notice.go

@@ -214,6 +214,15 @@ func NoticeTotalBytesTransferred(ipAddress string, sent, received int64) {
 	outputNotice("TotalBytesTransferred", false, "ipAddress", ipAddress, "sent", sent, "received", received)
 }
 
+// NoticeFrontedMeekStats reports extra network details for a
+// FRONTED-MEEK-OSSH tunnel connection.
+func NoticeFrontedMeekStats(ipAddress string, frontedMeekStats *FrontedMeekStats) {
+	outputNotice("NoticeFrontedMeekStats", false, "ipAddress", ipAddress,
+		"frontingAddress", frontedMeekStats.frontingAddress,
+		"resolvedIPAddress", frontedMeekStats.resolvedIPAddress,
+		"enabledSNI", frontedMeekStats.enabledSNI)
+}
+
 // NoticeLocalProxyError reports a local proxy error message. Repetitive
 // errors for a given proxy type are suppressed.
 func NoticeLocalProxyError(proxyType string, err error) {

psiphon/serverApi.go

@@ -52,9 +52,8 @@ type ServerContext struct {
 }
 
 // FrontedMeekStats holds extra stats that are only gathered for
-// TUNNEL_PROTOCOL_FRONTED_MEEK. Specifically, which fronting address was
-// selected, what IP address a fronting domain resolved to, and whether SNI
-// was enabled.
+// FRONTED-MEEK-OSSH. Specifically, which fronting address was selected, what
+// IP address a fronting domain resolved to, and whether SNI was enabled.
 type FrontedMeekStats struct {
 	frontingAddress   string
 	resolvedIPAddress string

psiphon/tunnel.go

@@ -335,8 +335,7 @@ func selectProtocol(config *Config, serverEntry *ServerEntry) (selectedProtocol
 }
 
 // dialSsh is a helper that builds the transport layers and establishes the SSH connection.
-// When TUNNEL_PROTOCOL_FRONTED_MEEK is selected, additional FrontedMeekStats are recorded
-// and returned.
+// When  FRONTED-MEEK-OSSH is selected, additional FrontedMeekStats are recorded and returned.
 func dialSsh(
 	config *Config,
 	pendingConns *Conns,
@@ -532,6 +531,8 @@ func dialSsh(
 			resolvedIPAddress: resolvedIPAddress.Load().(string),
 			enabledSNI:        false,
 		}
+
+		NoticeFrontedMeekStats(serverEntry.IpAddress, frontedMeekStats)
 	}
 
 	return conn, result.sshClient, frontedMeekStats, nil