Browse Source

Fix: check for MeekServer.Run errors

Rod Hynes 8 years ago
parent
commit
b430e63745
1 changed files with 5 additions and 2 deletions
  1. 5 2
      psiphon/server/tunnelServer.go

+ 5 - 2
psiphon/server/tunnelServer.go

@@ -382,6 +382,11 @@ func (sshServer *sshServer) runListener(
 			protocol.TunnelProtocolUsesObfuscatedSessionTickets(listenerTunnelProtocol),
 			handleClient,
 			sshServer.shutdownBroadcast)
+
+		if err == nil {
+			err = meekServer.Run()
+		}
+
 		if err != nil {
 			select {
 			case listenerError <- common.ContextError(err):
@@ -390,8 +395,6 @@ func (sshServer *sshServer) runListener(
 			return
 		}
 
-		meekServer.Run()
-
 	} else {
 
 		for {