Bug 939318 - protocolproxy service acts on network interface changes.…

… r=mcmanus
dothq · Aug 25, 2014 · 2cc297e · 2cc297e
1 parent 0d9d99d
commit 2cc297e
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/netwerk/base/src/nsProtocolProxyService.cpp b/netwerk/base/src/nsProtocolProxyService.cpp
@@ -29,6 +29,7 @@
 #include "mozilla/Mutex.h"
 #include "mozilla/CondVar.h"
 #include "nsISystemProxySettings.h"
+#include "nsINetworkLinkService.h"
 
 //----------------------------------------------------------------------------
 
@@ -414,11 +415,15 @@ nsProtocolProxyService::Init()
         PrefsChanged(prefBranch, nullptr);
     }
 
-    // register for shutdown notification so we can clean ourselves up properly.
     nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
-    if (obs)
+    if (obs) {
+        // register for shutdown notification so we can clean ourselves up
+        // properly.
         obs->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false);
 
+        obs->AddObserver(this, NS_NETWORK_LINK_TOPIC, false);
+    }
+
     return NS_OK;
 }
 
@@ -440,6 +445,13 @@ nsProtocolProxyService::Observe(nsISupports     *aSubject,
             mPACMan->Shutdown();
             mPACMan = nullptr;
         }
+    } else if (strcmp(aTopic, NS_NETWORK_LINK_TOPIC) == 0) {
+        nsCString converted = NS_ConvertUTF16toUTF8(aData);
+        const char *state = converted.get();
+        if (strcmp(state, NS_NETWORK_LINK_DATA_CHANGED) == 0) {
+            LOG((": received network event: %s, reload PAC", state));
+            ReloadPAC();
+        }
     }
     else {
         NS_ASSERTION(strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID) == 0,