New policies: enable/disable relay; port range

remoting/jingle_glue/network_settings.h

Index: remoting/jingle_glue/network_settings.h
diff --git a/remoting/jingle_glue/network_settings.h b/remoting/jingle_glue/network_settings.h
index a37b0bcb0facb4e57fff30802d23b0998ed0c715..84cf8b6ab999792325288e7c1c09e3ee827dad2d 100644
--- a/remoting/jingle_glue/network_settings.h
+++ b/remoting/jingle_glue/network_settings.h
@@ -5,6 +5,10 @@
 #ifndef REMOTING_JINGLE_GLUE_NETWORK_SETTINGS_H_
 #define REMOTING_JINGLE_GLUE_NETWORK_SETTINGS_H_
 
+#include <string>
+
+#include "base/basictypes.h"
+
 namespace remoting {
 
 struct NetworkSettings {
@@ -15,33 +19,40 @@ struct NetworkSettings {
   static const int kDefaultMinPort = 12400;
   static const int kDefaultMaxPort = 12409;
 
-  enum NatTraversalMode {
-    // Active NAT traversal using STUN and relay servers.
-    NAT_TRAVERSAL_ENABLED,
+  // Flags:

[Sergey Ulanov, 2014/03/27 18:31:20]

Define the flags in an enum instead of as a set of constants

[dcaiafa, 2014/03/27 19:32:24]

Done.

+
+  // 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.
+  static const uint32 NAT_TRAVERSAL_DISABLED = 0x0;
 
-    // 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,
+  // Active NAT traversal using STUN.
+  static const uint32 NAT_TRAVERSAL_STUN = 0x1;
 
-    // Don't use STUN or relay servers but make outgoing connections.
-    NAT_TRAVERSAL_OUTGOING,
-  };
+  // Allow the use of relay servers when a direct connection is not available.
+  static const uint32 NAT_TRAVERSAL_RELAY = 0x2;
+
+  // Allow outgoing connections, even when STUN and RELAY are not enabled.
+  static const uint32 NAT_TRAVERSAL_OUTGOING = 0x4;
+
+  // Active NAT traversal using STUN and relay servers.
+  static const uint32 NAT_TRAVERSAL_FULL =
+      NAT_TRAVERSAL_STUN | NAT_TRAVERSAL_RELAY;

[Sergey Ulanov, 2014/03/27 18:31:20]

Should this also include NAT_TRAVERSAL_OUTGOING? or is the intent that outgoing
connections are implied by STUN/Relay flags?

[dcaiafa, 2014/03/27 19:32:24]

What do you think of this?

 
   NetworkSettings()
-      : nat_traversal_mode(NAT_TRAVERSAL_DISABLED),
+      : flags(NAT_TRAVERSAL_DISABLED),
         min_port(0),
         max_port(0) {
   }
 
-  explicit NetworkSettings(NatTraversalMode nat_traversal_mode)
-      : nat_traversal_mode(nat_traversal_mode),
+  explicit NetworkSettings(uint32 flags)
+      : flags(flags),
         min_port(0),
         max_port(0) {
   }
 
-  NatTraversalMode nat_traversal_mode;
+  uint32 flags;
 
   // |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.
@@ -49,6 +60,12 @@ struct NetworkSettings {
   int max_port;
 };
 
+// Parse string in the form "<min_port>-<max_port>". E.g. "12400-12409".
+// Returns true if string was parsed successfuly.
+bool ParsePortRange(const std::string& port_range,

[Sergey Ulanov, 2014/03/27 18:31:20]

Make this a static method in NetworkSettings class?

[dcaiafa, 2014/03/27 19:32:24]

Done.

+                    int* out_min_port,
+                    int* out_max_port);
+
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_NETWORK_SETTINGS_H_