Index: talk/app/webrtc/peerconnection.cc |
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc |
index 961ba261a88b7459412b344e8dd294e37ce99391..36875a6f93b36735f7ae27297dce2d213d3e3284 100644 |
--- a/talk/app/webrtc/peerconnection.cc |
+++ b/talk/app/webrtc/peerconnection.cc |
@@ -680,12 +680,7 @@ void PeerConnection::PostSetSessionDescriptionFailure( |
signaling_thread()->Post(this, MSG_SET_SESSIONDESCRIPTION_FAILED, msg); |
} |
-bool PeerConnection::UpdateIce(const IceServers& configuration, |
- const MediaConstraintsInterface* constraints) { |
- return false; |
-} |
- |
-bool PeerConnection::UpdateIce(const RTCConfiguration& config) { |
+bool PeerConnection::SetConfiguration(const RTCConfiguration& config) { |
if (port_allocator_) { |
std::vector<PortAllocatorFactoryInterface::StunConfiguration> stuns; |
std::vector<PortAllocatorFactoryInterface::TurnConfiguration> turns; |
@@ -702,7 +697,8 @@ bool PeerConnection::UpdateIce(const RTCConfiguration& config) { |
rtc::SocketAddress stun_addr; |
if (!stun_hosts.empty()) { |
stun_addr = stun_hosts.front(); |
- LOG(LS_INFO) << "UpdateIce: StunServer Address: " << stun_addr.ToString(); |
+ LOG(LS_INFO) << "SetConfiguration: StunServer Address: " |
+ << stun_addr.ToString(); |
} |
for (size_t i = 0; i < turns.size(); ++i) { |
@@ -714,7 +710,7 @@ bool PeerConnection::UpdateIce(const RTCConfiguration& config) { |
relay_server.ports.push_back(cricket::ProtocolAddress( |
turns[i].server, protocol, turns[i].secure)); |
relay_server.credentials = credentials; |
- LOG(LS_INFO) << "UpdateIce: TurnServer Address: " |
+ LOG(LS_INFO) << "SetConfiguration: TurnServer Address: " |
<< turns[i].server.ToString(); |
} else { |
LOG(LS_WARNING) << "Ignoring TURN server " << turns[i].server << ". " |