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..1ff83eb2a92ba67f38e791dc325a12a92afd4674 100644
--- a/remoting/jingle_glue/network_settings.h
+++ b/remoting/jingle_glue/network_settings.h
@@ -5,6 +5,11 @@
 #ifndef REMOTING_JINGLE_GLUE_NETWORK_SETTINGS_H_
 #define REMOTING_JINGLE_GLUE_NETWORK_SETTINGS_H_
 
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/logging.h"
+
 namespace remoting {
 
 struct NetworkSettings {
@@ -15,33 +20,48 @@ 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,
-
+  enum Flags {
     // 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,
+    NAT_TRAVERSAL_DISABLED = 0x0,
+
+    // Allow outgoing connections, even when STUN and RELAY are not enabled.
+    NAT_TRAVERSAL_OUTGOING = 0x1,
 
-    // Don't use STUN or relay servers but make outgoing connections.
-    NAT_TRAVERSAL_OUTGOING,
+    // Active NAT traversal using STUN.
+    NAT_TRAVERSAL_STUN = 0x2,
+
+    // Allow the use of relay servers when a direct connection is not available.
+    NAT_TRAVERSAL_RELAY = 0x4,
+
+    // Active NAT traversal using STUN and relay servers.
+    NAT_TRAVERSAL_FULL = NAT_TRAVERSAL_STUN | NAT_TRAVERSAL_RELAY |
+        NAT_TRAVERSAL_OUTGOING
   };
 
   NetworkSettings()
-      : nat_traversal_mode(NAT_TRAVERSAL_DISABLED),
+      : flags(NAT_TRAVERSAL_DISABLED),
         min_port(0),
         max_port(0) {
+    DCHECK(!(flags & (NAT_TRAVERSAL_STUN | NAT_TRAVERSAL_RELAY)) ||
+           (flags & NAT_TRAVERSAL_OUTGOING));
   }
 
-  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;
+  // Parse string in the form "<min_port>-<max_port>". E.g. "12400-12409".
+  // Returns true if string was parsed successfuly.
+  static bool ParsePortRange(const std::string& port_range,
+                             int* out_min_port,
+                             int* out_max_port);
+
+  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.