bug 1472662 - only send DNS_TRR_NS_VERIFIED telemetry once r?mcmanus draft
authorDaniel Stenberg <daniel@haxx.se>
Wed, 11 Jul 2018 09:43:38 +0200
changeset 817560 2bed9004383c118a5fff09ab14ba38cfa450d6a4
parent 816349 3edc9c3ae818490ed36b8bfc8ffdfc9e222b41db
push id116109
push userbmo:daniel@haxx.se
push dateThu, 12 Jul 2018 21:54:25 +0000
reviewersmcmanus
bugs1472662
milestone63.0a1
bug 1472662 - only send DNS_TRR_NS_VERIFIED telemetry once r?mcmanus ... by making sure we only retry TRR when we go from CP bad=>good. MozReview-Commit-ID: FcDwzSHm6Ia
netwerk/dns/TRRService.cpp
--- a/netwerk/dns/TRRService.cpp
+++ b/netwerk/dns/TRRService.cpp
@@ -298,19 +298,21 @@ TRRService::Observe(nsISupports *aSubjec
           if (mTRRBLStorage) {
             mTRRBLStorage->Clear();
           }
           mClearTRRBLStorage = false;
         }
       }
     }
 
-    if (mConfirmationState != CONFIRM_OK) {
-      mConfirmationState = CONFIRM_TRYING;
-      MaybeConfirm();
+    if (!mCaptiveIsPassed) {
+      if (mConfirmationState != CONFIRM_OK) {
+        mConfirmationState = CONFIRM_TRYING;
+        MaybeConfirm();
+      }
     } else {
       LOG(("TRRservice CP clear when already up!\n"));
     }
 
     mCaptiveIsPassed = true;
 
   } else if (!strcmp(aTopic, kClearPrivateData) ||
              !strcmp(aTopic, kPurge)) {