diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | content/renderer/p2p/ipc_network_manager.cc | 2 | ||||
| -rw-r--r-- | jingle/glue/fake_network_manager.cc | 2 | ||||
| -rw-r--r-- | jingle/notifier/base/notifier_options_util.cc | 4 | ||||
| -rw-r--r-- | remoting/jingle_glue/xmpp_signal_strategy.cc | 2 | ||||
| -rw-r--r-- | third_party/libjingle/README.chromium | 7 | ||||
| -rw-r--r-- | third_party/libjingle/libjingle.gyp | 6 |
7 files changed, 18 insertions, 7 deletions
@@ -30,7 +30,7 @@ vars = { "40d182ac25fe6623cfbe5772623c15c663a42c93", "nacl_toolchain_revision": "7332", - "libjingle_revision": "95", + "libjingle_revision": "99", "libphonenumber_revision": "407", "libvpx_revision": "109236", "ffmpeg_revision": "112050", diff --git a/content/renderer/p2p/ipc_network_manager.cc b/content/renderer/p2p/ipc_network_manager.cc index bed04bc..a3b408e 100644 --- a/content/renderer/p2p/ipc_network_manager.cc +++ b/content/renderer/p2p/ipc_network_manager.cc @@ -53,7 +53,7 @@ void IpcNetworkManager::OnNetworkListChanged( memcpy(&address, &it->address[0], sizeof(uint32)); address = ntohl(address); networks.push_back( - new talk_base::Network(it->name, it->name, address, 0)); + new talk_base::Network(it->name, it->name, address)); } MergeNetworkList(networks, !first_update_sent_); diff --git a/jingle/glue/fake_network_manager.cc b/jingle/glue/fake_network_manager.cc index d30aba9..e591cea 100644 --- a/jingle/glue/fake_network_manager.cc +++ b/jingle/glue/fake_network_manager.cc @@ -20,7 +20,7 @@ FakeNetworkManager::FakeNetworkManager(const net::IPAddressNumber& address) talk_base::SocketAddress socket_address; CHECK(IPEndPointToSocketAddress(endpoint, &socket_address)); network_.reset(new talk_base::Network("fake", "Fake Network", - socket_address.ip(), 0)); + socket_address.ip())); } FakeNetworkManager::~FakeNetworkManager() { diff --git a/jingle/notifier/base/notifier_options_util.cc b/jingle/notifier/base/notifier_options_util.cc index 24fdad0..e4b1752 100644 --- a/jingle/notifier/base/notifier_options_util.cc +++ b/jingle/notifier/base/notifier_options_util.cc @@ -23,14 +23,14 @@ buzz::XmppClientSettings MakeXmppClientSettings( xmpp_client_settings.set_user(jid.node()); xmpp_client_settings.set_resource("chrome-sync"); xmpp_client_settings.set_host(jid.domain()); - xmpp_client_settings.set_use_tls(true); + xmpp_client_settings.set_use_tls(buzz::TLS_ENABLED); xmpp_client_settings.set_auth_cookie( notifier_options.invalidate_xmpp_login ? token + "bogus" : token); xmpp_client_settings.set_token_service(token_service); if (notifier_options.allow_insecure_connection) { xmpp_client_settings.set_allow_plain(true); - xmpp_client_settings.set_use_tls(false); + xmpp_client_settings.set_use_tls(buzz::TLS_DISABLED); } return xmpp_client_settings; } diff --git a/remoting/jingle_glue/xmpp_signal_strategy.cc b/remoting/jingle_glue/xmpp_signal_strategy.cc index f85569f..26ea9ca 100644 --- a/remoting/jingle_glue/xmpp_signal_strategy.cc +++ b/remoting/jingle_glue/xmpp_signal_strategy.cc @@ -40,7 +40,7 @@ void XmppSignalStrategy::Init(StatusObserver* observer) { settings.set_user(login_jid.node()); settings.set_host(login_jid.domain()); settings.set_resource("chromoting"); - settings.set_use_tls(true); + settings.set_use_tls(buzz::TLS_ENABLED); settings.set_token_service(auth_token_service_); settings.set_auth_cookie(auth_token_); settings.set_server(talk_base::SocketAddress("talk.google.com", 5222)); diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium index 297aa71..5165636 100644 --- a/third_party/libjingle/README.chromium +++ b/third_party/libjingle/README.chromium @@ -1,8 +1,11 @@ -Name: libjingle +Name: Libjingle library. Used for p2p voice and video communication. +Short Name: libjingle URL: http://code.google.com/p/libjingle/ Version: 2.7.0 +Revision: 99 License: BSD License File: source/COPYING +Security Critical: yes Description: Libjingle provides xmpp support to the sync code, which @@ -10,3 +13,5 @@ Description: Libjingle is distributed under a Berkeley-style license detailed in source/COPYING. + +Local Modifications: diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp index 5b2e764..4bf71c5 100644 --- a/third_party/libjingle/libjingle.gyp +++ b/third_party/libjingle/libjingle.gyp @@ -207,6 +207,8 @@ 'source/talk/base/httpcommon.h', 'source/talk/base/httprequest.cc', 'source/talk/base/httprequest.h', + 'source/talk/base/ipaddress.cc', + 'source/talk/base/ipaddress.h', 'source/talk/base/json.cc', 'source/talk/base/json.h', 'source/talk/base/linked_ptr.h', @@ -469,6 +471,8 @@ 'source/talk/session/phone/cryptoparams.h', 'source/talk/session/phone/currentspeakermonitor.cc', 'source/talk/session/phone/currentspeakermonitor.h', + 'source/talk/session/phone/devicemanager.cc', + 'source/talk/session/phone/devicemanager.h', 'source/talk/session/phone/dummydevicemanager.cc', 'source/talk/session/phone/dummydevicemanager.h', 'source/talk/session/phone/filemediaengine.cc', @@ -495,6 +499,8 @@ 'source/talk/session/phone/soundclip.h', 'source/talk/session/phone/srtpfilter.cc', 'source/talk/session/phone/srtpfilter.h', + 'source/talk/session/phone/ssrcmuxfilter.cc', + 'source/talk/session/phone/ssrcmuxfilter.h', 'source/talk/session/phone/videocapturer.cc', 'source/talk/session/phone/videocapturer.h', 'source/talk/session/phone/videocommon.cc', |