Merge pull request #150 from main--/151

Implement cli
main-- · Aug 6, 2017 · 95688e0 · 95688e0
2 parents 3ed5671 + 4f583d3
commit 95688e0
Show file tree

Hide file tree

Showing 6 changed files with 220 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/guest-agent/VfioService/VfioService/Protocol.cs b/guest-agent/VfioService/VfioService/Protocol.cs
@@ -1,5 +1,5 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: clientpipe-proto/src/protocol.proto
+// source: windows-gaming/driver/clientpipe-proto/src/protocol.proto
 #pragma warning disable 1591, 0612, 3021
 #region Designer generated code
 
@@ -9,11 +9,11 @@
 using scg = global::System.Collections.Generic;
 namespace ClientpipeProtocol {
 
-  /// <summary>Holder for reflection information generated from clientpipe-proto/src/protocol.proto</summary>
+  /// <summary>Holder for reflection information generated from windows-gaming/driver/clientpipe-proto/src/protocol.proto</summary>
   public static partial class ProtocolReflection {
 
     #region Descriptor
-    /// <summary>File descriptor for clientpipe-proto/src/protocol.proto</summary>
+    /// <summary>File descriptor for windows-gaming/driver/clientpipe-proto/src/protocol.proto</summary>
     public static pbr::FileDescriptor Descriptor {
       get { return descriptor; }
     }
@@ -22,34 +22,34 @@ public static partial class ProtocolReflection {
     static ProtocolReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "CiNjbGllbnRwaXBlLXByb3RvL3NyYy9wcm90b2NvbC5wcm90bxITY2xpZW50",
-            "cGlwZV9wcm90b2NvbBobZ29vZ2xlL3Byb3RvYnVmL2VtcHR5LnByb3RvIvUB",
-            "ChBDbGlwYm9hcmRNZXNzYWdlEjAKDmdyYWJfY2xpcGJvYXJkGAEgASgLMhYu",
-            "Z29vZ2xlLnByb3RvYnVmLkVtcHR5SAASSAoacmVxdWVzdF9jbGlwYm9hcmRf",
-            "Y29udGVudHMYAiABKA4yIi5jbGllbnRwaXBlX3Byb3RvY29sLkNsaXBib2Fy",
-            "ZFR5cGVIABI8Cg1jb250ZW50X3R5cGVzGAMgASgLMiMuY2xpZW50cGlwZV9w",
-            "cm90b2NvbC5DbGlwYm9hcmRUeXBlc0gAEhwKEmNsaXBib2FyZF9jb250ZW50",
-            "cxgEIAEoDEgAQgkKB21lc3NhZ2UiQwoOQ2xpcGJvYXJkVHlwZXMSMQoFdHlw",
-            "ZXMYASADKA4yIi5jbGllbnRwaXBlX3Byb3RvY29sLkNsaXBib2FyZFR5cGUi",
-            "PAoOUmVnaXN0ZXJIb3RLZXkSCgoCaWQYASABKA0SEQoJbW9kaWZpZXJzGAIg",
-            "ASgNEgsKA2tleRgDIAEoDSIdCgVQb2ludBIJCgF4GAEgASgFEgkKAXkYAiAB",
-            "KAUi1AIKCEdhQ21kT3V0EiYKBHBpbmcYASABKAsyFi5nb29nbGUucHJvdG9i",
-            "dWYuRW1wdHlIABI6CgljbGlwYm9hcmQYAiABKAsyJS5jbGllbnRwaXBlX3By",
-            "b3RvY29sLkNsaXBib2FyZE1lc3NhZ2VIABIzChFyZWxlYXNlX21vZGlmaWVy",
-            "cxgQIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAEikKB3N1c3BlbmQY",
-            "ESABKAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHlIABI/ChByZWdpc3Rlcl9o",
-            "b3Rfa2V5GBIgASgLMiMuY2xpZW50cGlwZV9wcm90b2NvbC5SZWdpc3Rlckhv",
-            "dEtleUgAEjgKEnNldF9tb3VzZV9wb3NpdGlvbhgTIAEoCzIaLmNsaWVudHBp",
-            "cGVfcHJvdG9jb2wuUG9pbnRIAEIJCgdtZXNzYWdlIr0CCgdHYUNtZEluEiYK",
-            "BHBvbmcYASABKAsyFi5nb29nbGUucHJvdG9idWYuRW1wdHlIABItCgtyZXBv",
-            "cnRfYm9vdBgCIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgAEjoKCWNs",
-            "aXBib2FyZBgDIAEoCzIlLmNsaWVudHBpcGVfcHJvdG9jb2wuQ2xpcGJvYXJk",
-            "TWVzc2FnZUgAEiwKCnN1c3BlbmRpbmcYECABKAsyFi5nb29nbGUucHJvdG9i",
-            "dWYuRW1wdHlIABIRCgdob3Rfa2V5GBEgASgNSAASIAoWaG90X2tleV9iaW5k",
-            "aW5nX2ZhaWxlZBgSIAEoCUgAEjEKC21vdXNlX2VkZ2VkGBMgASgLMhouY2xp",
-            "ZW50cGlwZV9wcm90b2NvbC5Qb2ludEgAQgkKB21lc3NhZ2UqLgoNQ2xpcGJv",
-            "YXJkVHlwZRIICgROb25lEAASCAoEVGV4dBABEgkKBUltYWdlEAJiBnByb3Rv",
-            "Mw=="));
+            "Cjl3aW5kb3dzLWdhbWluZy9kcml2ZXIvY2xpZW50cGlwZS1wcm90by9zcmMv",
+            "cHJvdG9jb2wucHJvdG8SE2NsaWVudHBpcGVfcHJvdG9jb2waG2dvb2dsZS9w",
+            "cm90b2J1Zi9lbXB0eS5wcm90byL1AQoQQ2xpcGJvYXJkTWVzc2FnZRIwCg5n",
+            "cmFiX2NsaXBib2FyZBgBIAEoCzIWLmdvb2dsZS5wcm90b2J1Zi5FbXB0eUgA",
+            "EkgKGnJlcXVlc3RfY2xpcGJvYXJkX2NvbnRlbnRzGAIgASgOMiIuY2xpZW50",
+            "cGlwZV9wcm90b2NvbC5DbGlwYm9hcmRUeXBlSAASPAoNY29udGVudF90eXBl",
+            "cxgDIAEoCzIjLmNsaWVudHBpcGVfcHJvdG9jb2wuQ2xpcGJvYXJkVHlwZXNI",
+            "ABIcChJjbGlwYm9hcmRfY29udGVudHMYBCABKAxIAEIJCgdtZXNzYWdlIkMK",
+            "DkNsaXBib2FyZFR5cGVzEjEKBXR5cGVzGAEgAygOMiIuY2xpZW50cGlwZV9w",
+            "cm90b2NvbC5DbGlwYm9hcmRUeXBlIjwKDlJlZ2lzdGVySG90S2V5EgoKAmlk",
+            "GAEgASgNEhEKCW1vZGlmaWVycxgCIAEoDRILCgNrZXkYAyABKA0iHQoFUG9p",
+            "bnQSCQoBeBgBIAEoBRIJCgF5GAIgASgFItQCCghHYUNtZE91dBImCgRwaW5n",
+            "GAEgASgLMhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5SAASOgoJY2xpcGJvYXJk",
+            "GAIgASgLMiUuY2xpZW50cGlwZV9wcm90b2NvbC5DbGlwYm9hcmRNZXNzYWdl",
+            "SAASMwoRcmVsZWFzZV9tb2RpZmllcnMYECABKAsyFi5nb29nbGUucHJvdG9i",
+            "dWYuRW1wdHlIABIpCgdzdXNwZW5kGBEgASgLMhYuZ29vZ2xlLnByb3RvYnVm",
+            "LkVtcHR5SAASPwoQcmVnaXN0ZXJfaG90X2tleRgSIAEoCzIjLmNsaWVudHBp",
+            "cGVfcHJvdG9jb2wuUmVnaXN0ZXJIb3RLZXlIABI4ChJzZXRfbW91c2VfcG9z",
+            "aXRpb24YEyABKAsyGi5jbGllbnRwaXBlX3Byb3RvY29sLlBvaW50SABCCQoH",
+            "bWVzc2FnZSK9AgoHR2FDbWRJbhImCgRwb25nGAEgASgLMhYuZ29vZ2xlLnBy",
+            "b3RvYnVmLkVtcHR5SAASLQoLcmVwb3J0X2Jvb3QYAiABKAsyFi5nb29nbGUu",
+            "cHJvdG9idWYuRW1wdHlIABI6CgljbGlwYm9hcmQYAyABKAsyJS5jbGllbnRw",
+            "aXBlX3Byb3RvY29sLkNsaXBib2FyZE1lc3NhZ2VIABIsCgpzdXNwZW5kaW5n",
+            "GBAgASgLMhYuZ29vZ2xlLnByb3RvYnVmLkVtcHR5SAASEQoHaG90X2tleRgR",
+            "IAEoDUgAEiAKFmhvdF9rZXlfYmluZGluZ19mYWlsZWQYEiABKAlIABIxCgtt",
+            "b3VzZV9lZGdlZBgTIAEoCzIaLmNsaWVudHBpcGVfcHJvdG9jb2wuUG9pbnRI",
+            "AEIJCgdtZXNzYWdlKi4KDUNsaXBib2FyZFR5cGUSCAoETm9uZRAAEggKBFRl",
+            "eHQQARIJCgVJbWFnZRACYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Google.Protobuf.WellKnownTypes.EmptyReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::ClientpipeProtocol.ClipboardType), }, new pbr::GeneratedClrTypeInfo[] {

diff --git a/windows-gaming/Cargo.toml b/windows-gaming/Cargo.toml
@@ -9,6 +9,7 @@ xdg = "^2.1"
 log = "0.3.8"
 env_logger = "0.4.3"
 time = "0.1.37"
+clap = "2.26"
 common = { path = "common" }
 driver = { path = "driver" }
 wizard = { path = "wizard" }
diff --git a/windows-gaming/driver/src/control/mod.rs b/windows-gaming/driver/src/control/mod.rs
@@ -1,6 +1,6 @@
 mod codec;
 
-pub use self::codec::ControlCmdOut;
+pub use self::codec::{ControlCmdOut, ControlCmdIn};
 
 use std::os::unix::net::{UnixListener as StdUnixListener};
 use std::io::Error;
@@ -14,7 +14,7 @@ use tokio_io::AsyncRead;
 use tokio_uds::UnixListener as TokioUnixListener;
 
 use controller::Controller;
-use self::codec::{Codec, ControlCmdIn};
+use self::codec::Codec;
 
 type Handler<'a> = Box<Future<Item=(), Error=Error> + 'a>;
 

diff --git a/windows-gaming/driver/src/lib.rs b/windows-gaming/driver/src/lib.rs
@@ -27,6 +27,7 @@ extern crate prost;
 extern crate common;
 
 pub mod qemu;
+pub use control::ControlCmdIn;
 
 mod control;
 mod monitor;