Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1796)

Unified Diff: remoting/host/chromoting_host.h

Issue 10160013: Implement HostPortAllocator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | remoting/host/chromoting_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/chromoting_host.h
diff --git a/remoting/host/chromoting_host.h b/remoting/host/chromoting_host.h
index a9749aca990ad439e81a088b5b7f51143a2c48a3..0c88bfb9e7908f51e88a2f4e88613d8f41d4a1bf 100644
--- a/remoting/host/chromoting_host.h
+++ b/remoting/host/chromoting_host.h
@@ -18,6 +18,7 @@
#include "remoting/host/desktop_environment.h"
#include "remoting/host/host_key_pair.h"
#include "remoting/host/host_status_observer.h"
+#include "remoting/host/network_settings.h"
#include "remoting/host/ui_strings.h"
#include "remoting/jingle_glue/jingle_thread.h"
#include "remoting/jingle_glue/signal_strategy.h"
@@ -39,49 +40,6 @@ class DesktopEnvironment;
class Encoder;
class ScreenRecorder;
-struct NetworkSettings {
- enum NatTraversalMode {
- // Don't use STUN or relay servers. Accept incoming P2P connection
- // attempts, but don't initiate any. This ensures that the peer is
- // on the same network. Note that connection will always fail if
- // both ends use this mode.
- NAT_TRAVERSAL_DISABLED,
-
- // Don't use STUN or relay servers but make outgoing connections.
- NAT_TRAVERSAL_OUTGOING,
-
- // Active NAT traversal using STUN and relay servers.
- NAT_TRAVERSAL_ENABLED,
- };
-
- NetworkSettings()
- : nat_traversal_mode(NAT_TRAVERSAL_DISABLED),
- min_port(0),
- max_port(0) {
- }
-
- explicit NetworkSettings(bool allow_nat_traversal)
- : nat_traversal_mode(allow_nat_traversal ?
- NAT_TRAVERSAL_ENABLED :
- NAT_TRAVERSAL_DISABLED),
- min_port(0),
- max_port(0) {
- }
-
- explicit NetworkSettings(NatTraversalMode nat_traversal_mode)
- : nat_traversal_mode(nat_traversal_mode),
- min_port(0),
- max_port(0) {
- }
-
- NatTraversalMode nat_traversal_mode;
-
- // |min_port| and |max_port| specify range (inclusive) of ports used by
- // P2P sessions. Any port can be used when both values are set to 0.
- int min_port;
- int max_port;
-};
-
// A class to implement the functionality of a host process.
//
// Here's the work flow of this class:
« no previous file with comments | « no previous file | remoting/host/chromoting_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698