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

Unified Diff: remoting/protocol/transport_config.h

Issue 9549029: Set incoming_only flag on the host side when NAT traversal is disabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 10 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 | « remoting/protocol/pepper_transport_factory.cc ('k') | remoting/protocol/transport_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/protocol/transport_config.h
diff --git a/remoting/protocol/transport_config.h b/remoting/protocol/transport_config.h
index 7599bf65813e3123bd37a17669c1a45e48650eb9..e6c73a4d3e2edb31c9a64c388a1379772d873025 100644
--- a/remoting/protocol/transport_config.h
+++ b/remoting/protocol/transport_config.h
@@ -14,7 +14,20 @@ struct TransportConfig {
TransportConfig();
~TransportConfig();
- bool nat_traversal;
+ enum NatTraversalMode {
Wez 2012/03/01 19:36:35 nit: Is a single enum the best way to express this
Sergey Ulanov 2012/03/01 20:48:29 Yes, I considered two separate flags, but incoming
+ // Don't use STUN or relay servers and don't make any outgoing
+ // connections. Note that connection will always fail if both ends
Wez 2012/03/01 19:36:35 nit: "outgoing" is a little confusing in a p2p con
Sergey Ulanov 2012/03/01 20:48:29 Done.
+ // use this mode.
+ NAT_TRAVERSAL_DISABLED,
+
+ // Don't use STUN or relay servers but make outgoing connections.
+ NAT_TRAVERSAL_PASSIVE,
Wez 2012/03/01 19:36:35 nit: It's not really "passive" if you make an outg
Wez 2012/03/01 19:36:35 We don't actually use PASSIVE right now, so perhap
Sergey Ulanov 2012/03/01 20:48:29 It's not used anywhere right now, but it might be
Sergey Ulanov 2012/03/01 20:48:29 It is passive in terms of not actively trying to t
+
+ // Active NAT traversal using STUN and relay servers.
+ NAT_TRAVERSAL_ENABLED,
+ };
+
+ NatTraversalMode nat_traversal_mode;
std::string stun_server;
std::string relay_server;
std::string relay_token;
« no previous file with comments | « remoting/protocol/pepper_transport_factory.cc ('k') | remoting/protocol/transport_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698