compare with pacURL when clear proxy setting on startup

getlantern · Aug 4, 2015 · fc35740 · fc35740
1 parent d679235
commit fc35740
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 22 deletions.
diff --git a/src/github.com/getlantern/flashlight/flashlight.go b/src/github.com/getlantern/flashlight/flashlight.go
@@ -86,17 +86,6 @@ func init() {
 func main() {
 	parseFlags()
 
-	if *clearProxySettings {
-		// This is a workaround that attempts to fix a Windows-only problem where
-		// Lantern was unable to clean the system's proxy settings before logging
-		// off.
-		//
-		// See: https://github.com/getlantern/lantern/issues/2776
-		setUpPacTool()
-		doPACOff()
-		return
-	}
-
 	showui = !*headless
 
 	if showui {
@@ -217,6 +206,16 @@ func runClientProxy(cfg *config.Config) {
 		exit(err)
 	}
 
+	if *clearProxySettings {
+		// This is a workaround that attempts to fix a Windows-only problem where
+		// Lantern was unable to clean the system's proxy settings before logging
+		// off.
+		//
+		// See: https://github.com/getlantern/lantern/issues/2776
+		doPACOff("http://" + cfg.UIAddr + "/proxy_on.pac")
+		exit(nil)
+	}
+
 	// Create the client-side proxy.
 	client := &client.Client{
 		Addr:         cfg.Addr,
@@ -252,13 +251,13 @@ func runClientProxy(cfg *config.Config) {
 	}()
 
 	/*
-		Temporarily disabling localdiscover. See:
-		https://github.com/getlantern/lantern/issues/2813
-		// Continually search for local Lantern instances and update the UI
-		go func() {
+		      Temporarily disabling localdiscover. See:
+		      https://github.com/getlantern/lantern/issues/2813
+		      // Continually search for local Lantern instances and update the UI
+		      go func() {
 			addExitFunc(localdiscovery.Stop)
 			localdiscovery.Start(!showui, strconv.Itoa(tcpAddr.Port))
-		}()
+		      }()
 	*/
 
 	// watchDirectAddrs will spawn a goroutine that will add any site that is

diff --git a/src/github.com/getlantern/flashlight/pac.go b/src/github.com/getlantern/flashlight/pac.go
@@ -123,8 +123,8 @@ func watchDirectAddrs() {
 				directHosts[host] = true
 				genPACFile()
 				// reapply so browser will fetch the PAC URL again
-				doPACOff()
-				doPACOn()
+				doPACOff(pacURL)
+				doPACOn(pacURL)
 			}
 		}
 	}()
@@ -142,26 +142,26 @@ func pacOn() {
 	genPACFile()
 	pacURL = ui.Handle("/proxy_on.pac", http.HandlerFunc(handler))
 	log.Debugf("Serving PAC file at %v", pacURL)
-	doPACOn()
+	doPACOn(pacURL)
 	atomic.StoreInt32(&isPacOn, 1)
 }
 
 func pacOff() {
 	if atomic.CompareAndSwapInt32(&isPacOn, 1, 0) {
 		log.Debug("Unsetting lantern as system proxy")
-		doPACOff()
+		doPACOff(pacURL)
 		log.Debug("Unset lantern as system proxy")
 	}
 }
 
-func doPACOn() {
+func doPACOn(pacURL string) {
 	err := pac.On(pacURL)
 	if err != nil {
 		log.Errorf("Unable to set lantern as system proxy: %v", err)
 	}
 }
 
-func doPACOff() {
+func doPACOff(pacURL string) {
 	err := pac.Off(pacURL)
 	if err != nil {
 		log.Errorf("Unable to unset lantern as system proxy: %v", err)