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 <set> | 8 #include <set> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1461 #if defined(OS_WIN) | 1461 #if defined(OS_WIN) |
1462 static_cast<UDPClientSocket*>(socket)->UseNonBlockingIO(); | 1462 static_cast<UDPClientSocket*>(socket)->UseNonBlockingIO(); |
1463 #endif | 1463 #endif |
1464 } | 1464 } |
1465 | 1465 |
1466 #if defined(OS_WIN) | 1466 #if defined(OS_WIN) |
1467 // TODO(rtenneti): Delete the check for TSVIPCli.dll loaded and the histogram. | 1467 // TODO(rtenneti): Delete the check for TSVIPCli.dll loaded and the histogram. |
1468 bool tsvipcli_loaded = ::GetModuleHandle(L"TSVIPCli.dll") != NULL; | 1468 bool tsvipcli_loaded = ::GetModuleHandle(L"TSVIPCli.dll") != NULL; |
1469 UMA_HISTOGRAM_BOOLEAN("Net.QuicStreamFactory.TSVIPCliIsLoaded", | 1469 UMA_HISTOGRAM_BOOLEAN("Net.QuicStreamFactory.TSVIPCliIsLoaded", |
1470 tsvipcli_loaded); | 1470 tsvipcli_loaded); |
| 1471 if (tsvipcli_loaded) { |
| 1472 return ERR_QUIC_PROTOCOL_ERROR; |
| 1473 } |
1471 #endif | 1474 #endif |
1472 | 1475 |
1473 int rv; | 1476 int rv; |
1474 if (migrate_sessions_on_network_change_) { | 1477 if (migrate_sessions_on_network_change_) { |
1475 // If caller leaves network unspecified, use current default network. | 1478 // If caller leaves network unspecified, use current default network. |
1476 if (network == NetworkChangeNotifier::kInvalidNetworkHandle) { | 1479 if (network == NetworkChangeNotifier::kInvalidNetworkHandle) { |
1477 rv = socket->ConnectUsingDefaultNetwork(addr); | 1480 rv = socket->ConnectUsingDefaultNetwork(addr); |
1478 } else { | 1481 } else { |
1479 rv = socket->ConnectUsingNetwork(network, addr); | 1482 rv = socket->ConnectUsingNetwork(network, addr); |
1480 } | 1483 } |
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1773 // Since the session was active, there's no longer an | 1776 // Since the session was active, there's no longer an |
1774 // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP | 1777 // HttpStreamFactoryImpl::Job running which can mark it broken, unless the TCP |
1775 // job also fails. So to avoid not using QUIC when we otherwise could, we mark | 1778 // job also fails. So to avoid not using QUIC when we otherwise could, we mark |
1776 // it as recently broken, which means that 0-RTT will be disabled but we'll | 1779 // it as recently broken, which means that 0-RTT will be disabled but we'll |
1777 // still race. | 1780 // still race. |
1778 http_server_properties_->MarkAlternativeServiceRecentlyBroken( | 1781 http_server_properties_->MarkAlternativeServiceRecentlyBroken( |
1779 alternative_service); | 1782 alternative_service); |
1780 } | 1783 } |
1781 | 1784 |
1782 } // namespace net | 1785 } // namespace net |
OLD | NEW |