OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "remoting/protocol/connection_to_client.h" | 5 #include "remoting/protocol/connection_to_client.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/message_loop_proxy.h" | 9 #include "base/message_loop_proxy.h" |
10 #include "google/protobuf/message.h" | 10 #include "google/protobuf/message.h" |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
128 handler_->OnConnectionClosed(this); | 128 handler_->OnConnectionClosed(this); |
129 break; | 129 break; |
130 | 130 |
131 case Session::FAILED: | 131 case Session::FAILED: |
132 CloseOnError(); | 132 CloseOnError(); |
133 break; | 133 break; |
134 } | 134 } |
135 } | 135 } |
136 | 136 |
137 void ConnectionToClient::OnSessionRouteChange( | 137 void ConnectionToClient::OnSessionRouteChange( |
138 const std::string& channel_name, const net::IPEndPoint& end_point) { | 138 const std::string& channel_name, |
139 handler_->OnClientIpAddress(this, channel_name, end_point); | 139 const net::IPEndPoint& remote_end_point, |
| 140 const net::IPEndPoint& local_end_point) { |
| 141 handler_->OnRouteChange(this, channel_name, remote_end_point, |
| 142 local_end_point); |
140 } | 143 } |
141 | 144 |
142 void ConnectionToClient::OnChannelInitialized(bool successful) { | 145 void ConnectionToClient::OnChannelInitialized(bool successful) { |
143 DCHECK(CalledOnValidThread()); | 146 DCHECK(CalledOnValidThread()); |
144 | 147 |
145 if (!successful) { | 148 if (!successful) { |
146 LOG(ERROR) << "Failed to connect a channel"; | 149 LOG(ERROR) << "Failed to connect a channel"; |
147 CloseOnError(); | 150 CloseOnError(); |
148 return; | 151 return; |
149 } | 152 } |
(...skipping 17 matching lines...) Expand all Loading... |
167 } | 170 } |
168 | 171 |
169 void ConnectionToClient::CloseChannels() { | 172 void ConnectionToClient::CloseChannels() { |
170 control_dispatcher_.reset(); | 173 control_dispatcher_.reset(); |
171 event_dispatcher_.reset(); | 174 event_dispatcher_.reset(); |
172 video_writer_.reset(); | 175 video_writer_.reset(); |
173 } | 176 } |
174 | 177 |
175 } // namespace protocol | 178 } // namespace protocol |
176 } // namespace remoting | 179 } // namespace remoting |
OLD | NEW |