Add base::HostToNetXX() & NetToHostXX(), and use them to replace htonX() & ntohX() in Chrome.

chrome/browser/chromeos/web_socket_proxy.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/web_socket_proxy.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 823 matching lines @@
     return;
   }
   {
     int on = 1;
     setsockopt(listening_sock_, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
   }
 
   struct sockaddr_in addr;
   memset(&addr, 0, sizeof(addr));
   addr.sin_family = AF_INET;
-  addr.sin_port = htons(0);  // let OS allocatate ephemeral port number.
-  addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+  // Let the OS allocate a port number.
+  addr.sin_port = base::HostToNet16(0);
+  addr.sin_addr.s_addr = base::HostToNet32(INADDR_LOOPBACK);
   if (bind(listening_sock_,
            reinterpret_cast<struct sockaddr*>(&addr),
            sizeof(addr))) {
     LOG(ERROR) << "WebSocketProxy: Failed to bind server socket";
     return;
   }
   if (listen(listening_sock_, 12)) {
     LOG(ERROR) << "WebSocketProxy: Failed to listen server socket";
     return;
   }
@@ skipping 20 matching lines @@
       LOG(ERROR) << "WebSocketProxy: Failed to create socket";
       return;
     }
     {
       int on = 1;
       setsockopt(listening_sock_, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
     }
     const int kPort = 10101;
     memset(&addr, 0, sizeof(addr));
     addr.sin_family = AF_INET;
-    addr.sin_port = htons(kPort);
-    addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+    addr.sin_port = base::HostToNet16(kPort);
+    addr.sin_addr.s_addr = base::HostToNet32(INADDR_LOOPBACK);
     if (bind(extra_listening_sock_,
              reinterpret_cast<struct sockaddr*>(&addr),
              sizeof(addr))) {
       LOG(ERROR) << "WebSocketProxy: Failed to bind server socket";
       return;
     }
     if (listen(extra_listening_sock_, 12)) {
       LOG(ERROR) << "WebSocketProxy: Failed to listen server socket";
       return;
     }
@@ skipping 29 matching lines @@
 
   memset(&addr, 0, sizeof(addr));
   socklen_t addr_len = sizeof(addr);
   if (getsockname(
       listening_sock_, reinterpret_cast<struct sockaddr*>(&addr), &addr_len)) {
     LOG(ERROR) << "Failed to determine listening port";
     return;
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
-      base::Bind(&SendNotification, ntohs(addr.sin_port)));
+      base::Bind(&SendNotification, base::NetToHost16(addr.sin_port)));
 
   LOG(INFO) << "WebSocketProxy: Starting event dispatch loop.";
   event_base_dispatch(evbase_);
   if (shutdown_requested_)
     LOG(INFO) << "WebSocketProxy: Event dispatch loop terminated upon request";
   else
     LOG(ERROR) << "WebSocketProxy: Event dispatch loop terminated unexpectedly";
   CloseAll();
 }
 
@@ skipping 619 matching lines @@
               // There seems to be no easy API to perform only "local" part of
               // getaddrinfo resolution.  Hence this hack for "localhost".
               if (cs->destname_ == "localhost")
                 cs->destname_ = "127.0.0.1";
             }
             if (cs->destaddr_.empty())
               cs->destaddr_ = cs->destname_;
             {
               struct sockaddr_in sa;
               memset(&sa, 0, sizeof(sa));
-              sa.sin_port = htons(cs->destport_);
+              sa.sin_port = base::HostToNet16(cs->destport_);
               if (inet_pton(sa.sin_family = AF_INET,
                             cs->destaddr_.c_str(),
                             &sa.sin_addr) == 1) {
                 // valid IPv4 address supplied.
                 if (cs->TryConnectDest((struct sockaddr*)&sa, sizeof(sa))) {
                   cs->phase_ = PHASE_WAIT_DESTCONNECT;
                   return;
                 }
               }
             }
             {
               if (cs->destaddr_.size() >= 2 &&
                   cs->destaddr_[0] == '[' &&
                   cs->destaddr_[cs->destaddr_.size() - 1] == ']') {
                 // Literal IPv6 address in brackets.
                 cs->destaddr_ =
                     cs->destaddr_.substr(1, cs->destaddr_.size() - 2);
               }
               struct sockaddr_in6 sa;
               memset(&sa, 0, sizeof(sa));
-              sa.sin6_port = htons(cs->destport_);
+              sa.sin6_port = base::HostToNet16(cs->destport_);
               if (inet_pton(sa.sin6_family = AF_INET6,
                             cs->destaddr_.c_str(),
                             &sa.sin6_addr) == 1) {
                 // valid IPv6 address supplied.
                 if (cs->TryConnectDest((struct sockaddr*)&sa, sizeof(sa))) {
                   cs->phase_ = PHASE_WAIT_DESTCONNECT;
                   return;
                 }
               }
             }
@@ skipping 138 matching lines @@
   if (cs->phase_ != PHASE_WAIT_DESTCONNECT)
     return;
   if (result == DNS_ERR_NONE &&
       count >= 1 &&
       addr_list != NULL &&
       type == DNS_IPv4_A) {
     for (int i = 0; i < count; ++i) {
       struct sockaddr_in sa;
       memset(&sa, 0, sizeof(sa));
       sa.sin_family = AF_INET;
-      sa.sin_port = htons(cs->destport_);
+      sa.sin_port = base::HostToNet16(cs->destport_);
       DCHECK(sizeof(sa.sin_addr) == sizeof(struct in_addr));
       memcpy(&sa.sin_addr,
              static_cast<struct in_addr*>(addr_list) + i,
              sizeof(sa.sin_addr));
       if (cs->TryConnectDest((struct sockaddr*)&sa, sizeof(sa)))
         return;
     }
   }
   cs->destresolution_ipv4_failed_ = true;
   if (cs->destresolution_ipv4_failed_ && cs->destresolution_ipv6_failed_)
@@ skipping 10 matching lines @@
   if (cs->phase_ != PHASE_WAIT_DESTCONNECT)
     return;
   if (result == DNS_ERR_NONE &&
       count >= 1 &&
       addr_list != NULL &&
       type == DNS_IPv6_AAAA) {
     for (int i = 0; i < count; ++i) {
       struct sockaddr_in6 sa;
       memset(&sa, 0, sizeof(sa));
       sa.sin6_family = AF_INET6;
-      sa.sin6_port = htons(cs->destport_);
+      sa.sin6_port = base::HostToNet16(cs->destport_);
       DCHECK(sizeof(sa.sin6_addr) == sizeof(struct in6_addr));
       memcpy(&sa.sin6_addr,
              static_cast<struct in6_addr*>(addr_list) + i,
              sizeof(sa.sin6_addr));
       if (cs->TryConnectDest((struct sockaddr*)&sa, sizeof(sa)))
         return;
     }
   }
   cs->destresolution_ipv6_failed_ = true;
   if (cs->destresolution_ipv4_failed_ && cs->destresolution_ipv6_failed_)
@@ skipping 99 matching lines @@
 
 void WebSocketProxy::Shutdown() {
   static_cast<Serv*>(impl_)->Shutdown();
 }
 
 void WebSocketProxy::OnNetworkChange() {
   static_cast<Serv*>(impl_)->OnNetworkChange();
 }
 
 }  // namespace chromeos