| 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..332665ddf0cf41394421e82e885ceb1ca2e88288 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;
|
| }
|
|
|