Framework to allow Chromoting host to respect NAT traversal policy in linux.

remoting/host/plugin/host_script_object.h

 // Copyright (c) 2011 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.
 
 #ifndef REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
 
 namespace remoting {
 
 class ChromotingHost;
 class DesktopEnvironment;
 class MutableHostConfig;
 class RegisterSupportHostRequest;
 class SignalStrategy;
 class SupportAccessVerifier;
 
+namespace policy_hack {
+class NatPolicy;
+}  // namespace policy_hack
+
 // NPAPI plugin implementation for remoting host script object.
 // HostNPScriptObject creates threads that are required to run
 // ChromotingHost and starts/stops the host on those threads. When
 // destroyed it sychronously shuts down the host and all threads.
 class HostNPScriptObject : public HostStatusObserver {
  public:
   HostNPScriptObject(NPP plugin, NPObject* parent);
   virtual ~HostNPScriptObject();
 
   bool Init();
@@ skipping 56 matching lines @@
   void OnReceivedSupportID(remoting::SupportAccessVerifier* access_verifier,
                            bool success,
                            const std::string& support_id,
                            const base::TimeDelta& lifetime);
 
   // Helper functions that run on main thread. Can be called on any
   // other thread.
   void ConnectInternal(const std::string& uid,
                        const std::string& auth_token,
                        const std::string& auth_service);
+  void ReadPolicyAndConnect(const std::string& uid,
+                            const std::string& auth_token,
+                            const std::string& auth_service);

[Wez, 2011/08/11 20:00:27]

Can we list these methods here in the order they are invoked, and perhaps
re-name them to ConnectInternal and ConnectInternal2, to make it clearer which
one is the entry-point?

[awong, 2011/08/11 23:54:54]

I reordered them, and renamed ConnectInternal() to FinishConnect()

   void DisconnectInternal();
 
   // Callback for ChromotingHost::Shutdown().
   void OnShutdownFinished();
 
+  // Called when the nat traversal policy is updated.
+  void OnNatPolicyUpdate(bool nat_traversal_enabled);
+
   // Helper function for executing InvokeDefault on an NPObject, and ignoring
   // the return value.
   bool InvokeAndIgnoreResult(NPObject* func,
                              const NPVariant* args,
                              uint32_t argCount);
 
   // Posts a task on the main NP thread.
   void PostTaskToNPThread(
       const tracked_objects::Location& from_here, const base::Closure& task);
 
@@ skipping 16 matching lines @@
   scoped_ptr<RegisterSupportHostRequest> register_request_;
   scoped_refptr<MutableHostConfig> host_config_;
   ChromotingHostContext host_context_;
   scoped_ptr<DesktopEnvironment> desktop_environment_;
 
   scoped_refptr<ChromotingHost> host_;
   int failed_login_attempts_;
 
   base::WaitableEvent disconnected_event_;
   base::CancellationFlag destructing_;
+
+  // Ensure this object is not watching before deleting.

[dmac, 2011/08/11 18:42:55]

This comment confuses me a bit. Are you asking the developer to ensure this
object is not watching (what?) before deleting, or are you implying that the
scoped_ptr does that for me (I'm reading this coming as someone who doesn't know
the source).

[awong, 2011/08/11 19:04:07]

Moved comment into nat_policy.h where it belongs.

+  scoped_ptr<policy_hack::NatPolicy> nat_policy_;
+
+  bool nat_traversal_enabled_;
+  bool policy_received_;

[dmac, 2011/08/11 18:42:55]

could we add quick comments on these (especially the closure)

[awong, 2011/08/11 19:04:07]

Added (non-quick) comments.

+  base::Closure pending_connect_;
 };
 
 }  // namespace remoting
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::HostNPScriptObject);
 
 #endif  // REMOTING_HOST_HOST_SCRIPT_OBJECT_H_