| Index: blimp/client/core/session/assignment_source.cc
|
| diff --git a/blimp/client/core/session/assignment_source.cc b/blimp/client/core/session/assignment_source.cc
|
| index f1214416fecd9759333f081ad26ad5763843e993..a113ee16c12b4b11fa7b515f904a4af82a0a60c0 100644
|
| --- a/blimp/client/core/session/assignment_source.cc
|
| +++ b/blimp/client/core/session/assignment_source.cc
|
| @@ -118,9 +118,9 @@ Assignment GetAssignmentFromCommandLine() {
|
| << "No client auth token provided.";
|
|
|
| unsigned port_parsed = 0;
|
| - if (!base::StringToUint(
|
| - cmd_line->GetSwitchValueASCII(switches::kEnginePort),
|
| - &port_parsed) || !IsValidIpPortNumber(port_parsed)) {
|
| + if (!base::StringToUint(cmd_line->GetSwitchValueASCII(switches::kEnginePort),
|
| + &port_parsed) ||
|
| + !IsValidIpPortNumber(port_parsed)) {
|
| DLOG(FATAL) << "--engine-port must be a value between 1 and 65535.";
|
| return Assignment();
|
| }
|
| @@ -131,7 +131,7 @@ Assignment GetAssignmentFromCommandLine() {
|
| DLOG(FATAL) << "Invalid engine IP " << ip_str;
|
| return Assignment();
|
| }
|
| - assignment.engine_endpoint =
|
| + assignment.assignment_options.engine_endpoint =
|
| net::IPEndPoint(ip_address, base::checked_cast<uint16_t>(port_parsed));
|
|
|
| std::string transport_str =
|
| @@ -366,7 +366,8 @@ void AssignmentSource::OnJsonParsed(std::unique_ptr<base::Value> json) {
|
| // over SSL.
|
| Assignment assignment;
|
| assignment.transport_protocol = Assignment::TransportProtocol::SSL;
|
| - assignment.engine_endpoint = net::IPEndPoint(ip_address, port);
|
| + assignment.assignment_options.engine_endpoint =
|
| + net::IPEndPoint(ip_address, port);
|
| assignment.client_auth_token = client_auth_token;
|
| assignment.cert = std::move(cert_list[0]);
|
|
|
|
|