From 71b98e6111417f3b2594d67ca745aaf7000383ef Mon Sep 17 00:00:00 2001
From: Rachel Williams <rwilliams@cloudflare.com>
Date: Mon, 17 Aug 2020 15:43:20 -0700
Subject: [PATCH] TUN-3261: Display connections on UI for free classic tunnels

---
 origin/tunnel.go | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/origin/tunnel.go b/origin/tunnel.go
index 17d6dd54..6e7a0291 100644
--- a/origin/tunnel.go
+++ b/origin/tunnel.go
@@ -500,7 +500,7 @@ func RegisterTunnel(
 	serverInfoPromise := tunnelrpc.TunnelServer{Client: tunnelServer.Client}.GetServerInfo(ctx, func(tunnelrpc.TunnelServer_getServerInfo_Params) error {
 		return nil
 	})
-	LogServerInfo(serverInfoPromise.Result(), connectionID, config.Metrics, logger)
+	LogServerInfo(serverInfoPromise.Result(), connectionID, config.Metrics, logger, config.TunnelEventChan)
 	registration := tunnelServer.RegisterTunnel(
 		ctx,
 		config.OriginCert,
@@ -588,6 +588,7 @@ func LogServerInfo(
 	connectionID uint8,
 	metrics *TunnelMetrics,
 	logger logger.Service,
+	tunnelEventChan chan<- ui.TunnelEvent,
 ) {
 	serverInfoMessage, err := promise.Struct()
 	if err != nil {
@@ -599,6 +600,10 @@ func LogServerInfo(
 		logger.Errorf("Failed to retrieve server information: %s", err)
 		return
 	}
+	// If launch-ui flag is set, send connect msg
+	if tunnelEventChan != nil {
+		tunnelEventChan <- ui.TunnelEvent{Index: connectionID, EventType: ui.Connected, Location: serverInfo.LocationName}
+	}
 	logger.Infof("Connected to %s", serverInfo.LocationName)
 	metrics.registerServerLocation(uint8ToString(connectionID), serverInfo.LocationName)
 }