OLD | NEW |
1 /* | 1 /* |
2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2 * Copyright 2004 The WebRTC Project Authors. All rights reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
11 #include <algorithm> | 11 #include <algorithm> |
12 | 12 |
13 #include "webrtc/base/httpcommon-inl.h" | 13 #include "webrtc/base/httpcommon-inl.h" |
14 | 14 |
15 #include "webrtc/base/asyncsocket.h" | 15 #include "webrtc/base/asyncsocket.h" |
| 16 #include "webrtc/base/checks.h" |
16 #include "webrtc/base/common.h" | 17 #include "webrtc/base/common.h" |
17 #include "webrtc/base/httpserver.h" | 18 #include "webrtc/base/httpserver.h" |
18 #include "webrtc/base/logging.h" | 19 #include "webrtc/base/logging.h" |
19 #include "webrtc/base/socketstream.h" | 20 #include "webrtc/base/socketstream.h" |
20 #include "webrtc/base/thread.h" | 21 #include "webrtc/base/thread.h" |
21 | 22 |
22 namespace rtc { | 23 namespace rtc { |
23 | 24 |
24 /////////////////////////////////////////////////////////////////////////////// | 25 /////////////////////////////////////////////////////////////////////////////// |
25 // HttpServer | 26 // HttpServer |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 ConnectionMap::iterator it = connections_.find(connection_id); | 94 ConnectionMap::iterator it = connections_.find(connection_id); |
94 if (it == connections_.end()) | 95 if (it == connections_.end()) |
95 return NULL; | 96 return NULL; |
96 return it->second; | 97 return it->second; |
97 } | 98 } |
98 | 99 |
99 void | 100 void |
100 HttpServer::Remove(int connection_id) { | 101 HttpServer::Remove(int connection_id) { |
101 ConnectionMap::iterator it = connections_.find(connection_id); | 102 ConnectionMap::iterator it = connections_.find(connection_id); |
102 if (it == connections_.end()) { | 103 if (it == connections_.end()) { |
103 ASSERT(false); | 104 RTC_NOTREACHED(); |
104 return; | 105 return; |
105 } | 106 } |
106 Connection* connection = it->second; | 107 Connection* connection = it->second; |
107 connections_.erase(it); | 108 connections_.erase(it); |
108 SignalConnectionClosed(this, connection_id, connection->EndProcess()); | 109 SignalConnectionClosed(this, connection_id, connection->EndProcess()); |
109 delete connection; | 110 delete connection; |
110 if (closing_ && connections_.empty()) { | 111 if (closing_ && connections_.empty()) { |
111 closing_ = false; | 112 closing_ = false; |
112 SignalCloseAllComplete(this); | 113 SignalCloseAllComplete(this); |
113 } | 114 } |
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
209 //request_.document_->rewind(); | 210 //request_.document_->rewind(); |
210 HttpServerTransaction* transaction = current_; | 211 HttpServerTransaction* transaction = current_; |
211 current_ = NULL; | 212 current_ = NULL; |
212 server_->SignalHttpRequest(server_, transaction); | 213 server_->SignalHttpRequest(server_, transaction); |
213 } else if (mode == HM_SEND) { | 214 } else if (mode == HM_SEND) { |
214 Thread::Current()->Dispose(current_->response.document.release()); | 215 Thread::Current()->Dispose(current_->response.document.release()); |
215 current_->request.clear(true); | 216 current_->request.clear(true); |
216 current_->response.clear(true); | 217 current_->response.clear(true); |
217 base_.recv(¤t_->request); | 218 base_.recv(¤t_->request); |
218 } else { | 219 } else { |
219 ASSERT(false); | 220 RTC_NOTREACHED(); |
220 } | 221 } |
221 } | 222 } |
222 | 223 |
223 void | 224 void |
224 HttpServer::Connection::onHttpClosed(HttpError err) { | 225 HttpServer::Connection::onHttpClosed(HttpError err) { |
225 RTC_UNUSED(err); | 226 RTC_UNUSED(err); |
226 server_->Remove(connection_id_); | 227 server_->Remove(connection_id_); |
227 } | 228 } |
228 | 229 |
229 /////////////////////////////////////////////////////////////////////////////// | 230 /////////////////////////////////////////////////////////////////////////////// |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
278 | 279 |
279 void HttpListenServer::OnConnectionClosed(HttpServer* server, | 280 void HttpListenServer::OnConnectionClosed(HttpServer* server, |
280 int connection_id, | 281 int connection_id, |
281 StreamInterface* stream) { | 282 StreamInterface* stream) { |
282 Thread::Current()->Dispose(stream); | 283 Thread::Current()->Dispose(stream); |
283 } | 284 } |
284 | 285 |
285 /////////////////////////////////////////////////////////////////////////////// | 286 /////////////////////////////////////////////////////////////////////////////// |
286 | 287 |
287 } // namespace rtc | 288 } // namespace rtc |
OLD | NEW |