New policies: enable/disable relay; port range

remoting/protocol/libjingle_transport_factory.cc

Index: remoting/protocol/libjingle_transport_factory.cc
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index b37cbb40da551c22fe13364825a03df30c837f00..beaf2347f02ef5c441df421008d64fad9e967f36 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -205,8 +205,7 @@ void LibjingleStreamTransport::DoStart() {
       this, &LibjingleStreamTransport::OnRouteChange);
   channel_->SignalWritableState.connect(
       this, &LibjingleStreamTransport::OnWritableState);
-  if (network_settings_.nat_traversal_mode ==
-      NetworkSettings::NAT_TRAVERSAL_DISABLED) {
+  if (network_settings_.flags == NetworkSettings::NAT_TRAVERSAL_DISABLED) {

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

channel_->set_incoming_only(!(flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING));

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

Done.

     channel_->set_incoming_only(true);
   }
 
@@ -452,8 +451,9 @@ LibjingleTransportFactory::CreateDatagramTransport() {
 }
 
 void LibjingleTransportFactory::EnsureFreshJingleInfo() {
-  if (network_settings_.nat_traversal_mode !=
-          NetworkSettings::NAT_TRAVERSAL_ENABLED ||
+  uint32 stun_or_relay_flags = NetworkSettings::NAT_TRAVERSAL_STUN |
+      NetworkSettings::NAT_TRAVERSAL_RELAY;
+  if (!(network_settings_.flags & stun_or_relay_flags) ||
       jingle_info_request_) {
     return;
   }