Migrate Local Discovery from net::IPAddressNumber to net::IPAddress.

content/public/common/common_param_traits.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 "content/public/common/common_param_traits.h"
 
 #include <string>
 
 #include "content/public/common/content_constants.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 #include "net/base/host_port_pair.h"
+#include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 
 namespace IPC {
 
 void ParamTraits<GURL>::Write(Message* m, const GURL& p) {
   if (p.possibly_invalid_spec().length() > content::kMaxURLChars) {
     m->WriteString(std::string());
     return;
   }
 
@@ skipping 109 matching lines @@
     return false;
   }
   *p = net::IPEndPoint(address, port);
   return true;
 }
 
 void ParamTraits<net::IPEndPoint>::Log(const param_type& p, std::string* l) {
   LogParam("IPEndPoint:" + p.ToString(), l);
 }
 
+void ParamTraits<net::IPAddress>::Write(Message* m, const param_type& p) {
+  WriteParam(m, p.bytes());
+}
+
+bool ParamTraits<net::IPAddress>::Read(const Message* m,
+                                       base::PickleIterator* iter,
+                                       param_type* p) {
+  std::vector<uint8_t> bytes;
+  if (!ReadParam(m, iter, &bytes))
+    return false;
+  net::IPAddress address(&bytes.front(), bytes.size());

[eroman, 2015/12/21 20:47:33]

This is not correct. bytes might be empty, in which case &bytes.front() is
invalid.

This is solved by using the proposed IPAddress(const IPAddressNumber&)
constructor.

Also, it is better to do the checks below first. (That way avoids copying the
data if it is invalid).

[martijnc, 2016/01/27 22:50:52]

Handled in a separate CL.

+  if (address.size() && !address.IsIPv4() && !address.IsIPv6()) {
+    return false;
+  }
+  *p = address;
+  return true;
+}
+
+void ParamTraits<net::IPAddress>::Log(const param_type& p, std::string* l) {
+  LogParam("IPAddress:" + p.ToString(), l);
+}
+
 void ParamTraits<content::PageState>::Write(
     Message* m, const param_type& p) {
   WriteParam(m, p.ToEncodedData());
 }
 
 bool ParamTraits<content::PageState>::Read(const Message* m,
                                            base::PickleIterator* iter,
                                            param_type* r) {
   std::string data;
   if (!ReadParam(m, iter, &data))
@@ skipping 24 matching lines @@
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC