commit 5fdf776fe7eabb0492636ae52d4809ebdbe8a25e
author Alex Deymo <deymo@chromium.org> Wed Jul 17 20:01:40 2013 -0700
committer Caroline Tice <cmtice@chromium.org> Thu Aug 29 23:09:43 2013 +0000
tree 8e5d63a43243b70d2c65e45074fbebaf5c735a4d
parent d5b3e427e14817266da4d6ead89815778dedf089

New DBus methods to enable/disable P2P update sharing.

This patch adds two new methods to enable/disable sharing updates
over P2P in the local network. This allows a crosh command to set
and get this flag to enable or disable this feature.

BUG=chromium:260441
TEST=Manual test. See below.

Manual test procedure.
1. Enable P2P:
update_engine_client -p2p_update yes -show_p2p_update

[0829/141039:INFO:update_engine_client.cc(433)] Current update using P2P setting: ENABLED
[0829/141039:INFO:update_engine_client.cc(500)] Done.

2. Start the p2p server (this will be done by the p2p_manager
   as part of the update_engine procedure).

3. Run an update check
update_engine_client -check_for_update

The /var/log/update_engine.log shows the following line confirming
p2p is enabled.
[0829/141317:INFO:p2p_manager.cc(194)] Returning value 1 for whether p2p is enabled.

4. Disable p2p and verify the p2p server is not running.
update_engine_client -p2p_update no -show_p2p_update

[0829/141039:INFO:update_engine_client.cc(433)] Current update using P2P setting: ENABLED
[0829/141039:INFO:update_engine_client.cc(500)] Done.

5. Verify p2p server is not running (ps aux | grep p2p doesn't show
p2p-server)

Change-Id: I3215e2961be440c491f669d4c580bbf87f7fec25
Reviewed-on: https://chromium-review.googlesource.com/62505
Reviewed-by: David Zeuthen <zeuthen@chromium.org>
Commit-Queue: Alejandro Deymo <deymo@chromium.org>
Tested-by: Alejandro Deymo <deymo@chromium.org>

update_engine_client.cc

diff --git a/update_engine_client.cc b/update_engine_client.cc
index e959534..d904d71 100644
--- a/update_engine_client.cc
+++ b/update_engine_client.cc
@@ -45,6 +45,11 @@
 DEFINE_string(update_over_cellular, "",
               "Enables (\"yes\") or disables (\"no\") the updates over "
               "cellular networks.");
+DEFINE_bool(show_p2p_update, false,
+            "Show the current setting for peer-to-peer update sharing.");
+DEFINE_string(p2p_update, "",
+              "Enables (\"yes\") or disables (\"no\") the peer-to-peer update "
+              "sharing.");
 
 namespace {
 
@@ -266,7 +271,7 @@
   return output;
 }
 
-bool SetUpdateOverCellularPermission(gboolean allowed) {
+void SetUpdateOverCellularPermission(gboolean allowed) {
   DBusGProxy* proxy;
   GError* error = NULL;
 
@@ -279,7 +284,6 @@
           &error);
   CHECK_EQ(rc, true) << "Error setting the update over cellular setting: "
                      << GetAndFreeGError(&error);
-  return true;
 }
 
 bool GetUpdateOverCellularPermission() {
@@ -299,6 +303,38 @@
   return allowed;
 }
 
+void SetP2PUpdatePermission(gboolean enabled) {
+  DBusGProxy* proxy;
+  GError* error = NULL;
+
+  CHECK(GetProxy(&proxy));
+
+  gboolean rc =
+      org_chromium_UpdateEngineInterface_set_p2_pupdate_permission(
+          proxy,
+          enabled,
+          &error);
+  CHECK_EQ(rc, true) << "Error setting the peer-to-peer update setting: "
+                     << GetAndFreeGError(&error);
+}
+
+bool GetP2PUpdatePermission() {
+  DBusGProxy* proxy;
+  GError* error = NULL;
+
+  CHECK(GetProxy(&proxy));
+
+  gboolean enabled;
+  gboolean rc =
+      org_chromium_UpdateEngineInterface_get_p2_pupdate_permission(
+          proxy,
+          &enabled,
+          &error);
+  CHECK_EQ(rc, true) << "Error getting the peer-to-peer update setting: "
+                     << GetAndFreeGError(&error);
+  return enabled;
+}
+
 static gboolean CompleteUpdateSource(gpointer data) {
   string current_op;
   if (!GetStatus(&current_op) || current_op == "UPDATE_STATUS_IDLE") {
@@ -378,6 +414,24 @@
     return 1;
   }
 
+  // Change the P2P enabled setting.
+  if (!FLAGS_p2p_update.empty()) {
+    gboolean enabled = FLAGS_p2p_update == "yes";
+    if (!enabled && FLAGS_p2p_update != "no") {
+      LOG(ERROR) << "Unknown option: \"" << FLAGS_p2p_update
+                 << "\". Please specify \"yes\" or \"no\".";
+    } else {
+      SetP2PUpdatePermission(enabled);
+    }
+  }
+
+  // Show the current P2P enabled setting.
+  if (FLAGS_show_p2p_update) {
+    bool enabled = GetP2PUpdatePermission();
+    LOG(INFO) << "Current update using P2P setting: "
+              << (enabled ? "ENABLED" : "DISABLED");
+  }
+
   // First, update the target channel if requested.
   if (!FLAGS_channel.empty())
     SetTargetChannel(FLAGS_channel, FLAGS_powerwash);