diff options
| author | dcaiafa@chromium.org <dcaiafa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 16:47:31 +0000 |
|---|---|---|
| committer | dcaiafa@chromium.org <dcaiafa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-30 16:47:31 +0000 |
| commit | 573e6777aa7fe9f4fcf66202f9e93e062d120b7c (patch) | |
| tree | 836659f93e57cf8dabe7dec9435b41e686bead42 /remoting/protocol | |
| parent | 71d94dfce9c1989595d60e2737e05420cf6a5d5e (diff) | |
| download | chromium_src-573e6777aa7fe9f4fcf66202f9e93e062d120b7c.zip chromium_src-573e6777aa7fe9f4fcf66202f9e93e062d120b7c.tar.gz chromium_src-573e6777aa7fe9f4fcf66202f9e93e062d120b7c.tar.bz2 | |
New policies: enable/disable relay; port range
Add new Chromoting policies:
"RemoteAccessHostAllowRelayedConnection"
bool, default true
It can be set to false to disable the use of relay servers if NAT
traversal is enabled.
"RemoteAccessHostUdpPortRange"
string, default ""
Can be used to specify a range in the form "<min-port>-<max-port>" to
restrict the range of UDP ports available to the host for connections.
E.g. "12400-12409"
BUG=355168
Review URL: https://codereview.chromium.org/209323002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267234 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/protocol')
| -rw-r--r-- | remoting/protocol/libjingle_transport_factory.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc index b37cbb4..332665d 100644 --- a/remoting/protocol/libjingle_transport_factory.cc +++ b/remoting/protocol/libjingle_transport_factory.cc @@ -205,10 +205,8 @@ void LibjingleStreamTransport::DoStart() { this, &LibjingleStreamTransport::OnRouteChange); channel_->SignalWritableState.connect( this, &LibjingleStreamTransport::OnWritableState); - if (network_settings_.nat_traversal_mode == - NetworkSettings::NAT_TRAVERSAL_DISABLED) { - channel_->set_incoming_only(true); - } + channel_->set_incoming_only( + !(network_settings_.flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING)); channel_->Connect(); @@ -452,8 +450,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; } |