diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 21:52:05 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-09 21:52:05 +0000 |
commit | 12c27f643aab030a7121693b07826f4d05ab1649 (patch) | |
tree | 8b8eee7a3ef1876d2acc50f4db5144e0cc973e44 /jingle/glue/utils.cc | |
parent | 920b1fe955dc8107103f5e35e6cbf1b26f0bbbd9 (diff) | |
download | chromium_src-12c27f643aab030a7121693b07826f4d05ab1649.zip chromium_src-12c27f643aab030a7121693b07826f4d05ab1649.tar.gz chromium_src-12c27f643aab030a7121693b07826f4d05ab1649.tar.bz2 |
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
Diffstat (limited to 'jingle/glue/utils.cc')
-rw-r--r-- | jingle/glue/utils.cc | 66 |
1 files changed, 66 insertions, 0 deletions
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 |