cashew: don't propagate inactive plans to clients

src/service.cc

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/service.h"
 
 #include <glog/logging.h>
 
 #include "src/data_plan_provider.h"
 #include "src/device.h"
@@ skipping 132 matching lines @@
 Device* Service::GetDevice() const {
   return device_;
 }
 
 DBusDataPlanList Service::GetDBusDataPlans() const {
   DBusDataPlanList dbus_data_plans;
   DataPlanList::const_iterator it;
   for (it = data_plans_.begin(); it != data_plans_.end(); ++it) {
     DataPlan *plan = *it;
     DCHECK(plan != NULL);
-    dbus_data_plans.push_back(plan->ToDBusFormat());
+    // filter out inactive plans
+    if (plan->IsActive()) {
+      dbus_data_plans.push_back(plan->ToDBusFormat());
+    } else {
+      DLOG(INFO) << path_ << ": GetBusDataPlans: skipping inactive plan: \""
+          << plan->GetName() << "\"";
+    }
   }
   return dbus_data_plans;
 }
 
 bool Service::IsDefaultService() const {
   if (is_default_service_) {
     // cross-check with parent's idea of default technology
     if (parent_->GetDefaultTechnology() != kTypeCellular) {
       DLOG(WARNING) << path_ << ": IsDefaultService: "
           << "service manager doesn't think default technology is cellular";
@@ skipping 91 matching lines @@
   //     a negative number when assigned to |local_bytes_used|
   if (local_bytes_used < 0 ||
       static_cast<uint64>(local_bytes_used) < rx_bytes ||
       static_cast<uint64>(local_bytes_used) < tx_bytes) {
     LOG(WARNING) << path_ << ": OnByteCounterUpdate: overflow detected";
     return;
   }
   active_plan->SetLocalBytesUsed(local_bytes_used);
   DLOG(INFO) << path_
       << ": OnByteCounterUpdate: updated plan state: data bytes used = "
-      << active_plan->GetDataBytesUsed() << ", local byes used = "
-      << active_plan->GetLocalBytesUsed();
+      << active_plan->GetDataBytesUsed() << ", local bytes used = "
+      << active_plan->GetLocalBytesUsed() << ", total bytes used = "
+      << active_plan->GetTotalBytesUsed();
   MaybeEmitDataPlansUpdate();
 }
 
 // DataPlanProviderDelegate methods
 
 void Service::OnRequestComplete(const DataPlanProvider *provider,
                                 bool successful,
                                 const Value *parsed_usage_update) {
   DCHECK(provider != NULL);
   DCHECK(!successful || parsed_usage_update != NULL);
@@ skipping 631 matching lines @@
   DCHECK(policy_ != NULL);
   if (policy_->ShouldEmitDataPlansUpdate(data_plans_)) {
     DLOG(INFO) << path_ << ": MaybeEmitDataPlansUpdate: sending update";
     parent_->EmitDataPlansUpdate(*this);
   } else {
     DLOG(INFO) << path_ << ": MaybeEmitDataPlansUpdate: not sending update";
   }
 }
 
 }  // namespace cashew