commit 5eb0542cb67358d9030367498a4ad741fc42af4f
author Darin Petkov <petkov@chromium.org> Fri May 11 15:45:25 2012 +0200
committer Gerrit <chrome-bot@google.com> Mon May 14 12:39:46 2012 -0700
tree ce3ccf3942d57a65b211287a59713c10b7b2e14f
parent ef1f9fec08b3a251a84ae3e4ef7ef15fdc2a1544

shill: vpn: Disconnect VPN service when underlying connection disconnects.

BUG=chromium-os:30737,chromium-os:30774
TEST=unit tests, tested on device with 000OpenVPNGenesis

Change-Id: Ib350cb23edd3e68b3bd5390378789a6b60857b80
Reviewed-on: https://gerrit.chromium.org/gerrit/22461
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

connection.cc

diff --git a/connection.cc b/connection.cc
index 794c255..ecd59b4 100644
--- a/connection.cc
+++ b/connection.cc
@@ -230,9 +230,8 @@
           address_prefix,
           -1,
           interface_index_,
-          RoutingTable::Query::Callback(
-              Bind(&Connection::OnRouteQueryResponse,
-                   weak_ptr_factory_.GetWeakPtr())))) {
+          Bind(&Connection::OnRouteQueryResponse,
+               weak_ptr_factory_.GetWeakPtr()))) {
     LOG(ERROR) << "Could not request route to " << address.ToString();
     return false;
   }
@@ -314,7 +313,7 @@
 void Connection::OnRouteQueryResponse(int interface_index,
                                       const RoutingTableEntry &entry) {
   SLOG(Connection, 2) << __func__ << "(" << interface_index << ", "
-                      << entry.tag << ")";
+                      << entry.tag << ")" << " @ " << interface_name_;
   lower_binder_.Attach(NULL);
   DeviceRefPtr device = device_info_->GetDevice(interface_index);
   if (!device) {
@@ -330,7 +329,7 @@
 }
 
 void Connection::OnLowerDisconnect() {
-  SLOG(Connection, 2) << __func__ << "(" << interface_name_ << ")";
+  SLOG(Connection, 2) << __func__ << " @ " << interface_name_;
   // Ensures that |this| instance doesn't get destroyed in the middle of
   // notifying the binders. This method needs to be separate from
   // NotifyBindersOnDisconnect because the latter may be invoked by Connection's
@@ -341,7 +340,7 @@
 
 void Connection::NotifyBindersOnDisconnect() {
   // Note that this method may be invoked by the destructor.
-  SLOG(Connection, 2) << __func__ << "(" << interface_name_ << ")";
+  SLOG(Connection, 2) << __func__ << " @ " << interface_name_;
 
   // Unbinds the lower connection before notifying the binders. This ensures
   // correct behavior in case of circular binding.
@@ -356,12 +355,14 @@
 }
 
 void Connection::AttachBinder(Binder *binder) {
-  SLOG(Connection, 2) << __func__ << "(" << interface_name_ << ")";
+  SLOG(Connection, 2) << __func__ << "(" << binder->name() << ")" << " @ "
+                      << interface_name_;
   binders_.push_back(binder);
 }
 
 void Connection::DetachBinder(Binder *binder) {
-  SLOG(Connection, 2) << __func__ << "(" << interface_name_ << ")";
+  SLOG(Connection, 2) << __func__ << "(" << binder->name() << ")" << " @ "
+                      << interface_name_;
   for (deque<Binder *>::iterator it = binders_.begin();
        it != binders_.end(); ++it) {
     if (binder == *it) {