| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/quic/quic_stream_factory.h" | 5 #include "net/quic/quic_stream_factory.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <tuple> | 8 #include <tuple> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 1465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1476 #if defined(OS_WIN) | 1476 #if defined(OS_WIN) |
| 1477 static_cast<UDPClientSocket*>(socket)->UseNonBlockingIO(); | 1477 static_cast<UDPClientSocket*>(socket)->UseNonBlockingIO(); |
| 1478 #endif | 1478 #endif |
| 1479 } | 1479 } |
| 1480 | 1480 |
| 1481 #if defined(OS_WIN) | 1481 #if defined(OS_WIN) |
| 1482 // TODO(rtenneti): Delete the check for TSVIPCli.dll loaded and the histogram. | 1482 // TODO(rtenneti): Delete the check for TSVIPCli.dll loaded and the histogram. |
| 1483 bool tsvipcli_loaded = ::GetModuleHandle(L"TSVIPCli.dll") != NULL; | 1483 bool tsvipcli_loaded = ::GetModuleHandle(L"TSVIPCli.dll") != NULL; |
| 1484 UMA_HISTOGRAM_BOOLEAN("Net.QuicStreamFactory.TSVIPCliIsLoaded", | 1484 UMA_HISTOGRAM_BOOLEAN("Net.QuicStreamFactory.TSVIPCliIsLoaded", |
| 1485 tsvipcli_loaded); | 1485 tsvipcli_loaded); |
| 1486 if (tsvipcli_loaded) { |
| 1487 return ERR_QUIC_PROTOCOL_ERROR; |
| 1488 } |
| 1486 #endif | 1489 #endif |
| 1487 | 1490 |
| 1488 int rv; | 1491 int rv; |
| 1489 if (migrate_sessions_on_network_change_) { | 1492 if (migrate_sessions_on_network_change_) { |
| 1490 // If caller leaves network unspecified, use current default network. | 1493 // If caller leaves network unspecified, use current default network. |
| 1491 if (network == NetworkChangeNotifier::kInvalidNetworkHandle) { | 1494 if (network == NetworkChangeNotifier::kInvalidNetworkHandle) { |
| 1492 rv = socket->ConnectUsingDefaultNetwork(addr); | 1495 rv = socket->ConnectUsingDefaultNetwork(addr); |
| 1493 } else { | 1496 } else { |
| 1494 rv = socket->ConnectUsingNetwork(network, addr); | 1497 rv = socket->ConnectUsingNetwork(network, addr); |
| 1495 } | 1498 } |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1796 // Since the session was active, there's no longer an | 1799 // Since the session was active, there's no longer an |
| 1797 // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP | 1800 // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP |
| 1798 // job also fails. So to avoid not using QUIC when we otherwise could, we mark | 1801 // job also fails. So to avoid not using QUIC when we otherwise could, we mark |
| 1799 // it as recently broken, which means that 0-RTT will be disabled but we'll | 1802 // it as recently broken, which means that 0-RTT will be disabled but we'll |
| 1800 // still race. | 1803 // still race. |
| 1801 http_server_properties_->MarkAlternativeServiceRecentlyBroken( | 1804 http_server_properties_->MarkAlternativeServiceRecentlyBroken( |
| 1802 alternative_service); | 1805 alternative_service); |
| 1803 } | 1806 } |
| 1804 | 1807 |
| 1805 } // namespace net | 1808 } // namespace net |
| OLD | NEW |