Browse Source

Fix: check MeekServerRunInproxyBroker to avoid nil pointer access

Rod Hynes 1 year ago
parent
commit
5169bd6053
1 changed files with 7 additions and 1 deletions
  1. 7 1
      psiphon/server/meek.go

+ 7 - 1
psiphon/server/meek.go

@@ -323,7 +323,13 @@ func NewMeekServer(
 // ReloadTactics signals components to reload tactics and reinitialize as
 // ReloadTactics signals components to reload tactics and reinitialize as
 // required when tactics may have changed.
 // required when tactics may have changed.
 func (server *MeekServer) ReloadTactics() error {
 func (server *MeekServer) ReloadTactics() error {
-	return errors.Trace(server.inproxyReloadTactics())
+	if server.support.Config.MeekServerRunInproxyBroker {
+		err := server.inproxyReloadTactics()
+		if err != nil {
+			return errors.Trace(err)
+		}
+	}
+	return nil
 }
 }
 
 
 type meekContextKey struct {
 type meekContextKey struct {