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..853a5b75fe711583bb159fd169ba4ad82271e9b4 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,38 +19,50 @@ 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 = 0x1 | NAT_TRAVERSAL_OUTGOING,

[Sergey Ulanov, 2014/03/27 19:52:26]

this should be 2, not 1.
I'd still prefer separate flags. Maybe add a DCHECK in the NetworkSettings
constructors to verify that NAT_TRAVERSAL_OUTGOING is always set when STUN or
Relay are enabled?

[dcaiafa, 2014/03/27 23:36:21]

Ugh! Done.

+
+    // Allow the use of relay servers when a direct connection is not available.
+    NAT_TRAVERSAL_RELAY = 0x2 | NAT_TRAVERSAL_OUTGOING,

[Sergey Ulanov, 2014/03/27 19:52:26]

4

[dcaiafa, 2014/03/27 23:36:21]

Done.

+
+    // Active NAT traversal using STUN and relay servers.
+    NAT_TRAVERSAL_FULL = NAT_TRAVERSAL_STUN | NAT_TRAVERSAL_RELAY
   };
 
   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.
   int min_port;
   int max_port;
+
+  // 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,

[Sergey Ulanov, 2014/03/27 19:52:26]

nit: this should be declared before |flags|.
http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Declar...

[dcaiafa, 2014/03/27 23:36:21]

Done.

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