summaryrefslogtreecommitdiffstats
path: root/remoting/tools
diff options
context:
space:
mode:
authorgarykac@google.com <garykac@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 03:19:26 +0000
committergarykac@google.com <garykac@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 03:19:26 +0000
commit062595456e871f314985ef6e3375bc8ebaf3e514 (patch)
treefff6f638e9f9db1979dc681649483aaec409a11f /remoting/tools
parent2028539fd25578e5725e528d8a2de8f53923576d (diff)
downloadchromium_src-062595456e871f314985ef6e3375bc8ebaf3e514.zip
chromium_src-062595456e871f314985ef6e3375bc8ebaf3e514.tar.gz
chromium_src-062595456e871f314985ef6e3375bc8ebaf3e514.tar.bz2
Add cmdline options to set the hostjid, jid and auth token for the chromoting
client. Add a simple python script to extract jid/token info and launch the client with the appropriate args. Fix x11_client to work with Albert's client restructuring. BUG=none TEST=manual Review URL: http://codereview.chromium.org/2734004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49497 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/tools')
-rwxr-xr-xremoting/tools/runclient.py37
1 files changed, 37 insertions, 0 deletions
diff --git a/remoting/tools/runclient.py b/remoting/tools/runclient.py
new file mode 100755
index 0000000..62db605
--- /dev/null
+++ b/remoting/tools/runclient.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+#
+# runclient.py gets the chromoting host info from an input arg and then
+# tries to find the authentication info in the .chromotingAuthToken file
+# so that the host authentication arguments can be automatically set.
+
+import os
+
+auth_filename = '.chromotingAuthToken'
+
+# Read username and auth token from token file.
+auth = open(auth_filename)
+authinfo = auth.readlines()
+
+username = authinfo[0].rstrip()
+authtoken = authinfo[1].rstrip()
+
+# Request final 8 characters of Host JID from user.
+# This assumes that the host is published under the same username as the
+# client attempting to connect.
+print 'Host JID:', username + '/chromoting',
+hostjid_suffix = raw_input()
+hostjid = username + '/chromoting' + hostjid_suffix
+
+# TODO(garykac): Make this work on Windows.
+command = []
+command.append('../../out/Debug/chromoting_x11_client')
+command.append('--host_jid ' + hostjid)
+command.append('--jid ' + username)
+command.append('--token ' + authtoken)
+
+# Launch the client
+os.system(' '.join(command))