widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Address test network issues" into nyc-mr2-dev

Browse Source
This commit is contained in:
Rahul Frias
2016-12-13 09:18:10 +00:00
committed by Android (Google) Code Review
parent dab8aab4a8 3380679886
commit f77df16bd5
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libwvdrmengine/cdm/core/test/url_request.cpp
View File

@@ -13,6 +13,7 @@ namespace wvcdm {
namespace { namespace {
const int kMaxConnectAttempts = 3;
const int kReadBufferSize = 1024; const int kReadBufferSize = 1024;
const int kConnectTimeoutMs = 15000; const int kConnectTimeoutMs = 15000;
const int kWriteTimeoutMs = 12000; const int kWriteTimeoutMs = 12000;
@@ -79,6 +80,7 @@ UrlRequest::UrlRequest(const std::string& url)
UrlRequest::~UrlRequest() {} UrlRequest::~UrlRequest() {}
void UrlRequest::Reconnect() { void UrlRequest::Reconnect() {
for(uint32_t i = 0; i < kMaxConnectAttempts && !is_connected_; ++i) {
socket_.CloseSocket(); socket_.CloseSocket();
if (socket_.Connect(kConnectTimeoutMs)) { if (socket_.Connect(kConnectTimeoutMs)) {
is_connected_ = true; is_connected_ = true;
@@ -87,6 +89,7 @@ void UrlRequest::Reconnect() {
socket_.port()); socket_.port());
} }
} }
}
bool UrlRequest::GetResponse(std::string* message) { bool UrlRequest::GetResponse(std::string* message) {
std::string response; std::string response;