http_server: accept full NetAddress in CreateHttpServer.

services/http_server/http_server_impl.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/http_server/http_server_impl.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "mojo/public/cpp/application/application_impl.h"
 #include "mojo/public/cpp/bindings/error_handler.h"
 #include "mojo/public/cpp/system/data_pipe.h"
 #include "services/http_server/connection.h"
 #include "services/http_server/http_server_factory_impl.h"
 #include "services/http_server/public/http_server_util.h"
 
 namespace http_server {
 
 HttpServerImpl::HttpServerImpl(mojo::ApplicationImpl* app,
                                HttpServerFactoryImpl* factory,
-                               uint16_t port)
+                               mojo::NetAddressPtr requested_local_address)
     : factory_(factory),
-      requested_port_(port),
+      requested_local_address_(requested_local_address.Pass()),
       assigned_port_(0),
       weak_ptr_factory_(this) {
   app->ConnectToService("mojo:network_service", &network_service_);
   Start();
   bindings_.set_error_handler(this);
 }
 
 HttpServerImpl::~HttpServerImpl() {
 }
 
@@ skipping 23 matching lines @@
 }
 
 void HttpServerImpl::OnConnectionError() {
   handlers_.erase(
       std::remove_if(handlers_.begin(), handlers_.end(), [](Handler* h) {
     return h->http_handler.encountered_error();
   }), handlers_.end());
 
   if (handlers_.empty()) {
     // The call deregisters the server from the factory and deletes |this|.
-    factory_->DeleteServer(this, requested_port_);
+    factory_->DeleteServer(this, requested_local_address_.Clone());
   }
 }
 
 void HttpServerImpl::OnSocketBound(mojo::NetworkErrorPtr err,
                                    mojo::NetAddressPtr bound_address) {
   if (err->code != 0) {
     LOG(ERROR) << "Failed to bind the socket, err = " << err->code;
     return;
   }
 
   assigned_port_ = bound_address->ipv4->port;
-  DCHECK(requested_port_ == 0u || requested_port_ == assigned_port_);
 
   for (GetPortCallback& port_callback : pending_get_port_callbacks_) {
     port_callback.Run(assigned_port_);
   }
   pending_get_port_callbacks_.clear();
 }
 
 void HttpServerImpl::OnSocketListening(mojo::NetworkErrorPtr err) {
   if (err->code != 0) {
     LOG(ERROR) << "Failed to listen on the socket, err = " << err->code;
@@ skipping 33 matching lines @@
   MOJO_ALLOW_UNUSED_LOCAL(result);
 
   server_socket_->Accept(send_consumer_handle.Pass(),
                          receive_producer_handle.Pass(),
                          GetProxy(&pending_connected_socket_),
                          base::Bind(&HttpServerImpl::OnConnectionAccepted,
                                     base::Unretained(this)));
 }
 
 void HttpServerImpl::Start() {
-  mojo::NetAddressPtr net_address(mojo::NetAddress::New());
-  net_address->family = mojo::NET_ADDRESS_FAMILY_IPV4;
-  net_address->ipv4 = mojo::NetAddressIPv4::New();
-  net_address->ipv4->addr.resize(4);
-  net_address->ipv4->addr[0] = 0;
-  net_address->ipv4->addr[1] = 0;
-  net_address->ipv4->addr[2] = 0;
-  net_address->ipv4->addr[3] = 0;
-  net_address->ipv4->port = requested_port_;
-
   // Note that we can start using the proxies right away even thought the
   // callbacks have not been called yet. If a previous step fails, they'll
   // all fail.
   network_service_->CreateTCPBoundSocket(
-      net_address.Pass(), GetProxy(&bound_socket_),
+      requested_local_address_.Clone(), GetProxy(&bound_socket_),
       base::Bind(&HttpServerImpl::OnSocketBound, base::Unretained(this)));
   bound_socket_->StartListening(
       GetProxy(&server_socket_),
       base::Bind(&HttpServerImpl::OnSocketListening, base::Unretained(this)));
   WaitForNextConnection();
 }
 
 void HttpServerImpl::HandleRequest(Connection* connection,
                                    HttpRequestPtr request) {
   for (auto& handler : handlers_) {
@@ skipping 15 matching lines @@
 
 HttpServerImpl::Handler::Handler(const std::string& pattern,
                                  HttpHandlerPtr http_handler)
     : pattern(new RE2(pattern.c_str())), http_handler(http_handler.Pass()) {
 }
 
 HttpServerImpl::Handler::~Handler() {
 }
 
 }  // namespace http_server