Index: talk/app/webrtc/peerconnection.cc |
diff --git a/talk/app/webrtc/peerconnection.cc b/talk/app/webrtc/peerconnection.cc |
index c147aef5651f8f994b0b2c2726db497228a0f650..5c6f150bd834e738b7b357ca6d29747e8f22df65 100644 |
--- a/talk/app/webrtc/peerconnection.cc |
+++ b/talk/app/webrtc/peerconnection.cc |
@@ -654,7 +654,7 @@ bool PeerConnection::UpdateIce(const IceServers& configuration, |
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; |
@@ -671,7 +671,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) { |
@@ -683,7 +684,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 << ". " |