Move tunnel.SetSessionStarted() to operateTunnel() for readability.

psiphon/controller.go

@@ -383,6 +383,9 @@ func (controller *Controller) operateTunnel(tunnel *Tunnel) {
 		err = fmt.Errorf("error starting session for %s: %s", tunnel.serverEntry.IpAddress, err)
 	}
 
+	// Tunnel may now be used for port forwarding
+	tunnel.SetSessionStarted()
+
 	// Promote this successful tunnel to first rank so it's one
 	// of the first candidates next time establish runs.
 	PromoteServerEntry(tunnel.serverEntry.IpAddress)

psiphon/serverApi.go

@@ -68,8 +68,6 @@ func NewSession(config *Config, tunnel *Tunnel) (session *Session, err error) {
 		return nil, ContextError(err)
 	}
 
-	tunnel.SetSessionStarted()
-
 	return session, nil
 }