From 12c27f643aab030a7121693b07826f4d05ab1649 Mon Sep 17 00:00:00 2001
From: "sergeyu@chromium.org"
 <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 9 Aug 2011 21:52:05 +0000
Subject: Move P2P candidate serialization/deserialization to jingle/glue.

TEST=Compiles
BUG=None.

Review URL: http://codereview.chromium.org/7551034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96079 0039d316-1c4b-4281-b951-d872f2087c98
---
 jingle/glue/utils.cc | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 jingle/glue/utils.h  | 13 ++++++++++-
 2 files changed, 78 insertions(+), 1 deletion(-)

(limited to 'jingle')

diff --git a/jingle/glue/utils.cc b/jingle/glue/utils.cc
index 88625cf..acdb302 100644
--- a/jingle/glue/utils.cc
+++ b/jingle/glue/utils.cc
@@ -4,11 +4,16 @@
 
 #include "jingle/glue/utils.h"
 
+#include "base/json/json_reader.h"
+#include "base/json/json_writer.h"
 #include "base/logging.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
 #include "third_party/libjingle/source/talk/base/byteorder.h"
 #include "third_party/libjingle/source/talk/base/socketaddress.h"
+#include "third_party/libjingle/source/talk/p2p/base/candidate.h"
 
 namespace jingle_glue {
 
@@ -34,4 +39,65 @@ bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address_lj,
   return true;
 }
 
+std::string SerializeP2PCandidate(const cricket::Candidate& candidate) {
+  // TODO(sergeyu): Use SDP to format candidates?
+  DictionaryValue value;
+  value.SetString("name", candidate.name());
+  value.SetString("ip", candidate.address().IPAsString());
+  value.SetInteger("port", candidate.address().port());
+  value.SetString("type", candidate.type());
+  value.SetString("protocol", candidate.protocol());
+  value.SetString("username", candidate.username());
+  value.SetString("password", candidate.password());
+  value.SetDouble("preference", candidate.preference());
+  value.SetInteger("generation", candidate.generation());
+
+  std::string result;
+  base::JSONWriter::Write(&value, false, &result);
+  return result;
+}
+
+bool DeserializeP2PCandidate(const std::string& candidate_str,
+                             cricket::Candidate* candidate) {
+  scoped_ptr<Value> value(base::JSONReader::Read(candidate_str, true));
+  if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY)) {
+    return false;
+  }
+
+  DictionaryValue* dic_value = static_cast<DictionaryValue*>(value.get());
+
+  std::string name;
+  std::string ip;
+  int port;
+  std::string type;
+  std::string protocol;
+  std::string username;
+  std::string password;
+  double preference;
+  int generation;
+
+  if (!dic_value->GetString("name", &name) ||
+      !dic_value->GetString("ip", &ip) ||
+      !dic_value->GetInteger("port", &port) ||
+      !dic_value->GetString("type", &type) ||
+      !dic_value->GetString("protocol", &protocol) ||
+      !dic_value->GetString("username", &username) ||
+      !dic_value->GetString("password", &password) ||
+      !dic_value->GetDouble("preference", &preference) ||
+      !dic_value->GetInteger("generation", &generation)) {
+    return false;
+  }
+
+  candidate->set_name(name);
+  candidate->set_address(talk_base::SocketAddress(ip, port));
+  candidate->set_type(type);
+  candidate->set_protocol(protocol);
+  candidate->set_username(username);
+  candidate->set_password(password);
+  candidate->set_preference(static_cast<float>(preference));
+  candidate->set_generation(generation);
+
+  return true;
+}
+
 }  // namespace jingle_glue
diff --git a/jingle/glue/utils.h b/jingle/glue/utils.h
index 895cf2c..803416a 100644
--- a/jingle/glue/utils.h
+++ b/jingle/glue/utils.h
@@ -5,14 +5,20 @@
 #ifndef JINGLE_GLUE_UTILS_H_
 #define JINGLE_GLUE_UTILS_H_
 
+#include <string>
+
 namespace net {
 class IPEndPoint;
 }  // namespace net
 
 namespace talk_base {
-  class SocketAddress;
+class SocketAddress;
 }  // namespace talk_base
 
+namespace cricket {
+class Candidate;
+}  // namespace cricket
+
 namespace jingle_glue {
 
 // Chromium and libjingle represent socket addresses differently. The
@@ -23,6 +29,11 @@ bool IPEndPointToSocketAddress(const net::IPEndPoint& address_chrome,
 bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address_lj,
                                net::IPEndPoint* address_chrome);
 
+// Helper functions to serialize and deserialize P2P candidates.
+std::string SerializeP2PCandidate(const cricket::Candidate& candidate);
+bool DeserializeP2PCandidate(const std::string& address,
+                             cricket::Candidate* candidate);
+
 }  // namespace jingle_glue
 
 #endif  // JINGLE_GLUE_UTILS_H_
-- 
cgit v1.1